diff --git a/Core/Src/dma.c b/Core/Src/dma.c index 8496db5..a9056eb 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -71,11 +71,12 @@ void MX_DMA_Init(void) /* DMA1_Channel5_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn); -#if 0 + // USART2 /* DMA1_Channel6_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 0, 0); HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn); +#if 0 /* DMA1_Channel7_IRQn interrupt configuration */ //HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 0, 0); //HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn); diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index e35d1f8..9697499 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -47,9 +47,9 @@ void MX_GPIO_Init(void) /* GPIO Ports Clock Enable */ __HAL_RCC_GPIOB_CLK_ENABLE(); //__HAL_RCC_GPIOC_CLK_ENABLE(); - __HAL_RCC_GPIOA_CLK_ENABLE(); + //__HAL_RCC_GPIOA_CLK_ENABLE(); -#if 1 +#if 0 // 0b0000 0000 0000 0000 // 0b0001 1010 0000 0000 INCLUDE PA9 PA11 PA12 --> 0x1A00 // 0b1110 0101 1111 1111 exclude PA9 PA11 PA12 --> 0xE5FF diff --git a/Core/Src/main.c b/Core/Src/main.c index d0d2d8e..2cc6a16 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -60,17 +60,19 @@ /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); /* USER CODE BEGIN PFP */ - +extern UART_HandleTypeDef huart2; /* USER CODE END PFP */ /* Private user code ---------------------------------------------------------*/ /* USER CODE BEGIN 0 */ +#if 0 int _write(int file, char *ptr, int len) { (void) file; HAL_UART_Transmit (&huart2, (uint8_t*)ptr, len, 0xFFFF); return len; } +#endif /* USER CODE END 0 */ /** @@ -101,8 +103,8 @@ int main(void) /* Initialize all configured peripherals */ MX_GPIO_Init(); - -#if 1 + HAL_UART_DeInit(&huart2); +#if 0 if(__HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET) { __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); @@ -110,11 +112,12 @@ int main(void) else #endif { - MX_I2C2_Init(); - MX_DMA_Init(); + //MX_I2C2_Init(); + //MX_DMA_Init(); MX_LoRaWAN_Init(); } - + //MX_USART2_UART_Deinit(); + HAL_UART_DeInit(&huart2); /* USER CODE BEGIN 2 */ //MX_USART2_UART_Init(); /* USER CODE END 2 */ diff --git a/Core/Src/stm32_lpm_if.c b/Core/Src/stm32_lpm_if.c index db6f972..d54585d 100644 --- a/Core/Src/stm32_lpm_if.c +++ b/Core/Src/stm32_lpm_if.c @@ -93,11 +93,25 @@ void PWR_ExitOffMode(void) void PWR_EnterStopMode(void) { /* USER CODE BEGIN EnterStopMode_1 */ -#if 1 +#if 0 HAL_GPIO_WritePin(GPIOA, 0x65FF, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOB, 0xFEC3, GPIO_PIN_RESET); HAL_GPIO_WritePin(GPIOC, 0xDFFF, GPIO_PIN_RESET); #endif + + HAL_UART_DeInit(&huart2); + vcom_DeInit(); + +#if 1 + //HAL_GPIO_WritePin(GPIOA, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOA, GPIO_PIN_All, GPIO_PIN_RESET); + + HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All); // NO rejoin issue + HAL_GPIO_WritePin(GPIOB, GPIO_PIN_All, GPIO_PIN_RESET); //no rejoin issue + + HAL_GPIO_WritePin(GPIOC, GPIO_PIN_All, GPIO_PIN_RESET); //no rejoin issue +#endif + #if 0 HAL_UART_DeInit(&huart2); vcom_DeInit(); @@ -135,10 +149,10 @@ void PWR_ExitStopMode(void) /* Resume not retained USARTx and DMA */ MX_GPIO_Init(); -#if 1 +#if 0 MX_I2C2_Init(); MX_DMA_Init(); - // vcom_Resume(); + vcom_Resume(); #endif /* USER CODE BEGIN ExitStopMode_2 */ diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index 6f36a09..6e163c3 100644 --- a/Core/Src/stm32wlxx_it.c +++ b/Core/Src/stm32wlxx_it.c @@ -218,7 +218,7 @@ void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void) /* USER CODE END TAMP_STAMP_LSECSS_SSRU_IRQn 1 */ } - +#if 0 /** * @brief This function handles EXTI Line 0 Interrupt. */ @@ -246,7 +246,7 @@ void EXTI1_IRQHandler(void) /* USER CODE END EXTI1_IRQn 1 */ } - +#endif void EXTI3_IRQHandler(void) { /* USER CODE BEGIN EXTI3_IRQn 0 */ @@ -260,7 +260,7 @@ void EXTI3_IRQHandler(void) /* USER CODE END EXTI3_IRQn 1 */ } - +#if 0 /** * @brief This function handles EXTI Line 1 Interrupt. */ @@ -274,8 +274,10 @@ void EXTI4_IRQHandler(void) /* USER CODE END EXTI1_IRQn 1 */ } +#endif /* SPI1 */ +#if 0 /** * @brief This function handles DMA1 Channel 2 Interrupt. */ @@ -303,7 +305,7 @@ void DMA1_Channel3_IRQHandler(void) /* USER CODE END DMA1_Channel3_IRQn 1 */ } - +#endif /* I2C2 */ /** @@ -337,6 +339,7 @@ void DMA1_Channel5_IRQHandler(void) } // USART2 +#if 0 /** * @brief This function handles DMA1 Channel 6 Interrupt. */ @@ -364,7 +367,8 @@ void DMA1_Channel7_IRQHandler(void) /* USER CODE END DMA1_Channel7_IRQn 1 */ } - +#endif +#if 0 /** * @brief This function handles EXTI Lines [9:5] Interrupt. */ @@ -383,7 +387,9 @@ void EXTI9_5_IRQHandler(void) /* USER CODE END EXTI9_5_IRQn 1 */ } +#endif +#if 0 /** * @brief This function handles EXTI Lines [15:10] Interrupt. */ @@ -401,7 +407,9 @@ void EXTI15_10_IRQHandler(void) /* USER CODE END EXTI15_10_IRQn 1 */ } +#endif +#if 0 /** * @brief This function handles USART2 Interrupt. */ @@ -415,7 +423,7 @@ void USART2_IRQHandler(void) /* USER CODE END USART2_IRQn 1 */ } - +#endif /** * @brief This function handles RTC Alarms (A and B) Interrupt. */ diff --git a/Core/Src/usart.c b/Core/Src/usart.c index 954378b..a1080a0 100644 --- a/Core/Src/usart.c +++ b/Core/Src/usart.c @@ -112,6 +112,12 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) GPIO_InitStruct.Alternate = GPIO_AF7_USART2; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + GPIO_InitStruct.Pin = USARTx_RX_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + /* USART2 DMA Init */ /* USART2_TX Init */ hdma_usart2_tx.Instance = DMA1_Channel6; diff --git a/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R4.bin b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R4.bin new file mode 100644 index 0000000..da8a8f5 Binary files /dev/null and b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R4.bin differ diff --git a/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R5.bin b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R5.bin new file mode 100644 index 0000000..9b6482c Binary files /dev/null and b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R5.bin differ diff --git a/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R6.bin b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R6.bin new file mode 100644 index 0000000..f16e85e Binary files /dev/null and b/STM32CubeIDE/Release/STS_R1D_JP_2024_NOV_12LP_R6.bin differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin b/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin index d6f220c..f16e85e 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf index 43dbad7..549aa0e 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ diff --git a/STM32CubeIDE/Release/makefile b/STM32CubeIDE/Release/makefile index 53e0240..b50155f 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/makefile @@ -14,9 +14,6 @@ RM := rm -rf -include Middlewares/LoRaWAN/subdir.mk -include Drivers/STM32WLxx_HAL_Driver/subdir.mk -include Drivers/CMSIS/subdir.mk --include Drivers/BSP/STM32WLxx_Nucleo/subdir.mk --include Drivers/BSP/Components/subdir.mk --include Drivers/BSP/53L8A1/subdir.mk -include Application/User/Startup/subdir.mk -include Application/User/STS/TOF/vl53l0x/subdir.mk -include Application/User/STS/TOF/Target/subdir.mk diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk index 6dd14c2..98f8e11 100644 --- a/STM32CubeIDE/Release/sources.mk +++ b/STM32CubeIDE/Release/sources.mk @@ -31,9 +31,6 @@ Application/User/STS/TOF/App \ Application/User/STS/TOF/Target \ Application/User/STS/TOF/vl53l0x \ Application/User/Startup \ -Drivers/BSP/53L8A1 \ -Drivers/BSP/Components \ -Drivers/BSP/STM32WLxx_Nucleo \ Drivers/CMSIS \ Drivers/STM32WLxx_HAL_Driver \ Middlewares/LoRaWAN \ diff --git a/STS/BIN/STS_R1D_HK_2024NOV11.bin b/STS/BIN/STS_R1D_HK_2024NOV11.bin new file mode 100644 index 0000000..e356fa4 Binary files /dev/null and b/STS/BIN/STS_R1D_HK_2024NOV11.bin differ