From 68b25be8cfab4c1d13b7f66e465267a5fe27189f Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Sun, 7 Apr 2024 11:04:10 +0800 Subject: [PATCH] fix DMA_1_5 for usart2_tx --- Core/Src/dma.c | 8 ++++---- Core/Src/rtc.c | 4 ++-- Core/Src/stm32wlxx_it.c | 2 +- Core/Src/sys_app.c | 2 +- Core/Src/usart_if.c | 2 +- STM32CubeIDE/.settings/language.settings.xml | 4 ++-- STM32CubeIDE/Release/Application/User/Core/subdir.mk | 2 +- .../Release/Application/User/LoRaWAN/App/subdir.mk | 2 +- .../Release/Application/User/LoRaWAN/Target/subdir.mk | 2 +- STM32CubeIDE/Release/Application/User/Startup/subdir.mk | 2 +- STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk | 2 +- .../Release/Application/User/TOF/Target/subdir.mk | 2 +- .../Release/Application/User/TOF/vl53l0x/subdir.mk | 2 +- .../Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 2 +- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 2 +- .../Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk | 2 +- STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk | 2 +- STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk | 2 +- STM32CubeIDE/Release/Utilities/subdir.mk | 2 +- STM32CubeIDE/Release/makefile | 2 +- STM32CubeIDE/Release/objects.mk | 2 +- STM32CubeIDE/Release/sources.mk | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Core/Src/dma.c b/Core/Src/dma.c index c34a3c2..d3a1bd5 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -46,7 +46,7 @@ void MX_DMA_Init(void) __HAL_RCC_DMA1_CLK_ENABLE(); __HAL_RCC_DMA2_CLK_ENABLE(); /* DMA interrupt init */ - +#if 0 // **** TIM1_CH2 WS2812B @ PA-9 HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn); @@ -59,7 +59,7 @@ void MX_DMA_Init(void) HAL_NVIC_SetPriority(DMA1_Channel3_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel3_IRQn); // **** SPI1 - +#endif // **** I2C2 /* DMA1_Channel4_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel4_IRQn, 0, 0); @@ -79,11 +79,11 @@ void MX_DMA_Init(void) HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn); // **** USART2 - +#if 0 /* DMA2_Channel1_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA2_Channel1_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA2_Channel1_IRQn); - +#endif } diff --git a/Core/Src/rtc.c b/Core/Src/rtc.c index 436dbf3..7c2121f 100644 --- a/Core/Src/rtc.c +++ b/Core/Src/rtc.c @@ -67,7 +67,7 @@ void MX_RTC_Init(void) { Error_Handler(); } - +#if 0 /** Enable the Alarm A */ sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO; @@ -80,7 +80,7 @@ void MX_RTC_Init(void) Error_Handler(); } /* USER CODE BEGIN RTC_Init 2 */ - +#endif /* USER CODE END RTC_Init 2 */ } diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index 3bb6950..d3a33e3 100644 --- a/Core/Src/stm32wlxx_it.c +++ b/Core/Src/stm32wlxx_it.c @@ -315,7 +315,7 @@ void DMA1_Channel5_IRQHandler(void) /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */ /* USER CODE END DMA1_Channel5_IRQn 0 */ - HAL_DMA_IRQHandler(&hdma_usart2_tx); + HAL_DMA_IRQHandler(&hdma_i2c2_tx); /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */ /* USER CODE END DMA1_Channel5_IRQn 1 */ diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c index 2839e9d..a53bbe7 100644 --- a/Core/Src/sys_app.c +++ b/Core/Src/sys_app.c @@ -123,7 +123,7 @@ void SystemApp_Init(void) UTIL_LPM_Init(); /* Disable Stand-by mode */ //UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE); - UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE); + UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE); #if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1) /* Disable Stop Mode */ diff --git a/Core/Src/usart_if.c b/Core/Src/usart_if.c index a13826a..471af60 100644 --- a/Core/Src/usart_if.c +++ b/Core/Src/usart_if.c @@ -128,7 +128,7 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void) /* ##-3- Disable the NVIC for DMA ########################################### */ /* USER CODE BEGIN 1 */ - HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn); + HAL_NVIC_DisableIRQ(DMA1_Channel7_IRQn); return UTIL_ADV_TRACE_OK; /* USER CODE END 1 */ diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index f00ccb2..fbde3f0 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/STM32CubeIDE/Release/Application/User/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk index 88ecaa9..b7e62bc 100644 --- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/Core/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk index a2e3a46..83587c4 100644 --- a/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/LoRaWAN/App/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk b/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk index f2fbaa6..795d1a7 100644 --- a/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/LoRaWAN/Target/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/Startup/subdir.mk b/STM32CubeIDE/Release/Application/User/Startup/subdir.mk index d0c679e..140938e 100644 --- a/STM32CubeIDE/Release/Application/User/Startup/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/Startup/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk index ce33568..6cf3252 100644 --- a/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/TOF/App/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk index 139123e..5f3a3a5 100644 --- a/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/TOF/Target/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk b/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk index 03bcb22..59fbacd 100644 --- a/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/TOF/vl53l0x/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk b/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk index bb422b6..0ae2267 100644 --- a/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk +++ b/STM32CubeIDE/Release/Drivers/BSP/STM32WLxx_Nucleo/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk b/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk index 6687803..84ff145 100644 --- a/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk +++ b/STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk b/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk index bedfcf1..e45e7ff 100644 --- a/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk +++ b/STM32CubeIDE/Release/Drivers/STM32WLxx_HAL_Driver/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk b/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk index 4811cd4..59556e4 100644 --- a/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk +++ b/STM32CubeIDE/Release/Middlewares/LoRaWAN/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk b/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk index bf48e59..bd1bf56 100644 --- a/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk +++ b/STM32CubeIDE/Release/Middlewares/SubGHz_Phy/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/Utilities/subdir.mk b/STM32CubeIDE/Release/Utilities/subdir.mk index 34277f1..73f5ca0 100644 --- a/STM32CubeIDE/Release/Utilities/subdir.mk +++ b/STM32CubeIDE/Release/Utilities/subdir.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ # Add inputs and outputs from these tool invocations to the build variables diff --git a/STM32CubeIDE/Release/makefile b/STM32CubeIDE/Release/makefile index 075cedb..08d3e48 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/makefile @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ -include ../makefile.init diff --git a/STM32CubeIDE/Release/objects.mk b/STM32CubeIDE/Release/objects.mk index 574d50b..a5103de 100644 --- a/STM32CubeIDE/Release/objects.mk +++ b/STM32CubeIDE/Release/objects.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ USER_OBJS := diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk index 2263890..8cc1ed4 100644 --- a/STM32CubeIDE/Release/sources.mk +++ b/STM32CubeIDE/Release/sources.mk @@ -1,6 +1,6 @@ ################################################################################ # Automatically-generated file. Do not edit! -# Toolchain: GNU Tools for STM32 (11.3.rel1) +# Toolchain: GNU Tools for STM32 (12.3.rel1) ################################################################################ ELF_SRCS :=