增加默认参数

pro/src/dflt.c

@@ -53,11 +53,35 @@ GlobalDeviceInfo DFLT_PARAS={
         },
 
         .webcfg = {
+        #ifdef MONWAY
+            .monway = MONWAY,
+        #else
             .monway = 2,
+        #endif
+
+        #ifdef USE_NETSWITCH
+            .netsw  = 1,
+        #else
             .netsw  = 0,
+        #endif
+
+        #ifdef USE_NWIRE
+            .nwire  = 1,
+        #else
             .nwire  = 0,
+        #endif
+
+        #ifdef IPV4_DISABLE
+            .ipv4   = 0,
+        #else
             .ipv4   = 1,
+        #endif
+
+        #ifdef IPV6_DISABLE
+            .ipv6   = 0,
+        #else
             .ipv6   = 1,
+        #endif
         },
 };
 

pro/src/paras.c

@@ -3147,19 +3147,26 @@ static dictionary* ini_load(char *path, GlobalDeviceInfo *info)
     
     r = proc_prod(dic, PARAS_READ, &info->product);
     if(r) {
-        LOGE("___ini_r_dev failed\n");
+        LOGE("___proc_prod failed\n");
         iniparser_freedict(dic);
         return NULL;
     }
 
     r = proc_modbus(dic, PARAS_READ, &info->cascade);
     if(r) {
-        LOGE("___ini_r_modbus failed\n");
+        LOGE("___proc_modbus failed\n");
         iniparser_freedict(dic);
         return NULL;
     }
 
     r = proc_ptotal(dic, PARAS_READ, &info->ptotal);
+    if(r) {
+        LOGE("___proc_ptotal failed\n");
+        iniparser_freedict(dic);
+        return NULL;
+    }
+
+    r = proc_webcfg(dic, PARAS_READ, &info->webcfg);
     if(r) {
         LOGE("___ini_r_modbus failed\n");
         iniparser_freedict(dic);

pro/src/switch_ctrl.c

@@ -3240,6 +3240,26 @@ int g_switch_get_t_ac_breaker_info(void* manger,int saddr,GlobalBreakerManager*
 }
 
 
+////////////////////upgrade///////////////////////////////////
+typedef struct {
+    uint32_t id[3];
+    uint32_t channels;
+    char ver[8];
+    char date[20];
+}information_t;
+int g_switch_get_upgrade(void* manger int addr)
+{
+    int timeout=0;
+    g_modbus_get_timeout(manger, &timeout);
+    g_modbus_set_timeout(manger, 20);
+
+    g_modbus_set_timeout(manger, timeout);
+    return 0;
+}
+int g_switch_set_upgrade(void* manger int addr)
+{
+    return 0;
+}
 int g_switch_get_board_info(board_info_t *info)
 {
     return 0;

pro/src/switch_ctrl.h

@@ -207,5 +207,10 @@ int g_switch_get_t_ac_breaker_info(void* manger,int saddr,GlobalBreakerManager*
 
 //重新加载端口
 int ResetChmData(int nCtrlType);
+
+
+
+int g_switch_get_upgrade(void)
+int g_switch_set_upgrade(void)
 int g_switch_get_board_info(board_info_t *info);
 #endif