WebSVN – EngineBay2 – Diff – /trunk/Src/main.c

 volatile char NoSerialIn = 0;
 // storage for ADC
 uint16_t  ADC_Samples[6];
+#define Scale 1024.0
+const float ADC_Scale = 3.3 / (Scale * 4096.0); // convert to a voltage
+uint32_t  FILT_Samples[6]; // filtered ADC samples * 1024
 // Rev counter processing from original RevCounter Project
 unsigned int RPM_Diff = 0;
 unsigned int RPM_Count_Latch = 0;
 // accumulators
 unsigned int RPM_Pulsecount = 0;
 void plx_sendword(int x) {
         PutCharSerial(&uc1, ((x) >> 6) & 0x3F);
         PutCharSerial(&uc1, (x) & 0x3F);
+}
+void init_ADC_filter()
+{
+        int i;
+         for(i=0;i<6;i++)
+         {
+                FILT_Samples[i] = 0;
+         }
+}
+void filter_ADC_samples()
+{
+ int i;
+ for(i=0;i<6;i++)
+ {
+        FILT_Samples[i] += (ADC_Samples[i] * Scale - FILT_Samples[i]) / 2;
+ }
+}
 void ProcessRPM(int instance) {
 // compute the timer values
 // snapshot timers
         unsigned long RPM_Pulsewidth;
         unsigned long RPM_Count_Val;
+        }
         if (RPM_Pulsecount > 0) {
                 // now have time for N pulses in clocks
                 // need to scale by 19.55: one unit is 19.55 RPM
                 // 1Hz is 60 RPM
-                Coded_RPM = (30.0 / 19.55 * RPM_Pulsecount * RPM_COUNT_RATE)
+                float new_RPM = (30.0 / 19.55 * RPM_Pulsecount * RPM_COUNT_RATE)
-                                / (RPM_FilteredWidth) + 0.5;
+                                                / (RPM_FilteredWidth) + 0.5;
+                Coded_RPM += (new_RPM * Scale - Coded_RPM)/4;
 #if !defined MY_DEBUG
                 // reset here unless we want to debug
                 RPM_Pulsecount = 0;
                 RPM_FilteredWidth = 0;
 #endif
+        }
-// send the current RPM calculation
+// send the current RPM *calculation
         plx_sendword(PLX_RPM);
         PutCharSerial(&uc1, instance);
-        plx_sendword(Coded_RPM);
+        plx_sendword(Coded_RPM/Scale);
+}
 uint8_t CHT_Timer = 0;
 // this uses a MAX6675 which is a simple 16 bit read
+        {
                 CHT_Timer=0;
                    HAL_GPIO_WritePin(SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_RESET);
-                   HAL_Delay(1);
                    HAL_SPI_Receive(&hspi1, buffer, 2, 2);
+                   HAL_GPIO_WritePin(SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_SET);
                    uint16_t obs = (buffer[0]<<8)| buffer[1];
                    uint8_t  good = (obs & 4)==0;
+                   {
                      Coded_CHT = obs>>5;
+                   }
                    else
+                   {
-                          Coded_CHT= 1000; // signal fail
+                          Coded_CHT= 1024; // signal fail
+                   }
+        }
         plx_sendword(PLX_X_CHT);
         PutCharSerial(&uc1, instance);
         plx_sendword(Coded_CHT);
-     HAL_GPIO_WritePin(SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_SET);
+}
+// 1023 is 20.00 volts.
 void ProcessBatteryVoltage(int instance)
+{
+    float reading = FILT_Samples[instance] * ADC_Scale ;
+    reading = reading * 7.8125; // real voltage
+    reading = reading * 51.15 ; // 1023/20
         plx_sendword(PLX_Volts);
         PutCharSerial(&uc1, instance);
-        plx_sendword(ADC_Samples[instance]);
+        plx_sendword((uint16_t)reading);
+}
+// 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)
+// I believe the sensor reads  4.5V at 1000kPa and 0.5V at  0kPa
+void ProcessMAP(int instance)
+{
+// Using ADC_Samples[3] as the MAP input
+    float reading = FILT_Samples[3] * ADC_Scale;
+    reading = reading * 2.016; // real voltage
+    reading = (reading-0.5) * 1000/ 4;
+        plx_sendword(PLX_MAP);
+        PutCharSerial(&uc1, instance);
+        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)
+{
+// Using ADC_Samples[2] as the MAP input
+    float reading = FILT_Samples[2] *  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);
+        plx_sendword((uint16_t)reading);
+}
 void ProcessTiming(int instance)
+{
         plx_sendword(PLX_Timing);
         PutCharSerial(&uc1, instance);
         plx_sendword(64-15); // make it negative
+}
 /* USER CODE END 0 */
 int main(void)
+{
 // Start the counter
         HAL_TIM_Base_Start(&htim2);
 // Start the input capture and the interrupt
         HAL_TIM_IC_Start_IT(&htim2,TIM_CHANNEL_1);
+        init_ADC_filter();
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
           PutCharSerial(&uc2,(val&31) + 32);
   // send the observations
+         filter_ADC_samples();
                  ProcessRPM(0);
                  ProcessCHT(0);
-                 ProcessBatteryVoltage(3);
+                 ProcessBatteryVoltage(0); // Batt 1
-                 ProcessBatteryVoltage(1);
+                 ProcessBatteryVoltage(1); // Batt 2
+//               ProcessBatteryVoltage(2); // oil pressure
+//               ProcessBatteryVoltage(3); // MAP
+                 ProcessBatteryVoltage(4); // temperature sensor
+//               ProcessBatteryVoltage(5); // vrefint
+                 ProcessMAP(0);
+                 ProcessOilPress(0);
                  ProcessTiming(0);
                  PutCharSerial(&uc1,PLX_Stop);
+                }
     /**Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
     */
   sConfig.Channel = ADC_CHANNEL_10;
   sConfig.Rank = 1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_24CYCLES;
+  sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
   if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }

Subversion Repositories EngineBay2

(root)/trunk/Src/main.c – Rev 16 → 17