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

 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "libSerial/serial.h"
 #include "libPLX/commsLib.h"
 #include "libTinyWB/tinyWB.h"
+// Semihosting enable : see
+// https://community.st.com/t5/stm32-mcus/how-to-use-semihosting-with-stm32cubeide-and-stm32/ta-p/49742
+/// #include <stdio.h>
+// extern void initialise_monitor_handles(void);
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
 CAN_HandleTypeDef hcan;
+IWDG_HandleTypeDef hiwdg;
 SPI_HandleTypeDef hspi1;
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
 static void MX_GPIO_Init(void);
 static void MX_CAN_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_USART2_UART_Init(void);
+static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
 // user provided callback symbol
 void libPLXcallbackSendUserData()
+{
-  if (heaterEnable)
-    HAL_GPIO_TogglePin(LED_GPIO_Port, LED_Pin);
+  HAL_GPIO_TogglePin(YELLOW_LED_GPIO_Port, YELLOW_LED_Pin);
-  else
-    HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin,GPIO_PIN_RESET);
   // send AFR
   PLX_SensorInfo info;
   ConvToPLXInstance(libPLXgetNextInstance(PLX_AFR), &info);
   ConvToPLXAddr(PLX_AFR, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_AFR, AFR_Gasoline, AFRValue), &info);
   sendInfo(&uc2, &info);
+{
   heaterEnable = (HAL_GetTick() - timeValue) > MIN_RPM_TIME_ACTIVE;
   // Active low pin to enable AFR if RPM has exceeded minimum for at least the active time
   HAL_GPIO_WritePin(enableAFRN_GPIO_Port, enableAFRN_Pin, heaterEnable ? GPIO_PIN_RESET : GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GREEN_LED_GPIO_Port, GREEN_LED_Pin, heaterEnable);
+}
+// refresh watchdog timer
+void watchdogWrite()
+{
+  HAL_IWDG_Refresh(&hiwdg);
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
  * @retval int
  */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
+  //  initialise_monitor_handles();
   /* USER CODE END 1 */
   /* MCU Configuration--------------------------------------------------------*/
   MX_GPIO_Init();
   MX_CAN_Init();
   MX_SPI1_Init();
   MX_USART1_UART_Init();
   MX_USART2_UART_Init();
+  MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
   init_usart_ctl(&uc1, &huart1, tx1Buffer, rx1Buffer, TX_USART_BUFF_SIZ, RX_USART_BUFF_SIZ);
   init_usart_ctl(&uc2, &huart2, tx2Buffer, rx2Buffer, TX_USART_BUFF_SIZ, RX_USART_BUFF_SIZ);
   ResetRxBuffer(&uc1);
     pollTinyWB(&uc1, &AFRValue, &temperature);
     // Handle PLX
     libPLXpollData(&uc2);
     checkHeaterEnable();
+    watchdogWrite();
+    HAL_Delay(10);
     /* USER CODE END WHILE */
     /* USER CODE BEGIN 3 */
+  }
   /* USER CODE END 3 */
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
   /** Initializes the RCC Oscillators according to the specified parameters
    * in the RCC_OscInitTypeDef structure.
    */
-  RCC_OscInitStruct.OscillatorType = 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;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL8;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
   /* USER CODE END CAN_Init 2 */
+}
 /**
+ * @brief IWDG Initialization Function
+ * @param None
+ * @retval None
+ */
+static void MX_IWDG_Init(void)
+{
+  /* USER CODE BEGIN IWDG_Init 0 */
+  /* USER CODE END IWDG_Init 0 */
+  /* USER CODE BEGIN IWDG_Init 1 */
+  /* USER CODE END IWDG_Init 1 */
+  hiwdg.Instance = IWDG;
+  hiwdg.Init.Prescaler = IWDG_PRESCALER_32;
+  hiwdg.Init.Reload = 4095;
+  if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IWDG_Init 2 */
+  /* USER CODE END IWDG_Init 2 */
+}
+/**
  * @brief SPI1 Initialization Function
  * @param None
  * @retval None
  */
 static void MX_SPI1_Init(void)
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, GPIO_PIN_SET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOA, SPI_CD_Pin | SPI_NSS_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOA, GREEN_LED_Pin | YELLOW_LED_Pin | SPI_CD_Pin | SPI_NSS_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(SPI_RESET_GPIO_Port, SPI_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(enableAFRN_GPIO_Port, enableAFRN_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(enableAFRN_GPIO_Port, enableAFRN_Pin, GPIO_PIN_SET);
   /*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_HIGH;
   HAL_GPIO_Init(LED_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pins : SPI_CD_Pin SPI_NSS_Pin */
+  /*Configure GPIO pins : GREEN_LED_Pin YELLOW_LED_Pin SPI_CD_Pin SPI_NSS_Pin */
-  GPIO_InitStruct.Pin = SPI_CD_Pin | SPI_NSS_Pin;
+  GPIO_InitStruct.Pin = GREEN_LED_Pin | YELLOW_LED_Pin | SPI_CD_Pin | SPI_NSS_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);

Subversion Repositories AFRtranscoder

(root)/trunk/Core/Src/main.c – Rev 2 → 3