WebSVN – EngineBay2 – Diff – /branches/stm32f103/Core/Src/main.c

 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include <string.h>
 #include "libSerial/serial.h"
 #include "libPLX/plx.h"
 #include "misc.h"
 #include "libIgnTiming/rpm.h"
 volatile char TimerFlag = 0;
 volatile char NoSerialInCTR = 0; // Missing characters coming in on USART1
 volatile char NoSerialIn = 0;
+// an array containing values being one more than incoming index for all observations or zero
+// if no incoming index
+char obsIndex[PLX_MAX_OBS];
 // storage for ADC
 uint16_t ADC_Samples[ADC_CHANNELS] = {[0 ... ADC_CHANNELS - 1] = 0};
 uint32_t FILT_Samples[ADC_CHANNELS] = {[0 ... ADC_CHANNELS - 1] = 0}; // filtered ADC samples * Scale
   float adc_vref = STM32REF * (4096.0 * Scale) / adc_val; // the estimate for checking
   ADC_Scale = 1 / (Scale * 4096) * adc_vref;
+}
-void ProcessRPM(int instance)
+void ProcessRPM(void)
+{
   static unsigned int Coded_RPM = 0;
   int32_t rpm = CalculateRPM();
   if (rpm >= 0)
     Coded_RPM = rpm / 19.55;
   // send the current RPM *calculation
   plx_sendword(PLX_RPM);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_RPM]++);
   plx_sendword(Coded_RPM / Scale);
+}
 // this uses a MAX6675 which is a simple 16 bit read
 // SPI is configured for 8 bits so I can use an OLED display if I need it
 #define CORR 3
 uint16_t Temp_Observations[NUM_SPI_TEMP_SENS] = {[0 ... NUM_SPI_TEMP_SENS - 1] = 0};
 /// \param item The array index to send
-/// \param instance The instance to send over the bus
 /// \param type the code to use for this observation
-void ProcessTemp(char item, int instance, enum PLX_Observations type)
+void ProcessTemp(char item, enum PLX_Observations type)
+{
   if (item > NUM_SPI_TEMP_SENS)
     return;
   plx_sendword(type);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[type]++);
   plx_sendword(Temp_Observations[(int)item]);
+}
 /// \brief Reset the temperature chip select system
 void resetTempCS(void)
     HAL_GPIO_Init(SPI1_SCK_GPIO_Port, &GPIO_InitStruct);
+  }
+}
 // 1023 is 20.00 volts.
+/// \param item - used to lookup the index of the local reading
-void ProcessBatteryVoltage(int instance)
+void ProcessBatteryVoltage(int item)
+{
-  float reading = FILT_Samples[instance] * ADC_Scale;
+  float reading = FILT_Samples[item] * ADC_Scale;
   reading = reading * 7.8125; // real voltage
   reading = reading * 51.15;  // PLC scaling =  1023/20
   plx_sendword(PLX_Volts);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_Volts]++);
   plx_sendword((uint16_t)reading);
+}
-void ProcessCPUTemperature(int instance)
+void ProcessCPUTemperature(void)
+{
   // this is defined in the STM32F103 reference manual . #
   // V25 = 1.43 volts
   // Avg_slope = 4.3mV /degree C
   // temperature = {(V25 - VSENSE) / Avg_Slope} + 25
   //  int32_t result = 800 * ((int32_t) temp_val - TS_CAL30);
   //  result = result / (TS_CAL110 - TS_CAL30) + 300;
   plx_sendword(PLX_FluidTemp);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_FluidTemp]++);
   plx_sendword(result);
+}
 // the MAP sensor is giving us a reading of
 // 4.6 volts for 1019mB or 2.27 volts at the ADC input (resistive divider by 2.016)
 // Real   Displayed
 // 989    968
 // 994.1    986
 // 992.3  984
-void ProcessMAP(int instance)
+void ProcessMAP(void)
+{
   // Using ADC_Samples[3] as the MAP input
   float reading = FILT_Samples[ADC_MAP_CHAN] * ADC_Scale;
   reading = reading * 2.016; // real voltage
   // values computed from slope / intercept of map.ods
   // reading = (reading) * 56.23 + 743.2; // do not assume 0.5 volt offset : reading from 0 to 4.5 instead of 0.5 to 4.5
   // using a pressure gauge.
   reading = (reading)*150 + 326;
   plx_sendword(PLX_MAP);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_MAP]++);
   plx_sendword((uint16_t)reading);
+}
 // the Oil pressi sensor is giving us a reading of
 // 4.5 volts for 100 PSI or  2.25 volts at the ADC input (resistive divider by 2.016)
 // I believe the sensor reads  4.5V at 100PSI and 0.5V at  0PSI
 // an observation of 1024 is 200PSI, so observation of 512 is 100 PSI.
-void ProcessOilPress(int instance)
+void ProcessOilPress(void)
+{
   // Using ADC_Samples[2] as the MAP input
   float reading = FILT_Samples[ADC_PRESSURE_CHAN] * ADC_Scale;
   reading = reading * 2.00;            // real voltage
   reading = (reading - 0.5) * 512 / 4; // this is 1023 * 100/200
   plx_sendword(PLX_FluidPressure);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_FluidPressure]++);
   plx_sendword((uint16_t)reading);
+}
-void ProcessTiming(int instance)
+void ProcessTiming(void)
+{
   plx_sendword(PLX_Timing);
-  PutCharSerial(&uc1, instance);
+  PutCharSerial(&uc1, obsIndex[PLX_Timing]++);
   plx_sendword(64 - 15); // make it negative
+}
 /* USER CODE END 0 */
   int CalCounter = 0;
   PowerTempTimer = HAL_GetTick() + 1000; /* wait 10 seconds before powering up the CHT sensor */
   ResetRxBuffer(&uc1);
+  PLX_SensorInfo info; ///< sensor info structure for getting idents
+  memset(obsIndex, 0, PLX_MAX_OBS); // zero incoming obsevation index
+  int infoCount = -1;               ///< counting bytes when we are copying them across
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
         PowerTempTimer = 0;
+      }
+    }
     // check to see if we have any incoming data, copy and append if so, if no data then create our own frames.
-    int c;
     char send = 0;
     // poll the  input for a stop bit or timeout
     if (PollSerial(&uc1))
+    {
       resetSerialTimeout();
-      c = GetCharSerial(&uc1);
+      uint8_t c = GetCharSerial(&uc1);
+      // code added to read in all data, extract the observation index maximum for each type of data
+      if (c == PLX_Start)
+      {
+        infoCount = 0;
+      }
+      else
+      {
+        info.bytes[infoCount++] = c;
+        // process the sensor info field : discover maximum observation index
+        if (infoCount == sizeof(PLX_SensorInfo))
+        {
+          infoCount = 0;
+          int addr = ConvPLXAddr(&info);
+          if (addr < PLX_MAX_OBS && (obsIndex[addr] <= info.Instance))
+            obsIndex[addr] = info.Instance + 1;
+        }
+      }
       if (c != PLX_Stop)
+      {
         PutCharSerial(&uc1, c); // echo all but the stop bit
+      }
       else
     if (send)
+    {
       send = 0;
       // send the observations
-      ProcessRPM(0);
+      ProcessRPM();
-      ProcessTemp(0, 0, PLX_X_CHT);
+      ProcessTemp(0, PLX_X_CHT);
-      ProcessTemp(1, 1, PLX_X_CHT);
+      ProcessTemp(1, PLX_X_CHT);
-      ProcessTemp(2, 0, PLX_AIT);
+      ProcessTemp(2, PLX_AIT);
-      ProcessTemp(3, 1, PLX_AIT);
+      ProcessTemp(3, PLX_AIT);
       ProcessBatteryVoltage(0); // Batt 1
       ProcessBatteryVoltage(1); // Batt 2
-      ProcessCPUTemperature(0); //  built in temperature sensor
+      ProcessCPUTemperature();  //  built in temperature sensor
-      ProcessMAP(0);
+      ProcessMAP();
-      ProcessOilPress(0);
+      ProcessOilPress();
+      memset(obsIndex, 0, PLX_MAX_OBS); // zero incoming obsevation index
       PutCharSerial(&uc1, PLX_Stop);
+    }
+  }

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 48 → 49