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

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include <string.h>
 #include "libSerial/serial.h"
 #include "libPLX/plx.h"
+#include "libPLX/commsLib.h"
 #include "misc.h"
 #include "libIgnTiming/rpm.h"
 /* USER CODE END Includes */
 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
   if (rpm >= 0)
     Coded_RPM = rpm / 19.55;
   // send the current RPM *calculation
   plx_sendword(PLX_RPM);
-  PutCharSerial(&uc1, obsIndex[PLX_RPM]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(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
 void ProcessTemp(char item, enum PLX_Observations type)
+{
   if (item > NUM_SPI_TEMP_SENS)
     return;
   plx_sendword(type);
-  PutCharSerial(&uc1, obsIndex[type]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(type));
   plx_sendword(Temp_Observations[(int)item]);
+}
 /// \brief Reset the temperature chip select system
 void resetTempCS(void)
   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, obsIndex[PLX_Volts]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(PLX_Volts));
   plx_sendword((uint16_t)reading);
+}
 void ProcessCPUTemperature(void)
+{
   //  int32_t result = 800 * ((int32_t) temp_val - TS_CAL30);
   //  result = result / (TS_CAL110 - TS_CAL30) + 300;
   plx_sendword(PLX_FluidTemp);
-  PutCharSerial(&uc1, obsIndex[PLX_FluidTemp]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(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)
   // 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, obsIndex[PLX_MAP]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(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)
   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, obsIndex[PLX_FluidPressure]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(PLX_FluidPressure));
   plx_sendword((uint16_t)reading);
+}
 void ProcessTiming(void)
+{
   plx_sendword(PLX_Timing);
-  PutCharSerial(&uc1, obsIndex[PLX_Timing]++);
+  PutCharSerial(&uc1, libPLXgetNextInstance(PLX_Timing));
   plx_sendword(64 - 15); // make it negative
+}
+void libPLXcallbackResetSerialTimeout()
+{
+  resetSerialTimeout();
+  TimerFlag = 0;
+}
+void libPLXcallbackSendUserData()
+{
+  // send the observations
+  ProcessRPM();
+  ProcessTemp(0, PLX_X_CHT);
+  ProcessTemp(1, PLX_X_CHT);
+  ProcessTemp(2, PLX_AIT);
+  ProcessTemp(3, PLX_AIT);
+  ProcessBatteryVoltage(0); // Batt 1
+  ProcessBatteryVoltage(1); // Batt 2
+  ProcessCPUTemperature();  //  built in temperature sensor
+  ProcessMAP();
+  ProcessOilPress();
+  PutCharSerial(&uc1, PLX_Stop);
+}
 /* USER CODE END 0 */
 /**
  * @brief  The application entry point.
  * @retval int
   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
+  resetPLX();
-  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.
-    char send = 0;
-    // poll the  input for a stop bit or timeout
-    if (PollSerial(&uc1))
-    {
-      resetSerialTimeout();
-      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
-      {           // must be a stop character
-        send = 1; // start our sending process.
-      }
-    }
-    // sort out auto-sending
-    if (TimerFlag)
-    {
-      TimerFlag = 0;
-      if (NoSerialIn)
-      {
-        PutCharSerial(&uc1, PLX_Start);
-        send = 1;
-      }
-    }
-    if (send)
-    {
-      send = 0;
-      // send the observations
-      ProcessRPM();
-      ProcessTemp(0, PLX_X_CHT);
-      ProcessTemp(1, PLX_X_CHT);
-      ProcessTemp(2, PLX_AIT);
-      ProcessTemp(3, PLX_AIT);
-      ProcessBatteryVoltage(0); // Batt 1
-      ProcessBatteryVoltage(1); // Batt 2
-      ProcessCPUTemperature();  //  built in temperature sensor
-      ProcessMAP();
-      ProcessOilPress();
-      memset(obsIndex, 0, PLX_MAX_OBS); // zero incoming obsevation index
+    // poll the input data and produce automatic output if the timer expires and no serial input data
-      PutCharSerial(&uc1, PLX_Stop);
+    libPLXpollData(&uc1, TimerFlag && NoSerialIn);
-    }
+  }
   /* USER CODE END 3 */
+}

Subversion Repositories EngineBay2

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