From 3c25c8f883800f6f68414087633d0dbd77c3aa38 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 14 Aug 2024 16:11:03 +0800 Subject: [PATCH] ---fixed issue of not sending after join --- LoRaWAN/App/lora_app.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 52b3664..62c1718 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1123,12 +1123,14 @@ static void OnTxTimerEvent(void *context) /* USER CODE BEGIN OnTxTimerEvent_1 */ /* USER CODE END OnTxTimerEvent_1 */ + if ((sensor_data_ready ==1)|| (sts_reed_hall_changed_flag)||(sts_rss_result_changed_flag)||(sts_fall_rising_detected_result_changed_flag)) + { + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); + /*Wait for next tx slot*/ - /*Wait for next tx slot*/ - - UTIL_TIMER_Start(&TxTimer); + UTIL_TIMER_Start(&TxTimer); + } /* USER CODE BEGIN OnTxTimerEvent_2 */ @@ -1423,13 +1425,15 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) OnYunhornSTSHeartBeatPeriodicityChanged(HeartBeatPeriodicity); //UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer, YUNHORN_STS_RSS_WAKEUP_CHECK_TIME, UTIL_TIMER_PERIODIC, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); - //UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer, YUNHORN_STS_RSS_WAKEUP_CHECK_TIME, UTIL_TIMER_ONESHOT, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); - //UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); STS_SENSOR_Distance_Test_Process(); APP_LOG(TS_OFF, VLEVEL_H, "\r\nRSS Measured Distance=[%u] mm \r\n", (uint16_t)sts_distance_rss_distance); + UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer, YUNHORN_STS_RSS_WAKEUP_CHECK_TIME, UTIL_TIMER_ONESHOT, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); + UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); + + } /* USER CODE END OnJoinRequest_1 */