Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

ip/src/appweb_handle.c

@@ -5172,6 +5172,40 @@ static void equipmentMintenance(void *conn)
           dev_sql_VACCUM(__globalDeviceManage.db);
           log_i("Database SQLite VACCUM!\n");
           ack_str=ctrl_sts_ack_to_json();
+    }else if(strcmp(_Over_equipment_mintenance.type,"restartAll") == 0)
+    {
+        char temp[100];
+        sprintf(temp, "System reboot all device!!");
+        cmd_data_t cmd = {0};
+            
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        cmd.cmd = CASCADE_CMD_REBOOT;
+        cmd.obj = OBJ_CHANNEL;
+        cmd.chId = 0;
+        cascade_request_saddr(&cmd,0,0);
+        sqlite3_close(__globalDeviceManage.db);
+        sys_reboot();
+    }else if(strcmp(_Over_equipment_mintenance.type,"restoreAll") == 0)
+    {
+
+            char temp[100];
+            sprintf(temp, "Factory reset all device!");
+            dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+            cmd_data_t cmd = {0};
+            cmd.cmd = CASCADE_CMD_RECOVERY;
+            cmd.obj = OBJ_CHANNEL;
+            cmd.chId = 0;
+            cascade_request_saddr(&cmd,0,0);
+
+            for (size_t i = 0; i < MAX_CHN_COUNT; i++)
+            {
+                if (__globalDeviceManage._all_ctrl_board[i].product_saddr <= 0)
+                {
+                    continue;
+                }
+                g_switch_get_all_reset(&__globalDeviceManage._globalRelaySampManger,__globalDeviceManage._all_ctrl_board[i].product_type,__globalDeviceManage._all_ctrl_board[i].product_saddr);
+            }
+            sys_set_factory();
     }
 
     cJSON_Delete(cjson);

ip/src/cascade.c

@@ -1455,8 +1455,6 @@ static int master_cmd_addr(cascade_handle_t *cas, cmd_data_t *cmd,int saddr,int
     int i,r;
     GlobalDeviceManager *dm=get_dm();
     data_t rdata,wdata;
-    if(saddr == 0)
-        return -1;
     switch(cmd->cmd) {
         case CASCADE_CMD_GET_INFO:
         {