From e9f91833bb4331513a662489b612169d427ecc67 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 21 Feb 2024 09:44:54 +0800 Subject: [PATCH] revised for low power settings, including UART2-RX, debugger disable, trace log disable, etc. --- Core/Inc/sys_conf.h | 2 +- Core/Src/dma.c | 2 + Core/Src/stm32wlxx_it.c | 5 +- Core/Src/sys_app.c | 3 +- Core/Src/usart.c | 9 ++- LoRaWAN/App/lora_app.h | 2 +- STM32CubeIDE/.cproject | 5 +- STM32CubeIDE/.settings/language.settings.xml | 4 +- .../Release/Application/User/Core/subdir.mk | 50 ++++++------- .../Application/User/LoRaWAN/App/subdir.mk | 14 ++-- .../Application/User/LoRaWAN/Target/subdir.mk | 8 +-- .../Application/User/Startup/subdir.mk | 6 +- .../Application/User/TOF/App/subdir.mk | 12 ++-- .../Application/User/TOF/Target/subdir.mk | 8 +-- .../Application/User/TOF/vl53l0x/subdir.mk | 20 +++--- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 10 +-- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 8 +-- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 54 +++++++------- .../Release/Middlewares/LoRaWAN/subdir.mk | 72 +++++++++---------- .../Release/Middlewares/SubGHz_Phy/subdir.mk | 12 ++-- STM32CubeIDE/Release/Utilities/subdir.mk | 22 +++--- STM32CubeIDE/Release/makefile | 25 +++---- STM32CubeIDE/Release/objects.mk | 2 +- STM32CubeIDE/Release/sources.mk | 5 +- readme.txt | 2 + 25 files changed, 188 insertions(+), 174 deletions(-) diff --git a/Core/Inc/sys_conf.h b/Core/Inc/sys_conf.h index ea70373..4941614 100644 --- a/Core/Inc/sys_conf.h +++ b/Core/Inc/sys_conf.h @@ -47,7 +47,7 @@ extern "C" { /** * @brief Verbose level for all trace logs */ -#define VERBOSE_LEVEL VLEVEL_L +#define VERBOSE_LEVEL VLEVEL_OFF /** * @brief Enable trace logs diff --git a/Core/Src/dma.c b/Core/Src/dma.c index 366b255..c34a3c2 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -70,9 +70,11 @@ void MX_DMA_Init(void) // **** I2C2 // **** USART2 +#if 0 /* DMA1_Channel6_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn); +#endif /* DMA1_Channel7_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn); diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index e3545a0..3bb6950 100644 --- a/Core/Src/stm32wlxx_it.c +++ b/Core/Src/stm32wlxx_it.c @@ -76,8 +76,9 @@ extern DMA_HandleTypeDef hdma_i2c2_tx; //extern TIM_HandleTypeDef htim2; //extern TIM_HandleTypeDef htim16; extern DMA_HandleTypeDef hdma_usart2_tx; +#if 0 extern DMA_HandleTypeDef hdma_usart2_rx; - +#endif /* USER CODE BEGIN EV */ @@ -328,7 +329,9 @@ void DMA1_Channel6_IRQHandler(void) /* USER CODE BEGIN DMA1_Channel6_IRQn 0 */ /* USER CODE END DMA1_Channel6_IRQn 0 */ +#if 0 HAL_DMA_IRQHandler(&hdma_usart2_rx); +#endif /* USER CODE BEGIN DMA1_Channel6_IRQn 1 */ /* USER CODE END DMA1_Channel6_IRQn 1 */ diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c index afd0327..2839e9d 100644 --- a/Core/Src/sys_app.c +++ b/Core/Src/sys_app.c @@ -122,7 +122,8 @@ void SystemApp_Init(void) /*Init low power manager*/ 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_DISABLE); + UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE); #if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1) /* Disable Stop Mode */ diff --git a/Core/Src/usart.c b/Core/Src/usart.c index e62df72..ac9ee6e 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -28,8 +28,9 @@ UART_HandleTypeDef huart2; DMA_HandleTypeDef hdma_usart2_tx; +#if 0 DMA_HandleTypeDef hdma_usart2_rx; - +#endif /* USART2 init function */ void MX_USART2_UART_Init(void) @@ -133,7 +134,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) } #endif __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx); - +#if 0 /* USART2_RX Init */ hdma_usart2_rx.Instance = DMA1_Channel6; hdma_usart2_rx.Init.Request = DMA_REQUEST_USART2_RX; @@ -155,7 +156,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) } #endif __HAL_LINKDMA(uartHandle,hdmarx,hdma_usart2_rx); - +#endif /* USART2 interrupt Init */ HAL_NVIC_SetPriority(USART2_IRQn, 2, 0); HAL_NVIC_EnableIRQ(USART2_IRQn); @@ -184,7 +185,9 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) /* USART2 DMA DeInit */ HAL_DMA_DeInit(uartHandle->hdmatx); +#if 0 HAL_DMA_DeInit(uartHandle->hdmarx); +#endif /* USART2 interrupt Deinit */ HAL_NVIC_DisableIRQ(USART2_IRQn); /* USER CODE BEGIN USART2_MspDeInit 1 */ diff --git a/LoRaWAN/App/lora_app.h b/LoRaWAN/App/lora_app.h index fa9153a..a83ec96 100644 --- a/LoRaWAN/App/lora_app.h +++ b/LoRaWAN/App/lora_app.h @@ -71,7 +71,7 @@ extern "C" { /*! * LoRaWAN default class */ -#define LORAWAN_DEFAULT_CLASS CLASS_C +#define LORAWAN_DEFAULT_CLASS CLASS_A /*! * LoRaWAN default confirm state diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index a4aac19..3cf6274 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -26,7 +26,7 @@