中医修改

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
index 7012b50..6b0a1f9 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -414,12 +414,12 @@ static void fr8012haq_create_hisr(void)
 }
 
 static void * fr8012haq_timer = NULL;
-char fr8012haq_timerout_flag = 0;
+char fr8012haq_hisr_ref_flag = 0;
 void fr8012haq_timerout_cb(void)
 {
-    if(fr8012haq_timerout_flag == 1)
+    if(fr8012haq_hisr_ref_flag == 1)
         return;
-    fr8012haq_timerout_flag=1;
+    fr8012haq_hisr_ref_flag=1;
     //FR8012HAQ_LOG("fr8012haq_timerout_cb\n");
     OS_Activate_HISR(&fr8012haq_hisr_ref);
 }
@@ -438,7 +438,7 @@ void fr8012haq_timer_cfg(bool en)
             uos_timer_start(fr8012haq_timer, MS_TO_TICKS(500), MS_TO_TICKS(500), fr8012haq_timerout_cb, NULL);
         }else if(FR8012HAQ_run_mode == YYL_MODE)//中医35秒
         {
-            uos_timer_start(fr8012haq_timer, MS_TO_TICKS(35000), MS_TO_TICKS(35000), fr8012haq_timerout_cb, NULL);
+            uos_timer_start(fr8012haq_timer, MS_TO_TICKS(31000), MS_TO_TICKS(31000), fr8012haq_timerout_cb, NULL);
         }else//其他1秒
         {
             
@@ -951,7 +951,7 @@ void fr8012haq_process_data(uint32_t *process_data)
     //uart4_send_data("{\"cmd\":\"0\"}",sizeof("{\"cmd\":\"0\"}"));//保活用
     // gpio_enable_edge_detect(GPIO32, EDGE_FLAG_RISE);
     // fr8012haq_sleep_resume();
-    fr8012haq_timerout_flag=0;
+    fr8012haq_hisr_ref_flag=0;
 }
 //返回是否激活返回0未激活，联网后判断一次是否激活，没激活需要执行激活参数
 char get_is_HA_activate(void)
@@ -1024,10 +1024,13 @@ void HA_lib_init(void)
 }
 static void fr8012haq_isr_callback(void)
 {
-    sys_pm_wakeup_no_lcd();
+    //sys_pm_wakeup_no_lcd();
     // gpio_enable_edge_detect(GPIO32, 0);
     // fr8012haq_sleep_suspend();
     FR8012HAQ_LOG("fr8012haq_isr_callback :!!!!!!!!!!!!\n");
+    if(fr8012haq_hisr_ref_flag == 1)
+        return;
+    fr8012haq_hisr_ref_flag=1;
     OS_Activate_HISR(&fr8012haq_hisr_ref);
 }
 void hal_fr8012haq_int_init(void)