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

 /* USER CODE BEGIN Header */
 /**
-  ******************************************************************************
+ ******************************************************************************
-  * @file           : main.c
+ * @file           : main.c
-  * @brief          : Main program body
+ * @brief          : Main program body
-  ******************************************************************************
+ ******************************************************************************
-  * @attention
+ * @attention
-  *
+ *
-  * Copyright (c) 2023 STMicroelectronics.
+ * Copyright (c) 2023 STMicroelectronics.
-  * All rights reserved.
+ * All rights reserved.
-  *
+ *
-  * This software is licensed under terms that can be found in the LICENSE file
+ * This software is licensed under terms that can be found in the LICENSE file
-  * in the root directory of this software component.
+ * in the root directory of this software component.
-  * If no LICENSE file comes with this software, it is provided AS-IS.
+ * If no LICENSE file comes with this software, it is provided AS-IS.
-  *
+ *
-  ******************************************************************************
+ ******************************************************************************
-  */
+ */
 /* USER CODE END Header */
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
- CAN_HandleTypeDef hcan;
+CAN_HandleTypeDef hcan;
 I2C_HandleTypeDef hi2c1;
 IWDG_HandleTypeDef hiwdg;
   PLX_SensorInfo info;
   ConvToPLXInstance(ourMAPindex, &info);
   ConvToPLXAddr(PLX_MAP, &info);
   ConvToPLXReading(ConveriMFDData2Raw(PLX_MAP, PRESSURE_kPa, comp_pres / 1000.0), &info);
   int i;
-  for (i = 0; i < sizeof(PLX_SensorInfo);++i)
+  for (i = 0; i < sizeof(PLX_SensorInfo); ++i)
     PutCharSerial(&uc2, info.bytes[i]);
+}
 void triggerSAW()
+{
-  ///@todo trigger the PIP signal on Timer 2
+  // trigger SAW timer, timer 1
+  __HAL_TIM_ENABLE(&htim1);
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
 /* 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_TIM3_Init();
   MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
   cc_init();
+  HAL_TIM_Base_Start(&htim1);
+  __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);
   uint32_t lastTick = HAL_GetTick();
   uint32_t displayOff = lastTick + 10000;
   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;
       if (rslt == 0)
+      {
         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(rslt2==0  && rslt3 == 0)
+        if (rslt2 == 0 && rslt3 == 0)
-        cc_feed_env(comp_pres, comp_temp);
+          cc_feed_env(comp_pres, comp_temp);
+      }
+    }
     // compute RPM value, feed to display
+    int rpm = CalculateRPM();
-    int rpm = 1000;
+    if (rpm > 0)
+    {
-    cc_feed_rpm(rpm);
+      cc_feed_rpm(rpm);
-    // compute timing value, feed to display
+      // compute timing value, feed to display
-    int timing = mapTiming(rpm, 1000 - comp_pres / 100);
+      int timing = mapTiming(rpm, 1000 - comp_pres / 100);
-    cc_feed_timing(timing);
+      cc_feed_timing(timing);
-    int microsecs = mapTimingToMicroseconds(timing,0);
+      int microsecs = mapTimingToMicroseconds(timing, 0);
-    __HAL_TIM_SET_COMPARE(&htim1,TIM_CHANNEL_1,microsecs);
+      __HAL_TIM_SET_AUTORELOAD(&htim1, microsecs + SAW_DELAY);
+    }
-    __HAL_TIM_ENABLE(&htim2);
-    /// @todo setup pulse width for EDIS control
     // Handle PLX
     // poll the  input for a stop bit or timeout
     if (PollSerial(&uc2))
+    {
       timeout = HAL_GetTick() + T100MS * 2;
+  }
   /* 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 */
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
   if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
-  sConfigOC.OCMode = TIM_OCMODE_INACTIVE;
+  sConfigOC.OCMode = TIM_OCMODE_ACTIVE;
-  sConfigOC.Pulse = 1;
+  sConfigOC.Pulse = SAW_DELAY;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET;
   sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
+  }
   /* 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, GPIO_PIN_4|GPIO_PIN_6, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOA, SPI1_NSS_Pin | SPI1_RESET_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(SPI1_CD_GPIO_Port, SPI1_CD_Pin, GPIO_PIN_RESET);
-  /*Configure GPIO pins : PA4 PA6 */
+  /*Configure GPIO pins : SPI1_NSS_Pin SPI1_RESET_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_6;
+  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 : PB0 */
+  /*Configure GPIO pin : SPI1_CD_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_0;
+  GPIO_InitStruct.Pin = SPI1_CD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(SPI1_CD_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pin : PB12 */
+  /*Configure GPIO pin : PUSHBUTTON_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_12;
+  GPIO_InitStruct.Pin = PUSHBUTTON_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(PUSHBUTTON_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pin : PA9 */
+  /*Configure GPIO pin : dualSpark_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_9;
+  GPIO_InitStruct.Pin = dualSpark_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  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 3 → 4