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

 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* 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"
 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
- CAN_HandleTypeDef hcan;
+CAN_HandleTypeDef hcan;
 I2C_HandleTypeDef hi2c1;
 IWDG_HandleTypeDef hiwdg;
 UART_HandleTypeDef huart2;
 /* USER CODE BEGIN PV */
 int const T100MS = 100;
-// index for our MAP value (there is maybe another in the system)
+// index for all observations
-char ourMAPindex = 0;
+char obsIndex[PLX_MAX_OBS];
+int const DISPLAY_REINITIALISE = 60 * 1000;
 // compensated pressure in mb * 100
 uint32_t comp_pres = 0;
 // compensated temperature
 int32_t comp_temp = -10000;
 void processObservations()
+{
   // send MAP
   PLX_SensorInfo info;
-  ConvToPLXInstance(ourMAPindex, &info);
+  ConvToPLXInstance(obsIndex[PLX_MAP]++, &info);
   ConvToPLXAddr(PLX_MAP, &info);
-  ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, comp_pres / 1000.0), &info);
+  ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, (float)(comp_pres) / 100.0), &info);
   sendInfo(&uc2, &info);
-  ConvToPLXInstance(0, &info);
+  ConvToPLXInstance(obsIndex[PLX_Timing]++, &info);
   ConvToPLXAddr(PLX_Timing, &info);
-  ConvToPLXReading(ConveriMFDData2Raw(PLX_Timing, 0, timing / TIMING_SCALE), &info);
+  ConvToPLXReading(ConveriMFDData2Raw(PLX_Timing, 0, (float)(timing) / TIMING_SCALE), &info);
   sendInfo(&uc2, &info);
+}
 void triggerSAW()
+{
+}
 /* USER CODE END 0 */
 /**
-  * @brief  The application entry point.
+ * @brief  The application entry point.
-  * @retval int
+ * @retval int
-  */
+ */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
   /* USER CODE END 1 */
   MX_I2C1_Init();
   init_bmp(&hi2c1);
   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
   uint8_t intensity = 2;
   uint32_t timeout = 0;
   uint8_t send = 0; // enable sending our PLX data when non zero
   ResetRxBuffer(&uc2);
   // used to store data
   PLX_SensorInfo info;
+  // counter of information
   int infoCount = -1;
+  memset(obsIndex, 0, PLX_MAX_OBS); // zero incoming obsevation index
-// dont do this   loadTimingInfoFromNvram();
+  // dont do this   loadTimingInfoFromNvram();
   // HAL_IWDG_Init(&hiwdg);
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
+  {
     int button = HAL_GPIO_ReadPin(PUSHBUTTON_GPIO_Port, PUSHBUTTON_Pin) == GPIO_PIN_RESET;
     if (button)
+    {
       intensity = 2;
         intensity = 1; // was 0
+      }
     default:
       break;
+    }
+    // periodically write to the display and clear it
+    if (HAL_GetTick() > displayReinitialise)
+    {
+      displayReinitialise += DISPLAY_REINITIALISE;
+      cc_display(0, intensity, 1);
+    }
+    else
-    cc_display(0, intensity, 0);
+      cc_display(0, intensity, 0);
     if (HAL_GetTick() - lastTick > T100MS)
+    {
       lastTick = HAL_GetTick();
       /* Reading the raw data from sensor */
         uint8_t 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);
 #if defined TEST_CODE
         comp_pres = 100000;
         comp_temp = 4000;
 #endif
         if (rslt2 == 0 && rslt3 == 0)
           cc_feed_env(comp_pres, comp_temp);
+      }
       // 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);
+      {
         PutCharSerial(&uc2, c); // echo all but the stop bit
+      }
       else
       {           // must be a stop character
-        send = 1; // start our sending process.
+        send = 1; // start our sending process
+      }
       // look up the i
       if (c == PLX_Start)
+      {
-        ourMAPindex = 0;
         infoCount = 0;
+      }
       else
+      {
         info.bytes[infoCount++] = c;
-        // process the sensor info field
+        // process the sensor info field : discover maximum observation index
         if (infoCount == sizeof(PLX_SensorInfo))
+        {
           infoCount = 0;
           int addr = ConvPLXAddr(&info);
-          if (addr == PLX_MAP)
+          if (addr < PLX_MAX_OBS && (obsIndex[addr] <= info.Instance))
-            ourMAPindex = info.Instance + 1;
+            obsIndex[addr] = info.Instance + 1;
+        }
+      }
       if (c == PLX_Stop)
         infoCount = -1;
+    {
       send = 0;
       // send the observations
       processObservations();
+      memset(obsIndex, 0, PLX_MAX_OBS); // zero incoming obsevation index
       //
       PutCharSerial(&uc2, PLX_Stop);
+    }
     /* USER CODE END WHILE */
+  }
   /* USER CODE END 3 */
+}
 /**
-  * @brief System Clock Configuration
+ * @brief System Clock Configuration
-  * @retval None
+ * @retval None
-  */
+ */
 void SystemClock_Config(void)
+{
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
   /** Initializes the RCC Oscillators according to the specified parameters
-  * in the RCC_OscInitTypeDef structure.
+   * in the RCC_OscInitTypeDef structure.
-  */
+   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_HSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.LSIState = RCC_LSI_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  {
     Error_Handler();
+  }
   /** Initializes the CPU, AHB and APB buses clocks
-  */
+   */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
   RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
   RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
   RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
     Error_Handler();
+  }
+}
 /**
-  * @brief CAN Initialization Function
+ * @brief CAN Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_CAN_Init(void)
+{
   /* USER CODE BEGIN CAN_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN CAN_Init 2 */
   /* USER CODE END CAN_Init 2 */
+}
 /**
-  * @brief I2C1 Initialization Function
+ * @brief I2C1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_I2C1_Init(void)
+{
   /* USER CODE BEGIN I2C1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN I2C1_Init 2 */
   /* USER CODE END I2C1_Init 2 */
+}
 /**
-  * @brief IWDG Initialization Function
+ * @brief IWDG Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_IWDG_Init(void)
+{
   /* USER CODE BEGIN IWDG_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN IWDG_Init 2 */
   /* USER CODE END IWDG_Init 2 */
+}
 /**
-  * @brief SPI1 Initialization Function
+ * @brief SPI1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_SPI1_Init(void)
+{
   /* USER CODE BEGIN SPI1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN SPI1_Init 2 */
   /* USER CODE END SPI1_Init 2 */
+}
 /**
-  * @brief TIM1 Initialization Function
+ * @brief TIM1 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_TIM1_Init(void)
+{
   /* USER CODE BEGIN TIM1_Init 0 */
+  }
   /* USER CODE BEGIN TIM1_Init 2 */
   /* USER CODE END TIM1_Init 2 */
   HAL_TIM_MspPostInit(&htim1);
+}
 /**
-  * @brief TIM2 Initialization Function
+ * @brief TIM2 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_TIM2_Init(void)
+{
   /* USER CODE BEGIN TIM2_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM2_Init 2 */
   /* USER CODE END TIM2_Init 2 */
+}
 /**
-  * @brief TIM3 Initialization Function
+ * @brief TIM3 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_TIM3_Init(void)
+{
   /* USER CODE BEGIN TIM3_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM3_Init 2 */
   /* USER CODE END TIM3_Init 2 */
+}
 /**
-  * @brief USART2 Initialization Function
+ * @brief USART2 Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_USART2_UART_Init(void)
+{
   /* USER CODE BEGIN USART2_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN USART2_Init 2 */
   /* USER CODE END USART2_Init 2 */
+}
 /**
-  * @brief GPIO Initialization Function
+ * @brief GPIO Initialization Function
-  * @param None
+ * @param None
-  * @retval None
+ * @retval None
-  */
+ */
 static void MX_GPIO_Init(void)
+{
   GPIO_InitTypeDef GPIO_InitStruct = {0};
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOD_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, SPI1_NSS_Pin|SPI1_RESET_Pin, GPIO_PIN_RESET);
+  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 pins : SPI1_NSS_Pin SPI1_RESET_Pin */
-  GPIO_InitStruct.Pin = 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;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*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 4 */
 /* USER CODE END 4 */
 /**
-  * @brief  This function is executed in case of error occurrence.
+ * @brief  This function is executed in case of error occurrence.
-  * @retval None
+ * @retval None
-  */
+ */
 void Error_Handler(void)
+{
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
   __disable_irq();
+  {
+  }
   /* USER CODE END Error_Handler_Debug */
+}
-#ifdef  USE_FULL_ASSERT
+#ifdef USE_FULL_ASSERT
 /**
-  * @brief  Reports the name of the source file and the source line number
+ * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
+ *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
+ * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
+ * @param  line: assert_param error line source number
-  * @retval None
+ * @retval None
-  */
+ */
 void assert_failed(uint8_t *file, uint32_t line)
+{
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
      ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */

Subversion Repositories EDIS_Ignition

(root)/trunk/Core/Src/main.c – Rev 13 → 14