--- no rejoin/joinaccept issue here

This commit is contained in:
Yunhorn 2024-07-08 12:57:58 +08:00
parent ba3b91ed05
commit d5c12645de
8 changed files with 24887 additions and 24804 deletions

View File

@ -60,8 +60,18 @@ void Error_Handler(void);
#define RTC_N_PREDIV_S 10
#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
#ifdef STM32WL55xx
#define LED1_Pin GPIO_PIN_15
#define LED1_GPIO_Port GPIOB
#endif
#ifdef STM32WLE5xx
#define LED1_Pin GPIO_PIN_2
#define LED1_GPIO_Port GPIOB
#define STS_LED1_Pin GPIO_PIN_2
#define STS_LED1_GPIO_Port GPIOB
#define STS_LED1_ON HAL_GPIO_WritePin(STS_LED1_GPIO_Port, STS_LED1_Pin, GPIO_PIN_SET)
#define STS_LED1_OFF HAL_GPIO_WritePin(STS_LED1_GPIO_Port, STS_LED1_Pin, GPIO_PIN_RESET)
#endif
#define LED2_Pin GPIO_PIN_9
#define LED2_GPIO_Port GPIOB
#define BUT1_Pin GPIO_PIN_0
@ -84,9 +94,10 @@ void Error_Handler(void);
#define USARTx_TX_Pin GPIO_PIN_2
#define USARTx_TX_GPIO_Port GPIOA
#define STS_PME_Pin GPIO_PIN_4
#define STS_PME_Pin GPIO_PIN_4
#define STS_PME_GPIO_Port GPIOB
#define STS_PME_ON HAL_GPIO_WritePin(STS_PME_GPIO_Port, STS_PME_Pin, GPIO_PIN_SET)
#define STS_PME_OFF HAL_GPIO_WritePin(STS_PME_GPIO_Port, STS_PME_Pin, GPIO_PIN_RESET)
/* USER CODE BEGIN Private defines */
/* USER CODE END Private defines */

View File

@ -42,7 +42,7 @@ void MX_GPIO_Init(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
#if 1
/* GPIO Ports Clock Enable */
__HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE();
@ -57,7 +57,7 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOA_CLK_DISABLE();
__HAL_RCC_GPIOB_CLK_DISABLE();
__HAL_RCC_GPIOC_CLK_DISABLE();
#endif
/*Configure GPIO pin Output Level */
#if 0
@ -91,12 +91,12 @@ void MX_GPIO_Init(void)
HAL_GPIO_Init(BUT3_GPIO_Port, &GPIO_InitStruct);
#endif
__HAL_RCC_GPIOB_CLK_ENABLE();
GPIO_InitStruct.Pin = GPIO_PIN_4; //|GPIO_PIN_2;
GPIO_InitStruct.Pin = STS_PME_Pin|STS_LED1_Pin; //PB4 PME on/off, PB2, LED1 on/off
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
__HAL_RCC_GPIOB_CLK_DISABLE();
//__HAL_RCC_GPIOB_CLK_DISABLE();
/* EXTI interrupt init*/
#if 0

View File

@ -85,6 +85,26 @@ int main(void)
/* Initialize all configured peripherals */
MX_GPIO_Init();
#if 0
STS_LED1_ON;
HAL_Delay(200);
STS_LED1_OFF;
#endif
#if 0
if(__HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET)
{
/* Clear Standby flag */
__HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
STS_LED1_OFF;
STS_LED1_ON;
HAL_Delay(200);
STS_LED1_OFF;
HAL_Delay(200);
STS_LED1_ON;
HAL_Delay(200);
STS_LED1_OFF;
}
#endif
#if 1
HAL_UART_DeInit(&huart2);
//HAL_GPIO_WritePin(GPIOB, GPIO_PIN_4, GPIO_PIN_RESET); /* PME OFF */

View File

@ -23,7 +23,7 @@
#include "stm32_lpm.h"
#include "stm32_lpm_if.h"
#include "usart_if.h"
#include "gpio.h"
/* USER CODE BEGIN Includes */
/* USER CODE END Includes */
@ -109,22 +109,31 @@ void PWR_EnterStopMode(void)
HAL_UART_DeInit(&huart2);
vcom_DeInit();
// method 01
#if 0
HAL_GPIO_DeInit(GPIOA,GPIO_PIN_All);
HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All);
HAL_GPIO_DeInit(GPIOC,GPIO_PIN_All);
// --> normal work
#endif
//method 02
//HAL_GPIO_WritePin(GPIOA, GPIO_PIN_All, GPIO_PIN_RESET);
//HAL_GPIO_WritePin(GPIOB, GPIO_PIN_All, GPIO_PIN_RESET);
//HAL_GPIO_WritePin(GPIOC, GPIO_PIN_All, GPIO_PIN_RESET);
#if 1
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_All, GPIO_PIN_RESET);
//HAL_GPIO_DeInit(GPIOA,GPIO_PIN_All);
//HAL_GPIO_WritePin(GPIOB, GPIO_PIN_All, GPIO_PIN_RESET); //no rejoin issue
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
//HAL_GPIO_DeInit(GPIOC,GPIO_PIN_All);
// --- reboot in each interval re-join again and again
#endif
//method 03
//HAL_GPIO_WritePin(GPIOA, 0x65FF, GPIO_PIN_RESET);
//HAL_GPIO_WritePin(GPIOB, 0xFEC7, GPIO_PIN_RESET);
//HAL_GPIO_WritePin(GPIOC, 0xDFFF, GPIO_PIN_RESET);
//method 03 --- confirmed JoinRequest/JoinAccept cycle ----2024-07-08 11AM
#if 0
HAL_GPIO_WritePin(GPIOA, 0x65FF, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOB, 0xFEC7, GPIO_PIN_RESET);
HAL_GPIO_WritePin(GPIOC, 0xDFFF, GPIO_PIN_RESET);
#endif
/* USER CODE END EnterStopMode_1 */
HAL_SuspendTick();
@ -153,6 +162,7 @@ void PWR_ExitStopMode(void)
SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM */
/* Resume not retained USARTx and DMA */
MX_GPIO_Init();
//vcom_Resume();
/* USER CODE BEGIN ExitStopMode_2 */

View File

@ -679,7 +679,15 @@ static void OnTxTimerEvent(void *context)
//__HAL_RCC_GPIOB_CLK_ENABLE();
//HAL_GPIO_WritePin(GPIOB,GPIO_PIN_4,GPIO_PIN_SET);
STS_PME_ON;
STS_LED1_ON;
//HAL_GPIO_WritePin(GPIOB,GPIO_PIN_2,GPIO_PIN_SET);
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
HAL_Delay(3000);
STS_LED1_OFF;
STS_PME_OFF;
//HAL_GPIO_WritePin(GPIOB,GPIO_PIN_2,GPIO_PIN_RESET);
//HAL_GPIO_WritePin(GPIOB,GPIO_PIN_4,GPIO_PIN_RESET);
//HAL_Delay(2000);
/*Wait for next tx slot*/

View File

@ -1,24 +1,24 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:769:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:804:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:811:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:852:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:863:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:777:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:812:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:819:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:860:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:871:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:706:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:701:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:826:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:933:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:674:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:818:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:830:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:925:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:698:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:693:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:996:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:888:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:941:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:838:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:1004:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:896:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:949:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:552:13:SendTxData 7
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:703:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:874:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:710:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:739:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:711:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:718:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:882:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:747:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:472:13:OnRxData 13
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:981:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:963:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:989:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:971:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:348:6:LoRaWAN_Init 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:443:6:HAL_GPIO_EXTI_Callback 3

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff