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

 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 #define ADC_CHANNELS 7
+#define ADC_MAP_CHAN 2
+#define ADC_PRESSURE_CHAN 3
+#define ADC_REF_CHAN 5
+#define ADC_TEMP_CHAN 6
 // with a dwell angle of 45 degrees , 4 cylinders and a maximum RPM of 5000
 // freq = 5000/60 * 2 = 166Hz.
 // the TIM2 counter counts in 10uS increments,
 // TODO this is wrong algo. Accept FIRST pulse, skip shorter pulses
 // Accept the first pulse with over 2.5mS (1/400 sec)  duration as the closure
 volatile char TimerFlag = 0;
 volatile char NoSerialInCTR = 0; // Missing characters coming in on USART1
 volatile char NoSerialIn = 0;
+// scale for filtered samples
+#define Scale 1024.0
 // storage for ADC
 uint16_t ADC_Samples[ADC_CHANNELS];
+uint32_t FILT_Samples[ADC_CHANNELS]; // filtered ADC samples * Scale
-#define Scale 1024.0
+#define NOM_VREF 3.3
+// initial ADC vref
+float  adc_vref   = NOM_VREF;
+// internal bandgap voltage reference
+const float STM32REF = 1.2;           // 1.2V typical
+// scale factor initially assuming
-const float ADC_Scale = 3.3 / (Scale * 4096.0); // convert to a voltage
+float ADC_Scale = 1/(Scale * 4096) * NOM_VREF ;
-uint32_t FILT_Samples[ADC_CHANNELS]; // filtered ADC samples * 1024
 // Rev counter processing from original RevCounter Project
 uint16_t RPM_Diff = 0;
 uint16_t RPM_Count_Latch = 0;
 // accumulators
 uint16_t RPM_Pulsecount = 0;
+    {
       FILT_Samples[i] += (ADC_Samples[i] * Scale - FILT_Samples[i]) / 2;
+    }
+}
+/****!
+ * @brief this reads the reference voltage within the STM32L151
+ * Powers up reference voltage and temperature sensor, waits 3mS  and takes reading
+ * Requires that the ADC be powered up
+ */
+void
+CalibrateADC (void)
+{
+  float adc_val = FILT_Samples[ADC_REF_CHAN]  ;       // as set up in device config
+  float adc_vref = STM32REF * ( 4096.0 * Scale)/  adc_val; // the estimate for checking
+  ADC_Scale = 1/(Scale * 4096) * adc_vref ;
+}
 void
 ProcessRPM (int instance)
+{
 // compute the timer values
 // snapshot timers
           unsigned int next_count = (RPM_Count_Latch + 1) % RPM_SAMPLES;
           if (next_count == RPM_Count_Val)
+            {
               break; // completed loop
+            }
-          char pulse_level = RPM_Level[RPM_Count_Latch];
           base_time = RPM_Time[RPM_Count_Latch];
           new_time = RPM_Time[next_count];
           RPM_Count_Latch = next_count;
           RPM_Pulsewidth = new_time - base_time; // not wrapped
           // if the pulse was low,
-          if (pulse_level == 0 && RPM_Pulsewidth > BREAKER_MIN)
+          if (RPM_Pulsewidth > BREAKER_MIN)
+            {
               RPM_Diff = new_time - last_dwell_end;
               RPM_Period[RPM_Period_Ptr] = RPM_Diff;
 void
 ProcessBatteryVoltage (int instance)
+{
   float reading = FILT_Samples[instance] * ADC_Scale;
   reading = reading * 7.8125; // real voltage
-  reading = reading * 51.15; // 1023/20
+  reading = reading * 51.15; // PLC scaling =  1023/20
   plx_sendword (PLX_Volts);
   PutCharSerial (&uc1, instance);
   plx_sendword ((uint16_t) reading);
+}
-/****!
- * @brief this reads the reference voltage within the STM32L151
- * Powers up reference voltage and temperature sensor, waits 3mS  and takes reading
- * Requires that the ADC be powered up
- */
-uint32_t ADC_VREF_MV = 3300;           // 3.300V typical
-const uint16_t STM32REF_MV = 1224;           // 1.224V typical
-void
-CalibrateADC (void)
-{
-  uint32_t adc_val = FILT_Samples[5];       // as set up in device config
-  ADC_VREF_MV = (STM32REF_MV * 4096) / adc_val;
-}
 void
 ProcessCPUTemperature (int instance)
+{
+   // this is defined in the STM32F103 reference manual . #
-  int32_t temp_val;
+  // V25 = 1.43 volts
+  // Avg_slope = 4.3mV /degree C
+  // temperature = {(V25 - VSENSE) / Avg_Slope} + 25
-  uint16_t TS_CAL30 = *(uint16_t*) (0x1FF8007AUL); /* ADC reading for temperature sensor at 30 degrees C with Vref = 3000mV */
-  uint16_t TS_CAL110 = *(uint16_t*) (0x1FF8007EUL); /* ADC reading for temperature sensor at 110 degrees C with Vref = 3000mV */
   /* get the ADC reading corresponding to ADC channel 16 after turning on the ADC */
-  temp_val = FILT_Samples[5];
+  float temp_val = FILT_Samples[ADC_TEMP_CHAN] * ADC_Scale;
   /* renormalise temperature value to account for different ADC Vref  : normalise to that which we would get for a 3000mV reference */
-  temp_val = temp_val * ADC_VREF_MV / (Scale * 3000UL);
+  temp_val = (1.43- temp_val) / 4.3e-3 + 25;
+  int32_t result = temp_val  ;
+//  int32_t result = 800 * ((int32_t) temp_val - TS_CAL30);
+//  result = result / (TS_CAL110 - TS_CAL30) + 300;
-  int32_t result = 800 * ((int32_t) temp_val - TS_CAL30);
-  result = result / (TS_CAL110 - TS_CAL30) + 300;
-  if (result < 0)
-    {
-      result = 0;
-    }
   plx_sendword (PLX_FluidTemp);
   PutCharSerial (&uc1, instance);
-  plx_sendword (result / 10);
+  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)
 void
 ProcessMAP (int instance)
+{
 // Using ADC_Samples[3] as the MAP input
-  float reading = FILT_Samples[3] * ADC_Scale;
+  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;
 void
 ProcessOilPress (int instance)
+{
 // Using ADC_Samples[2] as the MAP input
-  float reading = FILT_Samples[2] * ADC_Scale;
+  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);
   HAL_SPI_MspInit (&hspi1);
   HAL_ADC_MspInit (&hadc1);
-  HAL_ADC_Start_DMA (&hadc1, ADC_Samples, ADC_CHANNELS);
+  HAL_ADC_Start_DMA (&hadc1, (uint32_t *)ADC_Samples, ADC_CHANNELS);
   HAL_ADC_Start_IT (&hadc1);
   HAL_TIM_Base_MspInit (&htim4);
   HAL_TIM_Base_Start_IT (&htim4);
+  }
   /** Configure Regular Channel
   */
   sConfig.Channel = ADC_CHANNEL_0;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
+  }
   /** Configure Regular Channel
   */
   sConfig.Channel = ADC_CHANNEL_3;
   sConfig.Rank = ADC_REGULAR_RANK_4;
-  sConfig.SamplingTime = ADC_SAMPLETIME_1CYCLE_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
   */
-  sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
+  sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_5;
-  sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
   */
-  sConfig.Channel = ADC_CHANNEL_4;
+  sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
   sConfig.Rank = ADC_REGULAR_RANK_7;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 38 → 39