WebSVN – EDIS_Ignition – Diff – /trunk/Core/Src/main.c

 /* USER CODE BEGIN PV */
 int const T100MS = 100;
 int const DISPLAY_REINITIALISE = 60 * 1000;
-// compensated pressure in mb * 100
+/// @brief compensated pressure in mb * 100
-uint32_t comp_pres = 0;
+uint32_t compensatedManifoldPressure = 0;
+/// @brief compensated atmospheric pressure
+uint32_t compensatedAtmosphericPressure = 0;
-// compensated temperature
+/// @brief compensated temperature
-int32_t comp_temp = -10000;
+int32_t compensatedTemperature = -10000;
 int32_t timing = 0;
 // 6 degrees error in timing wheel this time ..
 int const TIMING_OFFSET = -6 * TIMING_SCALE;
 uint32_t const DEFAULT_ATMOSPHERIC_PRESSURE = 1014 * 100;
 uint32_t const DEFAULT_ATMOSPHERIC_TEMPERATURE = 25 * 100;
 // Serial buffers
 #define TX_BUFFER_SIZE 128
 #define RX_BUFFER_SIZE 128
 unsigned volatile char tx_buffer[TX_BUFFER_SIZE];
 unsigned volatile char rx_buffer[RX_BUFFER_SIZE];
 /* USER CODE END PV */
 static void MX_USART2_UART_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
-void libPLXcallbackRecievedData(PLX_SensorInfo * info)
+void libPLXcallbackRecievedData(PLX_SensorInfo *info)
+{
-{ (void)info; }
+  (void)info;
+}
 void libPLXcallbackSendUserData()
+{
   // send MAP
   PLX_SensorInfo info;
   ConvToPLXInstance(libPLXgetNextInstance(PLX_MAP), &info);
   ConvToPLXAddr(PLX_MAP, &info);
-  ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, (float)(comp_pres) / 100.0), &info);
+  ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, (float)(compensatedManifoldPressure) / 100.0), &info);
   sendInfo(&uc2, &info);
   ConvToPLXInstance(libPLXgetNextInstance(PLX_Timing), &info);
   ConvToPLXAddr(PLX_Timing, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_Timing, 0, (float)(timing) / TIMING_SCALE), &info);
   // Start the input capture and the falling edge interrupt
   HAL_TIM_IC_Start_IT(&htim2, TIM_CHANNEL_2);
   __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 5); // delay of 5 uS
- // HAL_I2C_ClearBusyFlagErrata_2_14_7(&hi2c1);
+  // HAL_I2C_ClearBusyFlagErrata_2_14_7(&hi2c1);
   MX_I2C1_Init();
-  init_bmp(&hi2c1);
+  init_bmp(&hi2c1, &bmp);
+  init_bmp(&hi2c1, &bmpAtm);
   uint32_t lastTick = HAL_GetTick();
   uint32_t displayOff = lastTick + 10000;
   uint32_t displayReinitialise = lastTick + DISPLAY_REINITIALISE; // every minute, reinitialise display because of risk of noise
     if (HAL_GetTick() - lastTick > T100MS)
+    {
       lastTick = HAL_GetTick();
       /* Reading the raw data from sensor */
       struct bmp280_uncomp_data ucomp_data;
       uint8_t rslt = bmp280_get_uncomp_data(&ucomp_data, &bmp);
-      uint8_t rslt2 = 1;
+      uint8_t manifoldStatus = 1;
-      uint8_t rslt3 = 1;
+      uint8_t temperatureStatus = 1;
+      uint8_t atmosphericStatus = 1;
-      if (rslt == 0)
+      if (rslt == BMP280_OK)
+      {
-        rslt2 = bmp280_get_comp_pres_32bit(&comp_pres, ucomp_data.uncomp_press, &bmp);
+        manifoldStatus = bmp280_get_comp_pres_32bit(&compensatedManifoldPressure, ucomp_data.uncomp_press, &bmp);
-        rslt3 = bmp280_get_comp_temp_32bit(&comp_temp, ucomp_data.uncomp_temp, &bmp);
+        temperatureStatus = bmp280_get_comp_temp_32bit(&compensatedTemperature, ucomp_data.uncomp_temp, &bmp);
 #if defined TEST_CODE
-        comp_pres = 100000;
+        compensatedManifoldPressure = 100000;
-        comp_temp = 4000;
+        compensatedTemperature = 4000;
 #endif
+      }
+      // get atmospheric data
+      if (rslt == BMP280_OK)
+      {
+        rslt = bmp280_get_uncomp_data(&ucomp_data, &bmpAtm);
+        // now to read the environmental pressure
+        if (rslt == BMP280_OK)
+          atmosphericStatus = bmp280_get_comp_pres_32bit(&compensatedAtmosphericPressure, ucomp_data.uncomp_press, &bmpAtm);
+      }
+      if (manifoldStatus != BMP280_OK)
+        compensatedManifoldPressure = DEFAULT_ATMOSPHERIC_PRESSURE;
+      if (temperatureStatus != BMP280_OK)
+        compensatedTemperature = DEFAULT_ATMOSPHERIC_TEMPERATURE;
+      if (atmosphericStatus != BMP280_OK)
+        compensatedAtmosphericPressure = DEFAULT_ATMOSPHERIC_PRESSURE;
+      uint32_t vacuum = compensatedAtmosphericPressure - compensatedManifoldPressure;
       // if the BMP280 pressure is good, then allow it through, otherwise drop to
       // centrifugal advance only.
-      if (rslt == BMP280_OK && rslt2 == BMP280_OK && rslt3 == BMP280_OK)
-        cc_feed_env(comp_pres, comp_temp);
+      // feed difference and add default pressure
-      else
-        cc_feed_env(DEFAULT_ATMOSPHERIC_PRESSURE, DEFAULT_ATMOSPHERIC_TEMPERATURE);
+      cc_feed_env(vacuum + DEFAULT_ATMOSPHERIC_PRESSURE, compensatedTemperature);
-        // compute RPM value, feed to display
+      // compute RPM value, feed to display
 #if defined TEST_CODE
       int rpm = 1000;
 #else
       int rpm = CalculateRPM();
 #endif
       if (rpm > 0)
+      {
         cc_feed_rpm(rpm);
         // compute timing value, feed to display
-        timing = mapTiming(rpm, 1000 - comp_pres / 100);
+        timing = mapTiming(rpm, 1000 - vacuum / 100);
         cc_feed_timing(timing);
         // enable double spark below 1200 rpm
         int microsecs = mapTimingToMicroseconds(timing + TIMING_OFFSET, rpm > DOUBLE_SPARK_RPM);
         __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+      }

Subversion Repositories EDIS_Ignition

(root)/trunk/Core/Src/main.c – Rev 19 → 20