解bug

pro/CMakeLists.txt

@@ -53,7 +53,7 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/easylogger/src/elog_buf.c	
 	${PROJECT_SOURCE_DIR}/easylogger/src/elog_utils.c
 
-    ${PROJECT_SOURCE_DIR}/ini/dictionary.c
+	${PROJECT_SOURCE_DIR}/ini/dictionary.c
 	${PROJECT_SOURCE_DIR}/ini/iniparser.c
 
 	${PROJECT_SOURCE_DIR}/mongoose/mongoose.c
@@ -78,7 +78,7 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/src/xlist.c
 	${PROJECT_SOURCE_DIR}/src/thread.c
 	${PROJECT_SOURCE_DIR}/src/cascade.c
-    ${PROJECT_SOURCE_DIR}/src/cascade_slave.c
+	${PROJECT_SOURCE_DIR}/src/cascade_slave.c
 	${PROJECT_SOURCE_DIR}/src/upg.c
 	${PROJECT_SOURCE_DIR}/src/file.c
 	${PROJECT_SOURCE_DIR}/src/lock.c
@@ -129,4 +129,4 @@ add_custom_command(TARGET  smartPDU  POST_BUILD
 
 
 #execute_process(COMMAND ${DST_DIR}/pack.sh)
-#add_custom_target(PACK COMMAND ${DST_DIR}/pack.sh ALWAYS)
+#add_custom_target(PACK COMMAND ${DST_DIR}/pack.sh ALWAYS)

pro/ini/iniparser.c

@@ -15,7 +15,7 @@
 #include "iniparser.h"
 
 /*---------------------------- Defines -------------------------------------*/
-#define ASCIILINESZ         (1024)
+#define ASCIILINESZ         (1024*10)
 #define INI_INVALID_KEY     ((char*)-1)
 
 /*---------------------------------------------------------------------------

pro/src/app.c

@@ -124,7 +124,7 @@ static int upgrade_proc(char *path, Modbus_Manger *mm)
     
     //broad upgrade file
     upgrade_send(mm, 1, fbuf.buf, fbuf.dlen);
-    for(i=0; i<dm->brdMax; i++) {
+    for(i=1; i<=dm->brdMax; i++) {
         if(dm->pCtrlBoard[i].product_saddr==0) {
             continue;
         }
@@ -324,7 +324,7 @@ static void* power_thread(void* arg)
                 break;
             }
 
-            if (!(_globalPowerMangerTemp->product_saddr < _globalDeviceManager->brdMax && _globalPowerMangerTemp->product_saddr > 0))
+            if (!(_globalPowerMangerTemp->product_saddr <= _globalDeviceManager->brdMax && _globalPowerMangerTemp->product_saddr > 0))
             {
             	continue;
             }
@@ -997,7 +997,7 @@ static void* power_thread(void* arg)
                 }
                 memset(&_globalDeviceManager->_globalPowerManger._PowerInfo, 0, sizeof(PowerInfo));      
                 memset(&_pTreeACPowerMangerTemp->_PowerInfo, 0, sizeof(_globalPowerInfo._power_info));
-                for (size_t i = 0; i < _globalDeviceManager->brdMax; i++)
+                for (size_t i = 0; i <= _globalDeviceManager->brdMax; i++)
                 {
                     if (_globalDeviceManager->pCtrlBoard[i].product_saddr == 0 || _globalDeviceManager->pCtrlBoard[i].product_type != TREE_AC_TYPE)
                     {
@@ -1262,11 +1262,11 @@ void AlarmCtrlAll(int nCtrl)
  */
 void sensor_alarm(GlobalSensorManger *_globalSensorMangerTemp, int nAlarmType)
 {
-    bool *penable = NULL;   //使能
-    bool *pSave = NULL;     //是否已报警
+    int *penable = NULL;   //使能
+    int *pSave = NULL;     //是否已报警
     float *pValthreshold = NULL;//阈值
     float *pValData = NULL;     //当前值
-    char  *nCtrlType = NULL; //报警方式
+    int  *nCtrlType = NULL; //报警方式
     char  *nCtrlValue= NULL; //控制通道
     char strCtrlValue[512]={0};
     if (!_globalSensorMangerTemp)

pro/src/appweb_handle.c

@@ -214,7 +214,7 @@ static int get_range(time_t *from, time_t *to, char *start, char *end, int max_d
 }
 static int power_export(char *path, char *start, char *end)
 {
-    int r,type=0;
+    int r;
     time_t from,to;
     char tmp1[100],tmp2[100];
     GlobalDeviceManager *dm=&__globalDeviceManage;
@@ -224,10 +224,7 @@ static int power_export(char *path, char *start, char *end)
     get_time_str2(tmp2,sizeof(tmp2),to);
     sprintf(path, "/tmp/power_%s_%s.csv", tmp1, tmp2);
 
-    if(dm->_globalDevInfo.product.pwr_type>=SmartPDU_Tree_AC_Tree) {
-        type = 1;
-    }
-    return dev_power_xport(type, from, to, path);
+    return dev_power_xport(from, to, path);
 }
 
 static int file_io(void *conn, int ftype, int io, char *buf)
@@ -4058,10 +4055,10 @@ static void serviceManagement(void *conn)
             log_e("time zone not contain GMT/UTC");
             return;
         }
-        char tempstr[10];
-        memcpy(tempstr, &p[strlen(key)], strlen(p) - strlen(key));
-        int value = atoi(tempstr);
-        if (value > 12 || value < -11)
+        p += strlen(key);
+        
+        int value = atoi(p);
+        if (value > 12 || value < -12)
         {
             char buf[128];
             memset(buf, 0, sizeof(buf));
@@ -4086,6 +4083,7 @@ static void serviceManagement(void *conn)
         }
         if (_globalNTPManager.mode == 0)
         {
+            char tempstr[10];
             memset(tempstr, 0, sizeof(tempstr));
             p = strstr(_globalNTPManager.time, "-");
             if (p == NULL)
@@ -5539,7 +5537,7 @@ static void equipmentMintenance(void *conn)
         sprintf(temp, "System Reset!");
         dev_insert_alarm_ctrl(dm->db, dm->_globalDevInfo.product.id, ALARM_TYPE_OPRATION, temp);
 
-        for (size_t i = 0; i < ptotal->brdMax; i++)
+        for (size_t i = 0; i <= ptotal->brdMax; i++)
         {
             if (dm->pCtrlBoard[i].product_saddr <= 0)
             {

pro/src/common.h

@@ -610,31 +610,31 @@ typedef struct
 
 typedef struct
 {
-    bool                sensor_val1_upper_enabled ;//
+    int                 sensor_val1_upper_enabled ;//
     float               sensor_val1_upper_threshold;
-    char                sensor_val1_upper_threshold_ctrl;
+    int                 sensor_val1_upper_threshold_ctrl;
     char                sensor_val1_upper_threshold_ctrl_para[512];
-    bool                sensor_val1_lower_enabled ;//
+    int                 sensor_val1_lower_enabled ;//
     float               sensor_val1_lower_threshold;
-    char                sensor_val1_lower_threshold_ctrl;
+    int                 sensor_val1_lower_threshold_ctrl;
     char                sensor_val1_lower_threshold_ctrl_para[512];
-    bool                sensor_val2_upper_enabled ;//
+    int                 sensor_val2_upper_enabled ;//
     float               sensor_val2_upper_threshold;
-    char                sensor_val2_upper_threshold_ctrl;
+    int                 sensor_val2_upper_threshold_ctrl;
     char                sensor_val2_upper_threshold_ctrl_para[512];
-    bool                sensor_val2_lower_enabled ;//
+    int                 sensor_val2_lower_enabled ;//
     float               sensor_val2_lower_threshold;
-    char                sensor_val2_lower_threshold_ctrl;
+    int                 sensor_val2_lower_threshold_ctrl;
     char                sensor_val2_lower_threshold_ctrl_para[512];
 }GlobalSensorOverManage;
 
 //传感器报警状态表
 typedef struct
 {   
-    bool                sensor_val1_upper;
-    bool                sensor_val1_lower;
-    bool                sensor_val2_upper;
-    bool                sensor_val2_lower;
+    int                 sensor_val1_upper;
+    int                 sensor_val1_lower;
+    int                 sensor_val2_upper;
+    int                 sensor_val2_lower;
 }GlobalSensorOverInfo;
 //传感器管理总表
 typedef struct 
@@ -726,7 +726,7 @@ typedef struct {
     char                cid[64];    		            //client ID
     char                user[64];    			        //
     char                password[64];
-    char                cert[8192];
+    char                cert[8200];
     int                 status;
 }mqtt_server_t;
 typedef struct {

pro/src/sqlite_handle.h

@@ -203,20 +203,8 @@ int dev_sensor_xport(sqlite3 *db, int io_type, char *path);
 int dev_alarm_xport(int io_type, char *path);
 int dev_serv_xport(int io_type, char *path);
 int dev_log_xport(int type, time_t from, time_t to, char *path);
-int dev_power_xport(int type, time_t from, time_t to, char *path);
+int dev_power_xport(time_t from, time_t to, char *path);
 int dev_clear_table(sqlite3 *db, int tab_id);
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 #endif

pro/src/sys.c

@@ -1181,7 +1181,7 @@ struct tm* get_curtime(void)
 }
 static void send_power_data(struct tm *tm, char *dir)
 {
-    int r,type=0;
+    int r;
     char path[200],sub[100];
     char tmp1[100],tmp2[100];
     GlobalDeviceManager *dm=&__globalDeviceManage;
@@ -1191,15 +1191,12 @@ static void send_power_data(struct tm *tm, char *dir)
     get_range(tm, &from, &to, 1);
 
     if(sended_id != from) {
-        if(dm->_globalDevInfo.product.pwr_type>=SmartPDU_Tree_AC_Tree) {
-            type = 1;
-        }
         get_time_str2(tmp1,sizeof(tmp1),from);
         get_time_str2(tmp2,sizeof(tmp2),to);
 
         sprintf(path, "%s/power_%s_%s.csv", dir, tmp1, tmp2);
         if(!file_exist(path)) {
-            dev_power_xport(type, from, to, path);
+            dev_power_xport(from, to, path);
         }
 
         if(file_exist(path)) {
@@ -1214,7 +1211,7 @@ static void send_power_data(struct tm *tm, char *dir)
 }
 static void send_log_data(struct tm *tm, char *dir)
 {
-    int i,r,type=0;
+    int i,r;
     char path[200],sub[100];
     char tmp1[100],tmp2[100];
     GlobalDeviceManager *dm=&__globalDeviceManage;
@@ -1235,7 +1232,7 @@ static void send_log_data(struct tm *tm, char *dir)
 
             sprintf(path, "%s/log_%s_%s_%s.csv", dir, logname[i], tmp1, tmp2);
             if(!file_exist(path)) {
-                dev_log_xport(type, from, to, path);
+                dev_log_xport(i, from, to, path);
             }
 
             if(file_exist(path)) {
@@ -1254,20 +1251,20 @@ static void send_log_data(struct tm *tm, char *dir)
 static int tmp_create(void)
 {
     char cmd[100];
-    sprintf(cmd, "mkdir -p %s", TMP_DIR);
+    sprintf(cmd, "mkdir -p %s > /dev/null", TMP_DIR);
     return system(cmd);
 }
 static int tmp_remove(void)
 {
     char cmd[100];
-    sprintf(cmd, "rm -f %s/*.csv", TMP_DIR);
+    sprintf(cmd, "rm -f %s/*.csv > /dev/null", TMP_DIR);
     return system(cmd);
 }
 static void send_check(void)
 {
     static int file_flag=0;
     static uint32_t send_cnt=0;
-
+ 
     send_cnt++;
     if(send_cnt%SEND_PERIOD==0) {
         struct tm *tm=get_curtime();
@@ -1287,7 +1284,7 @@ static void* polling_thread(void *arg)
 {
     thread_handle_t *h=(thread_handle_t*)arg;
 
-    //tmp_create();
+    tmp_create();
     while(h->quit==0) {
         mem_check();
         send_check();