sundp
/
WLE5CC_NODE_STS
1
0
Fork 1
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

P2 #50

Merged
sundp merged 8 commits from P2 into master 2024-11-01 19:34:45 +08:00
Conversation 0 Commits 8 Files Changed 27 -5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83417d747f - Show all commits

5
LoRaWAN/App/lora_app.c
View File

@ -493,13 +493,8 @@ void LoRaWAN_Init(void)
LmHandlerJoin(ActivationType, ForceRejoin);
<<<<<<< HEAD
UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_ONESHOT, OnYunhornSTSHeartBeatTimerEvent, NULL);
UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
=======
UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_PERIODIC, OnYunhornSTSHeartBeatTimerEvent, NULL);
UTIL_TIMER_Start(&YunhornSTSHeartBeatTimer);
>>>>>>> f8f6e7269c1966577403a035f83fec62bab884d9
if (EventType == TX_ON_TIMER)
{