北向开关检测信息。

pro/CMakeLists.txt

@@ -274,7 +274,7 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/src/breaker_detection.c
 	${PROJECT_SOURCE_DIR}/src/cascade_slave_tcp.c
 	${PROJECT_SOURCE_DIR}/src/Cellular.c
-	${PROJECT_SOURCE_DIR}/src/wifi.c
+	#${PROJECT_SOURCE_DIR}/src/wifi.c
 
     ${PROJECT_SOURCE_DIR}/ui/font.c
 	${PROJECT_SOURCE_DIR}/ui/lang.c

pro/src/app.c

@@ -32,6 +32,7 @@
 #include "Cellular.h"
 #include "wifi.h"
 #include <sys/msg.h>
+#include "stdlib.h"
 
 
 
@@ -1582,6 +1583,24 @@ static void* breaker_thread(void *arg)
                     if (chn>=1&& chn<=BREAKER_485_CHN_MAX)
                     {
                         temp->breaker_status = breaker_scann->board[temp->breaker_gather_addr-BREADER_485_ADDR].ch_status[chn-1];
+                        if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC 
+                            || _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)
+                        {
+                            if(temp->breaker_status){
+                                _globalDeviceManager->single_mmap->breaker_value |= (1 << (temp->breaker_id-1));
+                            }
+                            else{
+                               
+                                _globalDeviceManager->single_mmap->breaker_value &= (~(1 << (temp->breaker_id-1)));
+                            }
+                                
+                        }else
+                        {
+                            if(temp->breaker_status)
+                                _globalDeviceManager->triphasic_mmap->breaker_value |= (1 << (temp->breaker_id-1));
+                            else
+                                _globalDeviceManager->triphasic_mmap->breaker_value &= (~(1 << (temp->breaker_id-1)));
+                        }
 #if USE_SMART_DETECTION_CTRL
                         if( temp->breaker_status == 0 && chn >=2 && chn <= 5)               //close
                         {
@@ -1646,6 +1665,23 @@ static void* breaker_thread(void *arg)
                     }
                     break;
                 }
+                if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC 
+                    || _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC )
+                {
+                    if(temp->breaker_status)
+                        _globalDeviceManager->single_mmap->breaker_value |= (1 << (temp->breaker_id-1));
+                    else
+                        _globalDeviceManager->single_mmap->breaker_value &= (~(1 << (temp->breaker_id-1)));
+                    
+                }else
+                {
+                    if(temp->breaker_status)
+                        _globalDeviceManager->triphasic_mmap->breaker_value |= (1 << (temp->breaker_id-1));
+                    else
+                        _globalDeviceManager->triphasic_mmap->breaker_value &= (~(1 << (temp->breaker_id-1)));
+                    
+                }
+                
             }
             if(temp->breaker_gather_addr == 0)
             {
@@ -1661,26 +1697,26 @@ static void* breaker_thread(void *arg)
 
 static void set_sensor_val_modbus(GlobalDeviceManager *_globalDeviceManager,GlobalSensorInfo *info,int saddr)
 {
-    if(saddr>4 || saddr<0)
+    if(saddr>=4 || saddr<0)
         return;
     if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC ||
     _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)
     {
         if(_globalDeviceManager->single_mmap) {
-            _globalDeviceManager->single_mmap->cas_sensor[saddr-1].s_1 = info->val1 * 1000;
+            _globalDeviceManager->single_mmap->cas_sensor[saddr].s_1 = info->val1 * 1000;
             if(info->val2 == -1)
-                 _globalDeviceManager->single_mmap->cas_sensor[saddr-1].s_2 = 0xFFFFFFFF;
+                 _globalDeviceManager->single_mmap->cas_sensor[saddr].s_2 = 0xFFFFFFFF;
             else
-                _globalDeviceManager->single_mmap->cas_sensor[saddr-1].s_2 = info->val2 * 1000;
+                _globalDeviceManager->single_mmap->cas_sensor[saddr].s_2 = info->val2 * 1000;
         }
     }else{
         if (_globalDeviceManager->triphasic_mmap)
         {
-            _globalDeviceManager->triphasic_mmap->cas_sensor[saddr-1].s_1 = info->val1 * 1000;
+            _globalDeviceManager->triphasic_mmap->cas_sensor[saddr].s_1 = info->val1 * 1000;
             if(info->val2 == -1)
-                 _globalDeviceManager->triphasic_mmap->cas_sensor[saddr-1].s_2 = 0xFFFFFFFF;
+                 _globalDeviceManager->triphasic_mmap->cas_sensor[saddr].s_2 = 0xFFFFFFFF;
             else
-                _globalDeviceManager->triphasic_mmap->cas_sensor[saddr-1].s_2 = info->val2 * 1000;
+                _globalDeviceManager->triphasic_mmap->cas_sensor[saddr].s_2 = info->val2 * 1000;
         }
     }
 }
@@ -1702,6 +1738,16 @@ static void set_dry_val_modbus(GlobalDeviceManager *_globalDeviceManager,int val
     }
 }
 
+static int compare_uint8_s(const void *a,const void *b)
+{
+    uint8_t arg1 = *(const uint8_t *)a;
+    uint8_t arg2 = *(const uint8_t *)b;
+    
+    if (arg1 < arg2) return -1;
+    if (arg1 > arg2) return 1;
+    return 0;
+}
+
 
 /// @brief 传感器采集线程
 /// @param arg 
@@ -1733,6 +1779,13 @@ static void* sensor_thread(void* arg)
     // printf("asdasdasdasdasd   %d\n",nSaveIndex);
     int nMaxIndex = 2000000000;
     int nDeleteNumber = 1000 / 120000 * 3600 * 24 * 30 * 10; // 1/60s;
+    struct sensor_addr {
+        int count;
+        uint8_t serser_addr[255];
+    }sen={
+        .count = 0,
+        .serser_addr = {0},
+    };
     //  printf("senseor   !!!!!\n");
 
     //初始化GPIO
@@ -1760,7 +1813,18 @@ static void* sensor_thread(void* arg)
         {
             dev_change_last_Index(_globalDeviceManager->db, &nSaveIndex, nDeleteNumber, strTable);
         }
-        
+        //int val = 0;
+        sen.count = 0;
+        list_for_each_entry(_globalSensorMangerTemp, &_globalDeviceManager->_globalSensorManger.list, list)
+        {
+            if(_globalSensorMangerTemp->sensor_interface_type == 1)  //485 类型传感器
+            {
+                sen.serser_addr[sen.count] = _globalSensorMangerTemp->sensor_addr;
+                sen.count ++;
+            }
+        }
+        if(sen.count > 0)
+            qsort(sen.serser_addr,sen.count,sizeof(uint8_t),compare_uint8_s);
         lock_s_hold(LOCK_ID_SENSOR);
         list_for_each_entry(_globalSensorMangerTemp, &_globalDeviceManager->_globalSensorManger.list, list)
         {
@@ -1776,6 +1840,7 @@ static void* sensor_thread(void* arg)
             _globalSensorInfo.product_log_time=_globalSensorMangerTemp->Cur_sensor_info.product_log_time;
             switch (_globalSensorMangerTemp->sensor_type)
             {
+
             case SENSOR_TYPE_TEMP_HUMI: // 温湿度
             {
                 // printf("get \n");
@@ -1823,9 +1888,18 @@ static void* sensor_thread(void* arg)
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
                 _globalDeviceManager->g_modebus_read.temprature=temperature*100;
                 _globalDeviceManager->g_modebus_read.humidity=humidity*100;
-                set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+                for(int i =0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
+                {
+                    if(_globalSensorMangerTemp->sensor_addr == sen.serser_addr[i])
+                    {
+                        set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,i);
+                        break;
+                    }
+                }
+                    
             }
             break;
+
     #if (CHIP_TYPE != CHIP_T113s)
             case SENSOR_TYPE_SMOKE: // 烟雾
             case SENSOR_TYPE_WATER: // 水浸
@@ -1851,6 +1925,7 @@ static void* sensor_thread(void* arg)
             }
             break;
     #endif
+
             case SENSOR_TYPE_GAS: // 气体
             {
                 float CO2 = 0.0;
@@ -1868,9 +1943,18 @@ static void* sensor_thread(void* arg)
                     _globalSensorInfo.val2 = 0;
                 }
                 _globalSensorMangerTemp->Cur_sensor_info = _globalSensorInfo;
-                set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+                for(int i = 0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
+                {
+                    if(_globalSensorMangerTemp->sensor_addr == sen.serser_addr[i])
+                    {
+                        set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,i);
+                        break;
+                    }
+                }   
             }
             break;
+
+
             case SENSOR_TYPE_AIR_PRESS: // 气流
             {
                     _globalSensorInfo.val1=0;
@@ -1904,6 +1988,7 @@ static void* sensor_thread(void* arg)
             }
             break;
 
+
             case SENSOR_TYPE_LEAK://泄漏传感器
             {
                 sensor_dat_t sdat;
@@ -1918,19 +2003,28 @@ static void* sensor_thread(void* arg)
                     _globalSensorInfo.val2 = 0.0f;
                 }
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
+                for(int i = 0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
+                {
+                    if(_globalSensorMangerTemp->sensor_addr == sen.serser_addr[i])
+                    {
+                        set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,i);
+                        break;
+                    }
+                }   
                 //set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
 
                 //printf("_______SENSOR_TYPE_LEAK: addr:%d, %d, %d, ____%f\n", _globalSensorMangerTemp->sensor_addr, ret, sdat.flag, sensor_info.val1);
-                if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC ||
-                            _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)
-                {
-                    _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = _globalSensorInfo.val1;
-                    _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
-                }else
-                {
-                    _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = _globalSensorInfo.val1;
-                    _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
-                }
+                // if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC ||
+                //             _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)
+                // {
+                //     log_w("_globalSensorMangerTemp->sensor_addr = %d\n",_globalSensorMangerTemp->sensor_addr);
+                //    // _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = _globalSensorInfo.val1;
+                //    // _globalDeviceManager->single_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
+                // }else
+                // {
+                //    // _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_1 = _globalSensorInfo.val1;
+                //    // _globalDeviceManager->triphasic_mmap->cas_sensor[_globalSensorMangerTemp->sensor_addr-1].s_2 = 0xFFFFFFFF;
+                // }
             }
             break;
 
@@ -1959,7 +2053,15 @@ static void* sensor_thread(void* arg)
                 _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
                 _globalDeviceManager->g_modebus_read.temprature=temperature*100;
                 _globalDeviceManager->g_modebus_read.temprature2=temperature2*100;
-                set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
+                for(int i = 0 ; i < NOARTH_MAX_SENSOR;i++)           //最多4个
+                {
+                    if(_globalSensorMangerTemp->sensor_addr == sen.serser_addr[i])
+                    {
+                        set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,i);
+                        break;
+                    }
+                }   
+                //set_sensor_val_modbus(_globalDeviceManager,&_globalSensorInfo,_globalSensorMangerTemp->sensor_addr);
             }
             break;
             }
@@ -3002,8 +3104,9 @@ int app_init(void)
     appweb_init();
 
     cellular_init();
+#if (CHIP_TYPE != CHIP_T113s)
     wifi_init();
-
+#endif
     upg_init();
     dev_Alarm_Run_message(_globalDeviceManager,language_alarm_Init_Success[0],"Server Thread");
     

pro/src/appweb_handle.c

@@ -3902,16 +3902,20 @@ static void communicationManagement(void *conn)
 
     else if(strcmp(reqInfo.type,"listWIFIPZQuery")==0) // WIFI处理
     {
+#if (CHIP_TYPE != CHIP_T113s)
         ap_stat_t stat;
         WIFIInfo_t *wm=& __globalDeviceManage._globalDevInfo.wifi;
 
         wifi_sta_stat(&stat);
         wm->Link_status = stat.link;
         strcpy(wm->WIFI_ip, stat.ipaddr);
+    
         ack_str = communication_WIFI_ack_to_json(wm,0);
+#endif
     }
      else if (strcmp(reqInfo.type, "WIFIPZSave") == 0) // WIFI处理
     {
+#if (CHIP_TYPE != CHIP_T113s)
         WIFIInfo_t *wm=& __globalDeviceManage._globalDevInfo.wifi;
         wm->mode = reqInfo._4g_wifi_info.WIFI_mode;
          strcpy(wm->WIFI_name, reqInfo._4g_wifi_info.WIFI_name);
@@ -3919,7 +3923,9 @@ static void communicationManagement(void *conn)
 
          wifi_set(wm);
          paras_save();
+
          ack_str = ctrl_sts_ack_to_json(); 
+#endif
     }
 
     cJSON_Delete(cjson);

pro/src/cascade_slave.c

@@ -15,7 +15,8 @@
 #define CHN_OPEN_DLA_REG            (4843)
 #define CHN_CLOSE_DLA_REG           (4907)
 #define SENSOR_REG                  (4971)
-#define DRY_REG                     (4987)     
+#define DRY_REG                     (4987)
+#define BREAKER                     (4991)     
 #define CHN_SET_OPEN_DLA_REG        (5000)
 #define CHN_SET_CLOSE_DLA_REG       (5064)
 #define CHN_SET_SWITCH_STA_REG      (5128)
@@ -73,6 +74,7 @@ enum {
     DS_R_CLOSE_DELAY,
     DS_R_SENSOR,
     DS_R_DRY,
+    DS_R_BREAKER,
     DS_W_OPEN_DELAY,
     DS_W_CLOSE_DELAY,
     DS_W_CHN_SWITCH_STA,
@@ -92,7 +94,8 @@ enum {
 #define TREE_CHN_CLOSE_DLA_REG          (8715)
 
 #define TREE_SENSOR_REG                 (8779)
-#define TREE_DRY_REG                    (8795) 
+#define TREE_DRY_REG                    (8795)
+#define TREE_BREKAER                    (8799)
 
 #define TREE_CHN_SET_OPEN_DLA_REG       (9000)
 #define TREE_CHN_SET_CLOSE_DLA_REG      (9064)
@@ -112,6 +115,7 @@ enum {
     TREE_R_CLOSE_DELAY,
     TREE_R_SENSOR,
     TREE_R_DRY,
+    TREE_R_BREAKER,
     TREE_W_OPEN_DELAY,
     TREE_W_CLOSE_DELAY,
     TREE_W_CHN_SWITCH_STA,
@@ -140,7 +144,8 @@ static mmap_modbus_t modbus_single[] = {
     [DS_R_OPEN_DELAY    ]{.offset = CHN_OPEN_DLA_REG        },
     [DS_R_CLOSE_DELAY   ]{.offset = CHN_CLOSE_DLA_REG       },
     [DS_R_SENSOR        ]{.offset = SENSOR_REG              },
-    [DS_R_DRY           ]{.offset = DRY_REG                 },                
+    [DS_R_DRY           ]{.offset = DRY_REG                 }, 
+    [DS_R_BREAKER       ]{.offset = BREAKER                 },               
     [DS_W_OPEN_DELAY    ]{.offset = CHN_SET_OPEN_DLA_REG    },
     [DS_W_CLOSE_DELAY   ]{.offset = CHN_SET_CLOSE_DLA_REG   },
     [DS_W_CHN_SWITCH_STA]{.offset = CHN_SET_SWITCH_STA_REG  },
@@ -160,6 +165,7 @@ static mmap_modbus_t modbus_three[] = {
     [TREE_R_CLOSE_DELAY     ]{.offset = TREE_CHN_CLOSE_DLA_REG },
     [TREE_R_SENSOR          ]{.offset = TREE_SENSOR_REG         },
     [TREE_R_DRY             ]{.offset = TREE_DRY_REG             }, 
+    [TREE_R_BREAKER         ]{.offset = TREE_BREKAER            },
     [TREE_W_OPEN_DELAY      ]{.offset = TREE_CHN_SET_OPEN_DLA_REG},
     [TREE_W_CLOSE_DELAY     ]{.offset = TREE_CHN_SET_CLOSE_DLA_REG},
     [TREE_W_CHN_SWITCH_STA  ]{.offset = TREE_CHN_SET_SWITCH_STA_REG},
@@ -199,8 +205,9 @@ int cascade_slave_init(void)
         modbus_single[DS_R_SWITCH_STA       ].addr = &mgr->single_mmap->chn_status; 
         modbus_single[DS_R_OPEN_DELAY       ].addr = &mgr->single_mmap->open_delay;
         modbus_single[DS_R_CLOSE_DELAY      ].addr = &mgr->single_mmap->close_delay;
-        modbus_single[DS_R_SENSOR           ].addr = &mgr->single_mmap->cas_sensor;
-        modbus_single[DS_R_DRY              ].addr = &mgr->single_mmap->d_node;
+        modbus_single[DS_R_SENSOR           ].addr = &mgr->single_mmap->cas_sensor[0];
+        modbus_single[DS_R_DRY              ].addr = &mgr->single_mmap->d_node[0];
+        modbus_single[DS_R_BREAKER          ].addr = &mgr->single_mmap->breaker_value;
         modbus_single[DS_W_OPEN_DELAY       ].addr = &mgr->single_mmap->set_chn_open_delay;
         modbus_single[DS_W_CLOSE_DELAY      ].addr = &mgr->single_mmap->set_chn_close_delay;
         modbus_single[DS_W_CHN_SWITCH_STA   ].addr = &mgr->single_mmap->set_chn_switch_status;
@@ -226,8 +233,8 @@ int cascade_slave_init(void)
         modbus_three[TREE_R_OPEN_DELAY      ].addr = &mgr->triphasic_mmap->open_delay;
         modbus_three[TREE_R_CLOSE_DELAY     ].addr = &mgr->triphasic_mmap->close_delay;
         modbus_three[TREE_R_SENSOR          ].addr = &mgr->triphasic_mmap->cas_sensor[0];
-        modbus_three[TREE_R_DRY             ].addr = &mgr->triphasic_mmap->d_node;
-
+        modbus_three[TREE_R_DRY             ].addr = &mgr->triphasic_mmap->d_node[0];
+        modbus_three[TREE_R_BREAKER         ].addr = &mgr->triphasic_mmap->breaker_value;
         modbus_three[TREE_W_OPEN_DELAY      ].addr = &mgr->triphasic_mmap->set_chn_open_delay;
         modbus_three[TREE_W_CLOSE_DELAY     ].addr = &mgr->triphasic_mmap->set_chn_close_delay;
         modbus_three[TREE_W_CHN_SWITCH_STA  ].addr = &mgr->triphasic_mmap->set_chn_switch_status;
@@ -380,7 +387,7 @@ void cascade_slave_read(uint32_t addr,uint32_t lenth)
         case SENSOR_REG ... (DRY_REG-1):
             slave_read(sh,addr,lenth,DS_R_SENSOR,TYPE_U32);
         break;
-        case DRY_REG ... 4990:
+        case DRY_REG ... BREAKER:
             slave_read(sh,addr,lenth,DS_R_DRY,TYPE_U16);
         break;
         case 5000 ... 5063:
@@ -430,7 +437,7 @@ void cascade_slave_read(uint32_t addr,uint32_t lenth)
         case TREE_SENSOR_REG ... (TREE_DRY_REG-1):
             slave_read(sh,addr,lenth,TREE_R_SENSOR,TYPE_U32);
         break;
-        case TREE_DRY_REG ... 8798:
+        case TREE_DRY_REG ... TREE_BREKAER:
             slave_read(sh,addr,lenth,TREE_R_DRY,TYPE_U16);
         break;
         default:

pro/src/common.h

@@ -102,6 +102,11 @@
 #define AC_MAX_CURRENT_VAL 100
 #define AC_MAX_POWER_VAL 100
 
+
+
+#define NOARTH_MAX_SENSOR        4
+#define NOARTH_MAX_DRY        4
+
 enum{
     BREAKER_DIO = 0,
     BREAKER_RS485
@@ -1054,7 +1059,8 @@ typedef struct cascade_single_mmap{
     //uint16_t reservers[29];
     cascade_sensor_t cas_sensor[4];
     dry_node_t       d_node[4];
-    uint16_t reservers[9];
+    uint16_t         breaker_value;
+    uint16_t reservers[8];
     uint16_t set_chn_open_delay[64];
     uint16_t set_chn_close_delay[64];
     uint16_t set_chn_switch_status[64];
@@ -1148,6 +1154,7 @@ typedef struct cascade_triphasic_mmap{
     uint16_t close_delay[MAX_CHN];
     cascade_sensor_t cas_sensor[4];
     dry_node_t       d_node[4];
+    uint16_t         breaker_value;
     uint16_t set_chn_open_delay[MAX_CHN];
     uint16_t set_chn_close_delay[MAX_CHN];
     uint16_t set_chn_switch_status[MAX_CHN];

pro/src/websocket_handle.c

@@ -260,6 +260,7 @@ static int ws_Cellular_update(ws_handle_t *h)
     return 0;
 }
 
+#if (CHIP_TYPE != CHIP_T113s)
 static int ws_WIFI_update(ws_handle_t *h)
 {
     char *json;
@@ -283,6 +284,7 @@ static int ws_WIFI_update(ws_handle_t *h)
 
     return 0;
 }
+#endif
 
 
 /////////////////////////////////////////////////////////////
@@ -314,8 +316,9 @@ static int ws_update(ws_handle_t *h)
     r = ws_Cellular_update(h);
 
     //wifi refresh
+#if (CHIP_TYPE != CHIP_T113s)
     r = ws_WIFI_update(h);
-
+#endif
     //upgrade refresh
     r = ws_upg_update(h);
 

pro/src/wifi.c

@@ -28,6 +28,7 @@
 
 
 
+
 #define ONCE_CNT            20
 #define WLAN_IFNAME         "wlan0"
 #define AP_CONF             "/etc/hostapd.conf"