|
|
@@ -2,15 +2,15 @@
|
|
|
/* USER CODE END Header */
|
|
|
/* Includes ------------------------------------------------------------------*/
|
|
|
#include "main.h"
|
|
|
-#include "gpio.h"
|
|
|
#include "spi.h"
|
|
|
-#include "spif.h"
|
|
|
#include "usart.h"
|
|
|
+#include "gpio.h"
|
|
|
|
|
|
/* Private includes ----------------------------------------------------------*/
|
|
|
/* USER CODE BEGIN Includes */
|
|
|
|
|
|
#include "lfs.h"
|
|
|
+#include "spif.h"
|
|
|
#include <stdio.h>
|
|
|
|
|
|
/* USER CODE END Includes */
|
|
|
@@ -273,10 +273,11 @@ void dump_hex(char *header, uint32_t start, uint8_t *buf, uint32_t len) {
|
|
|
/* USER CODE END 0 */
|
|
|
|
|
|
/**
|
|
|
- * @brief The application entry point.
|
|
|
- * @retval int
|
|
|
- */
|
|
|
-int main(void) {
|
|
|
+ * @brief The application entry point.
|
|
|
+ * @retval int
|
|
|
+ */
|
|
|
+int main(void)
|
|
|
+{
|
|
|
|
|
|
/* USER CODE BEGIN 1 */
|
|
|
|
|
|
@@ -284,8 +285,7 @@ int main(void) {
|
|
|
|
|
|
/* MCU Configuration--------------------------------------------------------*/
|
|
|
|
|
|
- /* Reset of all peripherals, Initializes the Flash interface and the Systick.
|
|
|
- */
|
|
|
+ /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
|
|
|
HAL_Init();
|
|
|
|
|
|
/* USER CODE BEGIN Init */
|
|
|
@@ -335,36 +335,40 @@ int main(void) {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @brief System Clock Configuration
|
|
|
- * @retval None
|
|
|
- */
|
|
|
-void SystemClock_Config(void) {
|
|
|
+ * @brief System Clock Configuration
|
|
|
+ * @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.
|
|
|
- */
|
|
|
- RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
|
|
|
+ * in the RCC_OscInitTypeDef structure.
|
|
|
+ */
|
|
|
+ RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
|
|
|
+ RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
|
|
|
+ RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
|
|
|
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_MUL16;
|
|
|
- if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
|
|
|
+ RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
|
|
|
+ RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL6;
|
|
|
+ if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
|
|
|
+ {
|
|
|
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;
|
|
|
|
|
|
- if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
|
|
|
+ if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
|
|
|
+ {
|
|
|
Error_Handler();
|
|
|
}
|
|
|
}
|
|
|
@@ -374,10 +378,11 @@ void SystemClock_Config(void) {
|
|
|
/* USER CODE END 4 */
|
|
|
|
|
|
/**
|
|
|
- * @brief This function is executed in case of error occurrence.
|
|
|
- * @retval None
|
|
|
- */
|
|
|
-void Error_Handler(void) {
|
|
|
+ * @brief This function is executed in case of error occurrence.
|
|
|
+ * @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();
|
|
|
@@ -387,13 +392,14 @@ void Error_Handler(void) {
|
|
|
}
|
|
|
#ifdef USE_FULL_ASSERT
|
|
|
/**
|
|
|
- * @brief Reports the name of the source file and the source line number
|
|
|
- * where the assert_param error has occurred.
|
|
|
- * @param file: pointer to the source file name
|
|
|
- * @param line: assert_param error line source number
|
|
|
- * @retval None
|
|
|
- */
|
|
|
-void assert_failed(uint8_t *file, uint32_t line) {
|
|
|
+ * @brief Reports the name of the source file and the source line number
|
|
|
+ * where the assert_param error has occurred.
|
|
|
+ * @param file: pointer to the source file name
|
|
|
+ * @param line: assert_param error line source number
|
|
|
+ * @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,
|
