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

  */
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
+// #define TEST_CODE
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "memory.h"
 #include "display.h"
 #include "bmp280driver.h"
 // 6 degrees error in timing wheel this time ..
 int const TIMING_OFFSET = -6 * TIMING_SCALE;
 // Switch over to double sparking
 int const DOUBLE_SPARK_RPM = 1200;
-// default atmospheric pressure
+// default atmospheric pressure - should be 1014
 uint32_t const DEFAULT_ATMOSPHERIC_PRESSURE = 1014 * 100;
 uint32_t const DEFAULT_ATMOSPHERIC_TEMPERATURE = 25 * 100;
 // Serial buffers
 void libPLXcallbackRecievedData(PLX_SensorInfo *info)
+{
   (void)info;
+}
-void libPLXcallbackSendUserData()
+void libPLXcallbackSendUserData(struct usart_ctl *handle)
+{
   // send MAP
   PLX_SensorInfo info;
   ConvToPLXInstance(libPLXgetNextInstance(PLX_MAP), &info);
   ConvToPLXAddr(PLX_MAP, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, (float)(compensatedManifoldPressure) / 100.0), &info);
-  sendInfo(&uc2, &info);
+  sendInfo(handle, &info);
+  // send timing
   ConvToPLXInstance(libPLXgetNextInstance(PLX_Timing), &info);
   ConvToPLXAddr(PLX_Timing, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_Timing, 0, (float)(timing) / TIMING_SCALE), &info);
-  sendInfo(&uc2, &info);
+  sendInfo(handle, &info);
+  // send temperature
+  ConvToPLXInstance(libPLXgetNextInstance(PLX_AIT), &info);
+  ConvToPLXAddr(PLX_AIT, &info);
+  ConvToPLXReading(ConveriMFDData2Raw(PLX_AIT, 0, (float)(compensatedTemperature) / 100.0), &info);
+  sendInfo(handle, &info);
+}
 void triggerSAW()
+{
   // trigger SAW timer, timer 1##pragma endregion
   __HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 5); // delay of 5 uS
   // HAL_I2C_ClearBusyFlagErrata_2_14_7(&hi2c1);
   MX_I2C1_Init();
-  init_bmp(&hi2c1, &bmp);
+  init_bmp(&hi2c1, &bmpManifold, &confManifold);
-  init_bmp(&hi2c1, &bmpAtm);
+  init_bmp(&hi2c1, &bmpAtmosphere, &confAtmosphere);
-  uint32_t lastTick = HAL_GetTick();
+  uint32_t nextTick = HAL_GetTick();
-  uint32_t displayOff = lastTick + 10000;
+  uint32_t displayOff = nextTick + 10000;
-  uint32_t displayReinitialise = lastTick + DISPLAY_REINITIALISE; // every minute, reinitialise display because of risk of noise
+  uint32_t displayReinitialise = nextTick + DISPLAY_REINITIALISE; // every minute, reinitialise display because of risk of noise
   uint8_t intensity = 2;
   ResetRxBuffer(&uc2);
     int button = HAL_GPIO_ReadPin(PUSHBUTTON_GPIO_Port, PUSHBUTTON_Pin) == GPIO_PIN_RESET;
     if (button)
+    {
       intensity = 2;
-      displayOff = lastTick + 30000;
+      displayOff = HAL_GetTick() + 30000;
+    }
     switch (intensity)
+    {
     case 2:
       if (HAL_GetTick() > displayOff)
+      {
         intensity = 1;
-        displayOff = lastTick + 60000;
+        displayOff += 60000;
+      }
       break;
     case 1:
       if (HAL_GetTick() > displayOff)
       cc_display(0, intensity, 1);
+    }
     else
       cc_display(0, intensity, 0);
-    if (HAL_GetTick() - lastTick > T100MS)
+    if (HAL_GetTick() > nextTick)
+    {
-      lastTick = HAL_GetTick();
+      nextTick = HAL_GetTick() + T100MS;
-      /* Reading the raw data from sensor */
-      struct bmp280_uncomp_data ucomp_data;
-      uint8_t rslt = bmp280_get_uncomp_data(&ucomp_data, &bmp);
       uint8_t manifoldStatus = 1;
       uint8_t temperatureStatus = 1;
       uint8_t atmosphericStatus = 1;
+      /* Reading the raw data from manifold sensor */
+      struct bmp280_uncomp_data ucomp_data;
+      uint8_t rslt = bmp280_get_uncomp_data(&ucomp_data, &bmpManifold);
       if (rslt == BMP280_OK)
+      {
-        manifoldStatus = bmp280_get_comp_pres_32bit(&compensatedManifoldPressure, ucomp_data.uncomp_press, &bmp);
+        // always calculate temperature then pressure so the pressure is correctly calibrated
-        temperatureStatus = bmp280_get_comp_temp_32bit(&compensatedTemperature, ucomp_data.uncomp_temp, &bmp);
+        temperatureStatus = bmp280_get_comp_temp_32bit(&compensatedTemperature, ucomp_data.uncomp_temp, &bmpManifold);
-#if defined TEST_CODE
-        compensatedManifoldPressure = 100000;
+        manifoldStatus = bmp280_get_comp_pres_32bit(&compensatedManifoldPressure, ucomp_data.uncomp_press, &bmpManifold);
-        compensatedTemperature = 4000;
-#endif
+      }
       // get atmospheric data
+      rslt = bmp280_get_uncomp_data(&ucomp_data, &bmpAtmosphere);
+      // now to read the environmental pressure
       if (rslt == BMP280_OK)
+      {
-        rslt = bmp280_get_uncomp_data(&ucomp_data, &bmpAtm);
+        // always calculate temperature then pressure so the pressure is correctly calibrated
-        // now to read the environmental pressure
+        temperatureStatus = bmp280_get_comp_temp_32bit(&compensatedTemperature, ucomp_data.uncomp_temp, &bmpAtmosphere);
-        if (rslt == BMP280_OK)
-          atmosphericStatus = bmp280_get_comp_pres_32bit(&compensatedAtmosphericPressure, ucomp_data.uncomp_press, &bmpAtm);
+        atmosphericStatus = bmp280_get_comp_pres_32bit(&compensatedAtmosphericPressure, ucomp_data.uncomp_press, &bmpAtmosphere);
+      }
       if (manifoldStatus != BMP280_OK)
         compensatedManifoldPressure = DEFAULT_ATMOSPHERIC_PRESSURE;
       if (temperatureStatus != BMP280_OK)
         compensatedTemperature = DEFAULT_ATMOSPHERIC_TEMPERATURE;
       if (atmosphericStatus != BMP280_OK)
         compensatedAtmosphericPressure = DEFAULT_ATMOSPHERIC_PRESSURE;
+#if defined TEST_CODE
+      compensatedManifoldPressure = 100000;
+      compensatedTemperature = 4000;
+#endif
-      uint32_t vacuum = compensatedAtmosphericPressure - compensatedManifoldPressure;
+      int32_t vacuum = compensatedAtmosphericPressure - compensatedManifoldPressure;
+      if (vacuum < 0)
+        vacuum = 0;
       // if the BMP280 pressure is good, then allow it through, otherwise drop to
       // centrifugal advance only.
       // feed difference and add default pressure
-      cc_feed_env(vacuum + DEFAULT_ATMOSPHERIC_PRESSURE, compensatedTemperature);
+      cc_feed_env(compensatedAtmosphericPressure, 100000 - vacuum, compensatedTemperature);
       // compute RPM value, feed to display
 #if defined TEST_CODE
       int rpm = 1000;
 #else
 #endif
       if (rpm > 0)
+      {
         cc_feed_rpm(rpm);
         // compute timing value, feed to display
-        timing = mapTiming(rpm, 1000 - vacuum / 100);
+        timing = mapTiming(rpm, vacuum / 100);
         cc_feed_timing(timing);
         // enable double spark below 1200 rpm
-        int microsecs = mapTimingToMicroseconds(timing + TIMING_OFFSET, rpm > DOUBLE_SPARK_RPM);
+        int microsecs = mapTimingToMicroseconds(timing + TIMING_OFFSET, rpm < DOUBLE_SPARK_RPM);
         __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+      }
+    }
     // Handle PLX

Subversion Repositories EDIS_Ignition

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