WebSVN – EngineBay2 – Diff – /branches/stm32f103/Core/Src/main.c

 #include "main.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include <string.h>
+#include <math.h>
 #include "libSerial/serial.h"
 #include "libPLX/plx.h"
 #include "libPLX/commsLib.h"
 #include "misc.h"
 #include "libIgnTiming/rpm.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 FunctionalState CHT_Enable = ENABLE;
 #define CORR 3
+typedef struct
+{
+  uint16_t store[TEMP_CORR];
+  uint16_t result;
+} tempObservation_t;
-uint16_t Temp_Observations[NUM_SPI_TEMP_SENS] = {[0 ... NUM_SPI_TEMP_SENS - 1] = 0};
+tempObservation_t Temp_Observations[NUM_SPI_TEMP_SENS];
+void ResetTemp()
+{
+  int i,j;
+  for (i=0;i<NUM_SPI_TEMP_SENS;i++)
+  {
+    Temp_Observations[i].result = 0;
+    for (j=0;j<TEMP_CORR;j++)
+      Temp_Observations[i].store[j]=0;
+  }
+}
+void AddTempReading(uint16_t reading, int channel)
+{
+  int j;
+  for (j=TEMP_CORR-1; j>=1 ; j--)
+  {
+    Temp_Observations[channel].store[j] = Temp_Observations[channel].store[j-1];
+  }
+  Temp_Observations[channel].store[0] = reading;
+  // are all the stored values close to the current reading, if so allow it through
+  // the check here is for 5 degrees C
+  char good = 1;
+  for (j=1; j<TEMP_CORR; j++)
+    if (abs((int)Temp_Observations[channel].store[j]- (int)reading)>5)
+      good = 0;
+  if (good)
+    Temp_Observations[channel].result = reading;
+}
 /// \param item The array index to send
 /// \param type the code to use for this observation
 void ProcessTemp(struct usart_ctl * handle,char item, enum PLX_Observations type)
+{
   if (item > NUM_SPI_TEMP_SENS)
     return;
-  sendPlxInfo(handle, type , Temp_Observations[(int)item]);
+  sendPlxInfo(handle, type , Temp_Observations[(int)item].result);
+}
 /// \brief Reset the temperature chip select system
 void resetTempCS(void)
   ProcessOilPress(handle);
+}
 /* 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 */
   /* MCU Configuration--------------------------------------------------------*/
   HAL_ADC_Start_DMA(&hadc1, (uint32_t *)ADC_Samples, ADC_CHANNELS);
   HAL_ADC_Start_IT(&hadc1);
+    ResetTemp(); // reset temperature store
   HAL_TIM_Base_MspInit(&htim4);
   HAL_TIM_Base_Start_IT(&htim4);
   // initialise all the STMCubeMX stuff
   HAL_TIM_Base_MspInit(&htim2);
   /* 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};
   RCC_PeriphCLKInitTypeDef PeriphClkInit = {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_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |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 ADC1 Initialization Function
+  * @brief ADC1 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_ADC1_Init(void)
+{
   /* USER CODE BEGIN ADC1_Init 0 */
   /* USER CODE BEGIN ADC1_Init 1 */
   /* USER CODE END ADC1_Init 1 */
   /** Common config
-   */
+  */
   hadc1.Instance = ADC1;
   hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
   hadc1.Init.ContinuousConvMode = DISABLE;
   hadc1.Init.DiscontinuousConvMode = DISABLE;
   hadc1.Init.ExternalTrigConv = ADC_EXTERNALTRIGCONV_T3_TRGO;
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_0;
   sConfig.Rank = ADC_REGULAR_RANK_1;
   sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_1;
   sConfig.Rank = ADC_REGULAR_RANK_2;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_2;
   sConfig.Rank = ADC_REGULAR_RANK_3;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_3;
   sConfig.Rank = ADC_REGULAR_RANK_4;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_5;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_VREFINT;
   sConfig.Rank = ADC_REGULAR_RANK_6;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /** Configure Regular Channel
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
   sConfig.Rank = ADC_REGULAR_RANK_7;
   if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
     Error_Handler();
+  }
   /* USER CODE BEGIN ADC1_Init 2 */
   /* USER CODE END ADC1_Init 2 */
+}
 /**
- * @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 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 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 TIM4 Initialization Function
+  * @brief TIM4 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_TIM4_Init(void)
+{
   /* USER CODE BEGIN TIM4_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN TIM4_Init 2 */
   /* USER CODE END TIM4_Init 2 */
+}
 /**
- * @brief USART1 Initialization Function
+  * @brief USART1 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
 static void MX_USART1_UART_Init(void)
+{
   /* USER CODE BEGIN USART1_Init 0 */
     Error_Handler();
+  }
   /* USER CODE BEGIN USART1_Init 2 */
   /* USER CODE END USART1_Init 2 */
+}
 /**
- * Enable DMA controller clock
+  * Enable DMA controller clock
- */
+  */
 static void MX_DMA_Init(void)
+{
   /* DMA controller clock enable */
   __HAL_RCC_DMA1_CLK_ENABLE();
   /* DMA interrupt init */
   /* DMA1_Channel1_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+}
 /**
- * @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};
-  /* USER CODE BEGIN MX_GPIO_Init_1 */
+/* USER CODE BEGIN MX_GPIO_Init_1 */
-  /* USER CODE END 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();
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(LED_Blink_GPIO_Port, LED_Blink_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, SPI_CS_Clk_Pin | SPI_CS_D_Pin | ENA_AUX_5V_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOB, SPI_CS_Clk_Pin|SPI_CS_D_Pin|ENA_AUX_5V_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin : LED_Blink_Pin */
   GPIO_InitStruct.Pin = LED_Blink_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(LED_Blink_GPIO_Port, &GPIO_InitStruct);
-  /*Configure GPIO pins : SPI_CS_Clk_Pin SPI_CS_D_Pin ENA_AUX_5V_Pin */
+  /*Configure GPIO pins : SPI_CS_Clk_Pin SPI_CS_D_Pin */
-  GPIO_InitStruct.Pin = SPI_CS_Clk_Pin | SPI_CS_D_Pin | ENA_AUX_5V_Pin;
+  GPIO_InitStruct.Pin = SPI_CS_Clk_Pin|SPI_CS_D_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pin : STARTER_ON_Pin */
   GPIO_InitStruct.Pin = STARTER_ON_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(STARTER_ON_GPIO_Port, &GPIO_InitStruct);
+  /*Configure GPIO pin : ENA_AUX_5V_Pin */
+  GPIO_InitStruct.Pin = ENA_AUX_5V_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(ENA_AUX_5V_GPIO_Port, &GPIO_InitStruct);
-  /* USER CODE BEGIN MX_GPIO_Init_2 */
+/* USER CODE BEGIN MX_GPIO_Init_2 */
-  /* USER CODE END MX_GPIO_Init_2 */
+/* USER CODE END MX_GPIO_Init_2 */
+}
 /* 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 */
   /* 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,
      tex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */

Subversion Repositories EngineBay2

(root)/branches/stm32f103/Core/Src/main.c – Rev 54 → 55