WebSVN – EngineBay2 – Diff – /trunk/Src/main.c

 uint16_t Starter_Debounce = 0;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
-void
-SystemClock_Config (void);
+void SystemClock_Config(void);
-static void
-MX_GPIO_Init (void);
+static void MX_GPIO_Init(void);
-static void
-MX_DMA_Init (void);
+static void MX_DMA_Init(void);
-static void
-MX_ADC_Init (void);
+static void MX_ADC_Init(void);
-static void
-MX_SPI1_Init (void);
+static void MX_SPI1_Init(void);
-static void
-MX_TIM2_Init (void);
+static void MX_TIM2_Init(void);
-static void
-MX_TIM6_Init (void);
+static void MX_TIM6_Init(void);
-static void
-MX_USART1_UART_Init (void);
+static void MX_USART1_UART_Init(void);
-static void
-MX_USART2_UART_Init (void);
+static void MX_USART2_UART_Init(void);
-static void
-MX_TIM3_Init (void);
+static void MX_TIM3_Init(void);
 /* USER CODE BEGIN PFP */
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE END PFP */
 FunctionalState CHT_Enable = ENABLE;
 #define CORR 3
-uint8_t CHT_Timer[2] =
-  { 0, 0 }; // two temperature readings : from two sensors
 uint16_t CHT_Observations[2] =
   { 0, 0 };
 // look for the trigger pin being high then low - the points
 // are opening, and skip the reading
 void
 ProcessCHT (int instance)
+{
-  uint8_t buffer[2];
-  if (instance > 2)
-    return;
-  CHT_Timer[instance]++;
-  static uint8_t prevCB;
-  uint8_t readCB = HAL_GPIO_ReadPin (CB_Pulse_GPIO_Port, CB_Pulse_Pin);
-  if (!(prevCB == GPIO_PIN_SET && readCB == GPIO_PIN_RESET))
-    {
-      if ((CHT_Enable == ENABLE) && (CHT_Timer[instance] >= 4)) // every 300 milliseconds
-        {
-          CHT_Timer[instance] = 0;
-          uint16_t Pin = (instance == 0) ? SPI_NS_Temp_Pin : SPI_NS_Temp2_Pin;
-          HAL_GPIO_WritePin (SPI_NS_Temp_GPIO_Port, Pin, GPIO_PIN_RESET);
-          HAL_SPI_Receive (&hspi1, buffer, 2, 2);
-          HAL_GPIO_WritePin (SPI_NS_Temp_GPIO_Port, Pin, GPIO_PIN_SET);
-          uint16_t obs = (buffer[0] << 8) | buffer[1];
-          // good observation if the status bit is clear, and the reading is less than 1023
-          uint16_t temp_c = obs >> 5;
-          uint8_t good = ((obs & 7) == 0) && (temp_c > 0) && (temp_c < 250);
-          if (good)
-            {
-              CHT_Observations[instance] = temp_c;
-            }
-        }
-    }
-  prevCB = readCB;
   plx_sendword (PLX_X_CHT);
   PutCharSerial (&uc1, instance);
   plx_sendword (CHT_Observations[instance]);
+}
+}
 /* USER CODE END 0 */
 /**
- * @brief  The application entry point.
+  * @brief  The application entry point.
- * @retval int
+  * @retval int
- */
+  */
-int
-main (void)
+int main(void)
+{
   /* USER CODE BEGIN 1 */
   /* USER CODE END 1 */
   /* MCU Configuration--------------------------------------------------------*/
   /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init ();
+  HAL_Init();
   /* USER CODE BEGIN Init */
   /* USER CODE END Init */
   /* Configure the system clock */
-  SystemClock_Config ();
+  SystemClock_Config();
   /* USER CODE BEGIN SysInit */
   /* USER CODE END SysInit */
   /* Initialize all configured peripherals */
-  MX_GPIO_Init ();
+  MX_GPIO_Init();
-  MX_DMA_Init ();
+  MX_DMA_Init();
-  MX_ADC_Init ();
+  MX_ADC_Init();
-  MX_SPI1_Init ();
+  MX_SPI1_Init();
-  MX_TIM2_Init ();
+  MX_TIM2_Init();
-  MX_TIM6_Init ();
+  MX_TIM6_Init();
-  MX_USART1_UART_Init ();
+  MX_USART1_UART_Init();
-  MX_USART2_UART_Init ();
+  MX_USART2_UART_Init();
-  MX_TIM3_Init ();
+  MX_TIM3_Init();
   /* USER CODE BEGIN 2 */
   HAL_MspInit ();
 // Not using HAL USART code
   __HAL_RCC_USART1_CLK_ENABLE()
 // Start the counter
   HAL_TIM_Base_Start (&htim2);
 // Start the input capture and the interrupt
   HAL_TIM_IC_Start_IT (&htim2, TIM_CHANNEL_1);
-  init_ADC_filter ();
+  HAL_TIM_Base_MspInit (&htim3);
+  __HAL_TIM_ENABLE_IT(&htim3, TIM_IT_UPDATE);
   uint32_t Ticks = HAL_GetTick () + 100;
   int CalCounter = 0;
   Power_CHT_Timer = HAL_GetTick () + 1000; /* wait 10 seconds before powering up the CHT sensor */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
+    {
-      /* USER CODE END WHILE */
+    /* USER CODE END WHILE */
-      /* USER CODE BEGIN 3 */
+    /* USER CODE BEGIN 3 */
       if (HAL_GetTick () > Ticks)
+        {
           Ticks += 100;
           filter_ADC_samples ();
+    }
   /* USER CODE END 3 */
+}
 /**
- * @brief System Clock Configuration
+  * @brief System Clock Configuration
- * @retval None
+  * @retval None
- */
+  */
-void
-SystemClock_Config (void)
+void SystemClock_Config(void)
+{
-  RCC_OscInitTypeDef RCC_OscInitStruct =
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-    { 0 };
-  RCC_ClkInitTypeDef RCC_ClkInitStruct =
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-    { 0 };
   /** Configure the main internal regulator output voltage
-   */
+  */
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
   /** Initializes the RCC Oscillators according to the specified parameters
-   * in the RCC_OscInitTypeDef structure.
+  * in the RCC_OscInitTypeDef structure.
-   */
+  */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL6;
   RCC_OscInitStruct.PLL.PLLDIV = RCC_PLL_DIV3;
-  if (HAL_RCC_OscConfig (&RCC_OscInitStruct) != HAL_OK)
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    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_DIV1;
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-  if (HAL_RCC_ClockConfig (&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
+}
 /**
- * @brief ADC Initialization Function
+  * @brief ADC Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
-static void
-MX_ADC_Init (void)
+static void MX_ADC_Init(void)
+{
   /* USER CODE BEGIN ADC_Init 0 */
   /* USER CODE END ADC_Init 0 */
-  ADC_ChannelConfTypeDef sConfig =
+  ADC_ChannelConfTypeDef sConfig = {0};
-    { 0 };
   /* USER CODE BEGIN ADC_Init 1 */
   /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
-   */
+  */
   hadc.Instance = ADC1;
   hadc.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
   hadc.Init.Resolution = ADC_RESOLUTION_12B;
   hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
   hadc.Init.ScanConvMode = ADC_SCAN_ENABLE;
   hadc.Init.NbrOfConversion = 6;
   hadc.Init.DiscontinuousConvMode = DISABLE;
   hadc.Init.ExternalTrigConv = ADC_EXTERNALTRIGCONV_T3_TRGO;
   hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_RISING;
   hadc.Init.DMAContinuousRequests = ENABLE;
-  if (HAL_ADC_Init (&hadc) != HAL_OK)
+  if (HAL_ADC_Init(&hadc) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_10;
   sConfig.Rank = ADC_REGULAR_RANK_1;
   sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_11;
   sConfig.Rank = ADC_REGULAR_RANK_2;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_12;
   sConfig.Rank = ADC_REGULAR_RANK_3;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_13;
   sConfig.Rank = ADC_REGULAR_RANK_4;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
   sConfig.Rank = ADC_REGULAR_RANK_5;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /** Configure for the selected ADC regular channel its corresponding rank in the sequencer and its sample time.
-   */
+  */
   sConfig.Channel = ADC_CHANNEL_VREFINT;
   sConfig.Rank = ADC_REGULAR_RANK_6;
-  if (HAL_ADC_ConfigChannel (&hadc, &sConfig) != HAL_OK)
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /* USER CODE BEGIN ADC_Init 2 */
   /* USER CODE END ADC_Init 2 */
+}
 /**
- * @brief SPI1 Initialization Function
+  * @brief SPI1 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
-static void
-MX_SPI1_Init (void)
+static void MX_SPI1_Init(void)
+{
   /* USER CODE BEGIN SPI1_Init 0 */
   /* USER CODE END SPI1_Init 0 */
   hspi1.Init.Direction = SPI_DIRECTION_2LINES;
   hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
   hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
   hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
   hspi1.Init.NSS = SPI_NSS_SOFT;
-  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
+  hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
   hspi1.Init.CRCPolynomial = 10;
-  if (HAL_SPI_Init (&hspi1) != HAL_OK)
+  if (HAL_SPI_Init(&hspi1) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    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)
+static void MX_TIM2_Init(void)
+{
   /* USER CODE BEGIN TIM2_Init 0 */
   /* USER CODE END TIM2_Init 0 */
-  TIM_ClockConfigTypeDef sClockSourceConfig =
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-    { 0 };
-  TIM_MasterConfigTypeDef sMasterConfig =
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
-    { 0 };
-  TIM_IC_InitTypeDef sConfigIC =
+  TIM_IC_InitTypeDef sConfigIC = {0};
-    { 0 };
   /* USER CODE BEGIN TIM2_Init 1 */
   /* USER CODE END TIM2_Init 1 */
   htim2.Instance = TIM2;
   htim2.Init.Prescaler = 320;
   htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim2.Init.Period = 65535;
   htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init (&htim2) != HAL_OK)
+  if (HAL_TIM_Base_Init(&htim2) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  if (HAL_TIM_ConfigClockSource (&htim2, &sClockSourceConfig) != HAL_OK)
+  if (HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
-  if (HAL_TIM_IC_Init (&htim2) != HAL_OK)
+  if (HAL_TIM_IC_Init(&htim2) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_UPDATE;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization (&htim2, &sMasterConfig) != HAL_OK)
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_BOTHEDGE;
   sConfigIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
   sConfigIC.ICPrescaler = TIM_ICPSC_DIV1;
   sConfigIC.ICFilter = 15;
-  if (HAL_TIM_IC_ConfigChannel (&htim2, &sConfigIC, TIM_CHANNEL_1) != HAL_OK)
+  if (HAL_TIM_IC_ConfigChannel(&htim2, &sConfigIC, TIM_CHANNEL_1) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    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)
+static void MX_TIM3_Init(void)
+{
   /* USER CODE BEGIN TIM3_Init 0 */
   /* USER CODE END TIM3_Init 0 */
-  TIM_ClockConfigTypeDef sClockSourceConfig =
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
-    { 0 };
-  TIM_MasterConfigTypeDef sMasterConfig =
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
-    { 0 };
-  TIM_OC_InitTypeDef sConfigOC =
+  TIM_OC_InitTypeDef sConfigOC = {0};
-    { 0 };
   /* USER CODE BEGIN TIM3_Init 1 */
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
   htim3.Init.Prescaler = 320;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 1000;
+  htim3.Init.Period = 100;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init (&htim3) != HAL_OK)
+  if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  if (HAL_TIM_ConfigClockSource (&htim3, &sClockSourceConfig) != HAL_OK)
+  if (HAL_TIM_ConfigClockSource(&htim3, &sClockSourceConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
-  if (HAL_TIM_OC_Init (&htim3) != HAL_OK)
+  if (HAL_TIM_OC_Init(&htim3) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
-  if (HAL_TIM_OnePulse_Init (&htim3, TIM_OPMODE_SINGLE) != HAL_OK)
+  if (HAL_TIM_OnePulse_Init(&htim3, TIM_OPMODE_SINGLE) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_OC1;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization (&htim3, &sMasterConfig) != HAL_OK)
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sConfigOC.OCMode = TIM_OCMODE_TIMING;
-  sConfigOC.Pulse = 1000;
+  sConfigOC.Pulse = 99;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
-  if (HAL_TIM_OC_ConfigChannel (&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
+  if (HAL_TIM_OC_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /* USER CODE BEGIN TIM3_Init 2 */
   /* USER CODE END TIM3_Init 2 */
-  HAL_TIM_MspPostInit (&htim3);
+}
 /**
- * @brief TIM6 Initialization Function
+  * @brief TIM6 Initialization Function
- * @param None
+  * @param None
- * @retval None
+  * @retval None
- */
+  */
-static void
-MX_TIM6_Init (void)
+static void MX_TIM6_Init(void)
+{
   /* USER CODE BEGIN TIM6_Init 0 */
   /* USER CODE END TIM6_Init 0 */
-  TIM_MasterConfigTypeDef sMasterConfig =
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
-    { 0 };
   /* USER CODE BEGIN TIM6_Init 1 */
   /* USER CODE END TIM6_Init 1 */
   htim6.Instance = TIM6;
   htim6.Init.Prescaler = 320;
   htim6.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim6.Init.Period = 9999;
   htim6.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
-  if (HAL_TIM_Base_Init (&htim6) != HAL_OK)
+  if (HAL_TIM_Base_Init(&htim6) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_UPDATE;
   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
-  if (HAL_TIMEx_MasterConfigSynchronization (&htim6, &sMasterConfig) != HAL_OK)
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim6, &sMasterConfig) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /* USER CODE BEGIN TIM6_Init 2 */
   /* USER CODE END TIM6_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)
+static void MX_USART1_UART_Init(void)
+{
   /* USER CODE BEGIN USART1_Init 0 */
   /* USER CODE END USART1_Init 0 */
   huart1.Init.StopBits = UART_STOPBITS_1;
   huart1.Init.Parity = UART_PARITY_NONE;
   huart1.Init.Mode = UART_MODE_TX_RX;
   huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
   huart1.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init (&huart1) != HAL_OK)
+  if (HAL_UART_Init(&huart1) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /* USER CODE BEGIN USART1_Init 2 */
   /* USER CODE END USART1_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)
+static void MX_USART2_UART_Init(void)
+{
   /* USER CODE BEGIN USART2_Init 0 */
   /* USER CODE END USART2_Init 0 */
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
   huart2.Init.Mode = UART_MODE_TX_RX;
   huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
   huart2.Init.OverSampling = UART_OVERSAMPLING_16;
-  if (HAL_UART_Init (&huart2) != HAL_OK)
+  if (HAL_UART_Init(&huart2) != HAL_OK)
-    {
+  {
-      Error_Handler ();
+    Error_Handler();
-    }
+  }
   /* USER CODE BEGIN USART2_Init 2 */
   /* USER CODE END USART2_Init 2 */
+}
 /**
- * Enable DMA controller clock
+  * Enable DMA controller clock
- */
+  */
-static void
-MX_DMA_Init (void)
+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_SetPriority(DMA1_Channel1_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ (DMA1_Channel1_IRQn);
+  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)
+static void MX_GPIO_Init(void)
+{
-  GPIO_InitTypeDef GPIO_InitStruct =
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
-    { 0 };
   /* GPIO Ports Clock Enable */
   __HAL_RCC_GPIOC_CLK_ENABLE();
   __HAL_RCC_GPIOH_CLK_ENABLE();
   __HAL_RCC_GPIOA_CLK_ENABLE();
   __HAL_RCC_GPIOB_CLK_ENABLE();
   __HAL_RCC_GPIOD_CLK_ENABLE();
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin (LED_Blink_GPIO_Port, LED_Blink_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(LED_Blink_GPIO_Port, LED_Blink_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin (SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(SPI_NSS1_GPIO_Port, SPI_NSS1_Pin, GPIO_PIN_SET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin (SPI_CD_GPIO_Port, SPI_CD_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(SPI_CD_GPIO_Port, SPI_CD_Pin, GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin (GPIOB, SPI_RESET_Pin | SPI_NS_Temp2_Pin | ENA_AUX_5V_Pin,
+  HAL_GPIO_WritePin(GPIOB, SPI_RESET_Pin|SPI_NS_Temp2_Pin|ENA_AUX_5V_Pin, GPIO_PIN_RESET);
-                     GPIO_PIN_RESET);
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin (SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(SPI_NS_Temp_GPIO_Port, SPI_NS_Temp_Pin, GPIO_PIN_SET);
-  /*Configure GPIO pins : PC13 PC14 PC15 PC7
+  /*Configure GPIO pins : PC13 PC14 PC15 PC6
+                           PC7 PC8 PC9 PC11
-   PC8 PC9 PC11 PC12 */
+                           PC12 */
-  GPIO_InitStruct.Pin = GPIO_PIN_13 | GPIO_PIN_14 | GPIO_PIN_15 | GPIO_PIN_7
+  GPIO_InitStruct.Pin = GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15|GPIO_PIN_6
-      | GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_11 | GPIO_PIN_12;
+                          |GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_11
+                          |GPIO_PIN_12;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init (GPIOC, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
   /*Configure GPIO pins : PH0 PH1 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
+  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init (GPIOH, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
   /*Configure GPIO pins : PA0 PA1 PA8 PA11
-   PA12 */
+                           PA12 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_8 | GPIO_PIN_11
+  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_8|GPIO_PIN_11
-      | GPIO_PIN_12;
+                          |GPIO_PIN_12;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init (GPIOA, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*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_VERY_HIGH;
-  HAL_GPIO_Init (LED_Blink_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(LED_Blink_GPIO_Port, &GPIO_InitStruct);
   /*Configure GPIO pins : SPI_NSS1_Pin SPI_CD_Pin */
-  GPIO_InitStruct.Pin = SPI_NSS1_Pin | SPI_CD_Pin;
+  GPIO_InitStruct.Pin = SPI_NSS1_Pin|SPI_CD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init (GPIOC, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
   /*Configure GPIO pins : SPI_RESET_Pin SPI_NS_Temp_Pin SPI_NS_Temp2_Pin ENA_AUX_5V_Pin */
-  GPIO_InitStruct.Pin = SPI_RESET_Pin | SPI_NS_Temp_Pin | SPI_NS_Temp2_Pin
+  GPIO_InitStruct.Pin = SPI_RESET_Pin|SPI_NS_Temp_Pin|SPI_NS_Temp2_Pin|ENA_AUX_5V_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 (GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pins : PB11 PB12 PB13 PB14
-   PB15 PB3 PB4 PB5
+                           PB15 PB3 PB4 PB5
-   PB6 PB7 PB8 PB9 */
+                           PB6 PB7 PB8 PB9 */
-  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14
+  GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
-      | GPIO_PIN_15 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6
+                          |GPIO_PIN_15|GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5
-      | GPIO_PIN_7 | GPIO_PIN_8 | GPIO_PIN_9;
+                          |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init (GPIOB, &GPIO_InitStruct);
+  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);
+  HAL_GPIO_Init(STARTER_ON_GPIO_Port, &GPIO_InitStruct);
   /*Configure GPIO pin : PD2 */
   GPIO_InitStruct.Pin = GPIO_PIN_2;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init (GPIOD, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOD, &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)
+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 */

Subversion Repositories EngineBay2

(root)/trunk/Src/main.c – Rev 30 → 31