From 079734e74cb2923e33431d82f31ecd5dfd8f0a1f Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Thu, 25 Jul 2024 17:03:08 +0800 Subject: [PATCH] --- good RED-DARK for overstay , RED-BLUE for SOS --- Core/Src/yunhorn_sts_process.c | 8 ++++---- LoRaWAN/App/lora_app.c | 29 +++++++++++++---------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c index e96a95f..0e06dd3 100644 --- a/Core/Src/yunhorn_sts_process.c +++ b/Core/Src/yunhorn_sts_process.c @@ -102,7 +102,7 @@ extern uint8_t luminance_level; extern volatile uint8_t sts_status_color; extern volatile uint8_t sts_lamp_bar_color; //puColor extern volatile uint8_t sts_cloud_netcolor; //netColor -extern volatile bool p2_work_finished; + volatile uint8_t sts_tof_result_changed_flag = 0; volatile uint8_t sts_rss_result_changed_flag = 0; @@ -245,7 +245,7 @@ extern volatile uint32_t wcnt; */ void STS_YunhornSTSEventP2_Process(void) { - p2_work_finished=false; + //STS_Lamp_Bar_Refresh(); //TODO XXX eliminate refresh every second.... try if ((sts_work_mode >= STS_RSS_MODE) && (sts_work_mode <= STS_TOF_RSS_MODE)) { @@ -265,7 +265,7 @@ void STS_YunhornSTSEventP2_Process(void) STS_Combined_Status_Processing(); } - p2_work_finished=true; + } void STS_Reed_Hall_Presence_Detection(void) @@ -634,7 +634,7 @@ void STS_Combined_Status_Processing(void) #ifdef STS_M1 sts_water_leakage_changed_flag=0; #endif - //sensor_data_ready = 1; + sensor_data_ready = 1; //STS_PRESENCE_SENSOR_Prepare_Send_Data(); } #endif diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 983cc8a..4303014 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -686,7 +686,7 @@ void LoRaWAN_Init(void) #if defined(STS_O7)||defined(STS_O6) UTIL_TIMER_Create(&YunhornSTSRSSWakeUpTimer, YUNHORN_STS_RSS_WAKEUP_CHECK_TIME, - UTIL_TIMER_PERIODIC, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); + UTIL_TIMER_ONESHOT, OnYunhornSTSOORSSWakeUpTimerEvent, NULL); UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, @@ -1296,7 +1296,8 @@ static void OnYunhornSTSDurationCheckTimerEvent(void *context) if (over_threshold == TRUE) { sensor_data_ready = 1; - sts_lamp_bar_color = sts_lamp_bar_flashing_color; + sts_status_color = STS_RED_DARK; + sts_lamp_bar_color = STS_RED_DARK; //sts_lamp_bar_flashing_color; SendTxData(); over_threshold = FALSE; } @@ -1630,23 +1631,19 @@ static void OnRestoreContextRequest(void *nvm, uint32_t nvm_size) */ static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context) { - if (p2_work_finished) + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP2), CFG_SEQ_Prio_0); + //APP_LOG(TS_OFF,VLEVEL_L,"\r\n RSS result changed flag=%d \r\n", sts_rss_result_changed_flag); + if ((STS_LoRa_WAN_Joined != 0)&&(sts_rss_result_changed_flag==1)) { - - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP2), CFG_SEQ_Prio_0); - //APP_LOG(TS_OFF,VLEVEL_L,"\r\n RSS result changed flag=%d \r\n", sts_rss_result_changed_flag); - if ((STS_LoRa_WAN_Joined != 0)&&(sts_rss_result_changed_flag==1)) - { - sts_rss_result_changed_flag = 0; - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); - //if ((last_sts_rss_result ==STS_RESULT_NO_MOTION)&& (sts_rss_result==STS_RESULT_MOTION)) - { - //OnSensor3StateChanged(); - } - } + sts_rss_result_changed_flag = 0; + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); + //if ((last_sts_rss_result ==STS_RESULT_NO_MOTION)&& (sts_rss_result==STS_RESULT_MOTION)) + { + //OnSensor3StateChanged(); + } } - //UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); + UTIL_TIMER_Start(&YunhornSTSRSSWakeUpTimer); }