From 8b8b2f10f041810a7461de8d853d881a6ffb5689 Mon Sep 17 00:00:00 2001 From: jazzpi Date: Sat, 30 Jul 2022 20:02:22 +0200 Subject: [PATCH] Fix CubeMX Init function generation order The previous generation order broke UART DMA. See https://community.st.com/s/question/0D53W00001EzCmCSAV/mxdmainit-order-in-the-mainc-file-generated-by-stm32cubemx-how-to-fix --- Core/Src/main.c | 8 ++++---- Makefile | 2 +- ams-slave.ioc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index b9ca712..33c2124 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -72,14 +72,14 @@ uint8_t slave_id; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); static void MX_GPIO_Init(void); +static void MX_DMA_Init(void); static void MX_CAN1_Init(void); static void MX_CAN2_Init(void); static void MX_I2C1_Init(void); +static void MX_TIM3_Init(void); static void MX_USART1_UART_Init(void); static void MX_USART2_UART_Init(void); static void MX_USART3_UART_Init(void); -static void MX_DMA_Init(void); -static void MX_TIM3_Init(void); static void MX_USART6_UART_Init(void); /* USER CODE BEGIN PFP */ @@ -180,14 +180,14 @@ int main(void) { /* Initialize all configured peripherals */ MX_GPIO_Init(); + MX_DMA_Init(); MX_CAN1_Init(); MX_CAN2_Init(); MX_I2C1_Init(); - MX_DMA_Init(); + MX_TIM3_Init(); MX_USART1_UART_Init(); MX_USART2_UART_Init(); MX_USART3_UART_Init(); - MX_TIM3_Init(); MX_USART6_UART_Init(); /* USER CODE BEGIN 2 */ fan_ctrl_init(&htim3, TIM_CHANNEL_4); diff --git a/Makefile b/Makefile index e4f01fd..086f554 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Fri Jul 29 01:30:23 CEST 2022] +# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Sat Jul 30 20:00:40 CEST 2022] ########################################################################################################################## # ------------------------------------------------ diff --git a/ams-slave.ioc b/ams-slave.ioc index 27e589c..21d374c 100644 --- a/ams-slave.ioc +++ b/ams-slave.ioc @@ -215,7 +215,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=Makefile ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_CAN1_Init-CAN1-false-HAL-true,4-MX_CAN2_Init-CAN2-false-HAL-true,5-MX_I2C1_Init-I2C1-false-HAL-true,6-MX_USART1_UART_Init-USART1-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_USART3_UART_Init-USART3-false-HAL-true,9-MX_DMA_Init-DMA-false-HAL-true,10-MX_TIM3_Init-TIM3-false-HAL-true,11-MX_USART6_UART_Init-USART6-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_CAN1_Init-CAN1-false-HAL-true,5-MX_CAN2_Init-CAN2-false-HAL-true,6-MX_I2C1_Init-I2C1-false-HAL-true,7-MX_TIM3_Init-TIM3-false-HAL-true,8-MX_USART1_UART_Init-USART1-false-HAL-true,9-MX_USART2_UART_Init-USART2-false-HAL-true,10-MX_USART3_UART_Init-USART3-false-HAL-true,11-MX_USART6_UART_Init-USART6-false-HAL-true RCC.CortexFreq_Value=16000000 RCC.DFSDMFreq_Value=16000000 RCC.EnbaleCSS=true