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

   float adc_vref = STM32REF * (4096.0 * Scale) / adc_val; // the estimate for checking
   ADC_Scale = 1 / (Scale * 4096) * adc_vref;
+}
-void ProcessRPM(void)
+void ProcessRPM(struct usart_ctl * handle)
+{
   static unsigned int Coded_RPM = 0;
   int32_t rpm = CalculateRPM();
   // suppress the EDIS "heartbeat" 90 RPM
   if (rpm >= 100)
     Coded_RPM = rpm / 19.55;
   // send the current RPM *calculation
-  sendPlxInfo(& uc1, PLX_RPM, Coded_RPM/ Scale);
+  sendPlxInfo(handle, PLX_RPM, 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
 // must wait > 0.22 seconds between conversion attempts as this is the measurement time
 uint16_t Temp_Observations[NUM_SPI_TEMP_SENS] = {[0 ... NUM_SPI_TEMP_SENS - 1] = 0};
 /// \param item The array index to send
 /// \param type the code to use for this observation
-void ProcessTemp(char item, enum PLX_Observations type)
+void ProcessTemp(struct usart_ctl * handle,char item, enum PLX_Observations type)
+{
   if (item > NUM_SPI_TEMP_SENS)
     return;
-  sendPlxInfo(& uc1, type , Temp_Observations[(int)item]);
+  sendPlxInfo(handle, type , Temp_Observations[(int)item]);
+}
 /// \brief Reset the temperature chip select system
 void resetTempCS(void)
+  }
+}
 // 1023 is 20.00 volts.
 /// \param item - used to lookup the index of the local reading
-void ProcessBatteryVoltage(int item)
+void ProcessBatteryVoltage(struct usart_ctl * handle, int item)
+{
   float reading = FILT_Samples[item] * ADC_Scale;
   reading = reading * 7.8125; // real voltage
   reading = reading * 51.15;  // PLC scaling =  1023/20
-  sendPlxInfo(& uc1, PLX_Volts, reading);
+  sendPlxInfo(handle, PLX_Volts, reading);
+}
-void ProcessCPUTemperature(void)
+void ProcessCPUTemperature(struct usart_ctl * handle)
+{
   // this is defined in the STM32F103 reference manual . #
   // V25 = 1.43 volts
   // Avg_slope = 4.3mV /degree C
   // temperature = {(V25 - VSENSE) / Avg_Slope} + 25
   /* renormalise temperature value to account for different ADC Vref  : normalise to that which we would get for a 3000mV reference */
   temp_val = (1.43 - temp_val) / 4.3e-3 + 25;
   int32_t result = temp_val;
-  sendPlxInfo(& uc1, PLX_FluidTemp, result);
+  sendPlxInfo(handle, PLX_FluidTemp, 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(void)
+void ProcessMAP(struct usart_ctl * handle)
+{
   // 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;
-  sendPlxInfo(& uc1, PLX_MAP, reading);
+  sendPlxInfo(handle, PLX_MAP, 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(void)
+void ProcessOilPress(struct usart_ctl * handle)
+{
   // 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
-  sendPlxInfo(& uc1, PLX_FluidPressure, reading);
+  sendPlxInfo(handle, PLX_FluidPressure, reading);
+}
-void libPLXcallbackSendUserData()
+void libPLXcallbackSendUserData(struct usart_ctl * handle)
+{
   // send the observations
-  ProcessRPM();
+  ProcessRPM(handle);
-  ProcessTemp(0, PLX_X_CHT);
+  ProcessTemp(handle,0, PLX_X_CHT);
-  ProcessTemp(1, PLX_X_CHT);
+  ProcessTemp(handle,1, PLX_X_CHT);
-  ProcessTemp(2, PLX_AIT);
+  ProcessTemp(handle,2, PLX_AIT);
-  ProcessTemp(3, PLX_AIT);
+  ProcessTemp(handle,3, PLX_AIT);
-  ProcessBatteryVoltage(0); // Batt 1
+  ProcessBatteryVoltage(handle,0); // Batt 1
-  ProcessBatteryVoltage(1); // Batt 2
+  ProcessBatteryVoltage(handle,1); // Batt 2
-  ProcessCPUTemperature();  //  built in temperature sensor
+  ProcessCPUTemperature(handle);  //  built in temperature sensor
-  ProcessMAP();
-  ProcessOilPress();
+  ProcessMAP(handle);
-  PutCharSerial(&uc1, PLX_Stop);
+  ProcessOilPress(handle);
+}
 /* USER CODE END 0 */
 /**
  * @brief  The application entry point.

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 53 → 54