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

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "memory.h"
 #include "display.h"
 #include "bmp280driver.h"
 #include "libMisc/fixI2C.h"
 #include "libPlx/plx.h"
 #include "libSerial/serial.h"
 #include "libIgnTiming/timing.h"
 #include "libIgnTiming/edis.h"
+#include "libIgnTiming/rpm.h"
 #include "saveTiming.h"
 #include "libPLX/commsLib.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 // compensated temperature
 int32_t comp_temp = -10000;
 int32_t timing = 0;
 // 6 degrees error in timing wheel this time ..
 int const TIMING_OFFSET = -6 * TIMING_SCALE;
+// default atmospheric pressure
+uint32_t const DEFAULT_ATMOSPHERIC_PRESSURE = 1014 * 100;
+uint32_t const DEFAULT_ATMOSPHERIC_TEMPERATURE = 25 * 100;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
 static void MX_USART2_UART_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
-// send a PLX_SensorInfo structure to the usart.
-void sendInfo(usart_ctl *uc, PLX_SensorInfo *info)
-{
-  for (int i = 0; i < sizeof(PLX_SensorInfo); ++i)
-    PutCharSerial(uc, info->bytes[i]);
-}
 void libPLXcallbackSendUserData()
+{
   // send MAP
   PLX_SensorInfo info;
   uint32_t displayOff = lastTick + 10000;
   uint32_t displayReinitialise = lastTick + DISPLAY_REINITIALISE; // every minute, reinitialise display because of risk of noise
   uint8_t intensity = 2;
   ResetRxBuffer(&uc2);
   resetPLX();
   // HAL_IWDG_Init(&hiwdg);
       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 rslt3 = 1;
       if (rslt == 0)
+      {
-        uint8_t rslt2 = bmp280_get_comp_pres_32bit(&comp_pres, ucomp_data.uncomp_press, &bmp);
+        rslt2 = bmp280_get_comp_pres_32bit(&comp_pres, ucomp_data.uncomp_press, &bmp);
-        uint8_t rslt3 = bmp280_get_comp_temp_32bit(&comp_temp, ucomp_data.uncomp_temp, &bmp);
+        rslt3 = bmp280_get_comp_temp_32bit(&comp_temp, ucomp_data.uncomp_temp, &bmp);
 #if defined TEST_CODE
         comp_pres = 100000;
         comp_temp = 4000;
 #endif
-        if (rslt2 == 0 && rslt3 == 0)
-          cc_feed_env(comp_pres, comp_temp);
+      }
+      // 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);
+      else
+        cc_feed_env(DEFAULT_ATMOSPHERIC_PRESSURE, DEFAULT_ATMOSPHERIC_TEMPERATURE);
-      // 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);
-        cc_feed_timing(timing );
+        cc_feed_timing(timing);
         int microsecs = mapTimingToMicroseconds(timing + TIMING_OFFSET, 0);
         __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+      }
+    }
     // Handle PLX
     libPLXpollData(&uc2);
     /* USER CODE END WHILE */
     /* USER CODE BEGIN 3 */
     watchdogWrite();
+    HAL_GPIO_TogglePin(LED_GPIO_Port, LED_Pin);
     // todo occasionally     saveTimingInfoToNvram();
+  }
   /* USER CODE END 3 */
+}
  * @retval None
  */
 static void MX_GPIO_Init(void)
+{
   GPIO_InitTypeDef GPIO_InitStruct = {0};
+  /* USER CODE BEGIN MX_GPIO_Init_1 */
+  /* USER CODE END MX_GPIO_Init_1 */
   /* GPIO Ports Clock Enable */
+  __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOD_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_RESET);
+  /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOA, SPI1_NSS_Pin | SPI1_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(SPI1_CD_GPIO_Port, SPI1_CD_Pin, GPIO_PIN_RESET);
+  /*Configure GPIO pin : LED_Pin */
+  GPIO_InitStruct.Pin = LED_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(LED_GPIO_Port, &GPIO_InitStruct);
   /*Configure GPIO pins : SPI1_NSS_Pin SPI1_RESET_Pin */
   GPIO_InitStruct.Pin = SPI1_NSS_Pin | SPI1_RESET_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   /*Configure GPIO pin : dualSpark_Pin */
   GPIO_InitStruct.Pin = dualSpark_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(dualSpark_GPIO_Port, &GPIO_InitStruct);
+  /* USER CODE BEGIN MX_GPIO_Init_2 */
+  /* USER CODE END MX_GPIO_Init_2 */
+}
 /* USER CODE BEGIN 4 */
 /* USER CODE END 4 */

Subversion Repositories EDIS_Ignition

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