V0.005.0

leakage_system/usr/app/app.c

@@ -22,8 +22,8 @@
 
 #include "gui_tjc_hmi.h"
 
-const char *HwVersion = "V1.0";
-char SwVersion[24] = "V0.001.0";
+const char *HwVersion = "V2.0";
+char SwVersion[24] = "V0.004.0";
 void task_idle(void); 
 void task_10ms(void);
 void task_50ms(void);
@@ -57,7 +57,7 @@ app_timer_class_t app_timer_task[] =
  ******************************************/
 void app_init(void)
 {
-//    Wdg.Init();
+   Wdg.Init();
     /*flash*/
     w25q32.init();
     
@@ -124,7 +124,7 @@ void task_idle(void)
     com_uart4.rx_task(&com_uart4);
     com_uart6.rx_task(&com_uart6);
     W5500.Task();
-//    Wdg.Feed();
+    Wdg.Feed();
 }
 
 void task_10ms(void)
@@ -155,7 +155,6 @@ void task_500ms(void)
     modbus_leakage[APP_COM4].tx_task(&modbus_leakage[APP_COM4]);
 }
     
-
 void task_1s(void)
 {
     leakage.task();

leakage_system/usr/app/app_leakage.c

@@ -169,7 +169,7 @@ void app_leakage_task(void)
             }
             
             /*历史报警存储*/
-            for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_CH_NUM; k++)
+            for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
             {
                 u16 current_state = p_leakage->sub_device_data[sub_device_index].ch_data[k].state;
                 u16 prev_state = prev_ch_state[sub_device_index][k];
@@ -190,11 +190,20 @@ void app_leakage_task(void)
                     history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_OPEN, 0);
                 }
                 
+                
+                
                 if((current_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT) && 
                    !(prev_state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
                 {
-                    /* 通讯超时报警开始 - 记录历史报警 */
-                    history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT, 0);
+                    if( k > 0 && (p_leakage->sub_device_data[sub_device_index].ch_data[0].state & APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT))
+                    {
+                        /*第一个通道超时，剩余通道不存储超时报警*/
+                    }
+                    else
+                    {
+                        /* 通讯超时报警开始 - 记录历史报警 */
+                        history_add_alarm_record(i, sub_device_index, k, APP_LEAKAGE_SUB_DEVICE_STATE_TIME_OUT, 0);
+                    }
                 }
                 
                 /* 更新历史状态 */
@@ -202,7 +211,7 @@ void app_leakage_task(void)
             }
             
             /* 统计区域异常设备数量 - 按设备统计 */
-            for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_CH_NUM; k++)
+            for(k = 0; k < APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM; k++)
             {
                 u16 current_state = p_leakage->sub_device_data[sub_device_index].ch_data[k].state;
                 

leakage_system/usr/app/app_leakage.h

@@ -17,6 +17,8 @@
 #define APP_LEAKAGE_SUB_DEVICE_NUM (32)
 #define APP_LEAKAGE_SUB_DEVICE_CH_NUM (4)
 
+#define APP_LEAKAGE_SUB_DEVICE_USE_CH_NUM (2)
+
 void app_leakage_task(void);
 void app_leakage_region_classify(void);
 void history_add_alarm_record(u8 region_idx, u8 device_idx, u8 channel, u16 alarm_type, u16 leak_distance);

leakage_system/usr/app/usr_config.h

@@ -9,4 +9,6 @@
 
 #define USR_ON         (1U)
 #define USR_OFF        (0U)
+
+#define LEAKAGE_MULTIPLE (100.0)
 #endif