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

 /* USER CODE BEGIN PM */
 /* USER CODE END PM */
 /* Private variables ---------------------------------------------------------*/
-CAN_HandleTypeDef hcan;
+ CAN_HandleTypeDef hcan;
 I2C_HandleTypeDef hi2c1;
 IWDG_HandleTypeDef hiwdg;
+}
 /* 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 */
     int button = HAL_GPIO_ReadPin(PUSHBUTTON_GPIO_Port, PUSHBUTTON_Pin) == GPIO_PIN_RESET;
     if (button)
+    {
       intensity = 2;
-      displayOff = lastTick + 10000;
+      displayOff = lastTick + 30000;
+    }
     switch (intensity)
+    {
     case 2:
         intensity = 1; // was 0
+      }
     default:
       break;
+    }
-    cc_display(0, intensity);
+    cc_display(0, intensity, 0);
     if (HAL_GetTick() - lastTick > T100MS)
+    {
       lastTick = HAL_GetTick();
       /* Reading the raw data from sensor */
+  }
   /* 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_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 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 */
   /* SPI1 parameter configuration*/
   hspi1.Instance = SPI1;
   hspi1.Init.Mode = SPI_MODE_MASTER;
   hspi1.Init.Direction = SPI_DIRECTION_2LINES;
   hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
-  hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
+  hspi1.Init.CLKPolarity = SPI_POLARITY_HIGH;
-  hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
+  hspi1.Init.CLKPhase = SPI_PHASE_2EDGE;
   hspi1.Init.NSS = SPI_NSS_SOFT;
   hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_64;
   hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
   hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
   hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
     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 12 → 13