1、修改报警不能导出的bug

2、修改控制板升级的bug
3、添加军工2302的配置

pro/CMakeLists.txt

@@ -73,8 +73,6 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/src/websocket_handle.c
 
 	${PROJECT_SOURCE_DIR}/src/io.c
-	${PROJECT_SOURCE_DIR}/src/lcd_app.c
-	${PROJECT_SOURCE_DIR}/src/lcd_drv.c
 	${PROJECT_SOURCE_DIR}/src/sensor_handle.c
 	${PROJECT_SOURCE_DIR}/src/cJSON.c
 	${PROJECT_SOURCE_DIR}/src/language_common.c

pro/config/cfg.h

@@ -25,6 +25,7 @@
 //#define PRJ_TEST_AC_I1_O1
 //#define PRJ_TEST_AC_I3_O1
 //#define PRJ_IP_AC_I3_O3
+//
 
 
 //#define USE_BOARD_UPGRADE
@@ -208,6 +209,17 @@
     #define PROD_POWER_TYPE                     3
 
     #define NOT_USE_CONTROL
+
+#elif defined PRJ_INST2302_DC_OLED
+    #define LANGUAGE                            0           //chinese
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0
+
+    #define PHASE_GROUP                         8
+    #define CHANNEL_DELAY                       8
+
+    #define PROD_POWER_TYPE                     1
 #else
     #error define a PRJ_XXXX please!
 #endif

pro/src/appweb_handle.c

@@ -5821,7 +5821,7 @@ static void controlBoardUpgradeUpload(void *conn)
             r = upg_board_file_check(path);
             if(r!=UPG_OK) {
                 ack_str = upg_chk_to_json(r);
-                http_reply(conn, 500, ack_str);
+                http_reply(conn, 200, ack_str);
                 cJSON_free(ack_str);
             }
             else {

pro/src/cascade.c

@@ -1899,7 +1899,7 @@ int cascade_init(void)
     NetworkInfo_t net = {0};
     //sys_get_net(&net,IP_V4);
     int family = AF_INET;
-    r = get_ipaddr(family, "eth0", net.ip_address, net.mask);
+    //r = get_ipaddr(family, "eth0", net.ip_address, net.mask);
 
     uint8_t addr = 0;
     if(!dm->_globalDevInfo.cascade.mode)

pro/src/common.h

@@ -253,15 +253,14 @@ enum {
 };
 
 enum {
-    LANG_ID_ENGLISH,
     LANG_ID_CHINESE,
+    LANG_ID_ENGLISH,
     LANG_ID_RUSSIA,
 
     LANG_ID_MAX
 };
 
 
-
 ///////////////////////////////////////////////////////////////////////////////////
 typedef struct {
     int             id;

pro/src/json_handle.c

@@ -1609,7 +1609,8 @@ char *upg_chk_to_json(int r)
 {
     char* str = NULL;
     int code=200;
-    cJSON* root = cJSON_CreateObject(); 
+    cJSON* root = cJSON_CreateObject();
+    int lang_id=__globalDeviceManage._globalDevInfo.product.language;
 
     if(r==UPG_OK) {
         return NULL;
@@ -1617,14 +1618,14 @@ char *upg_chk_to_json(int r)
 
     if(r>UPG_OK) {
         if(r==UPG_BUSYING) {
-            cJSON_AddStringToObject(root, "msg", "upgrading"); 
+            cJSON_AddStringToObject(root, "msg", language_upgrade_busying[lang_id]); 
         }
         else if(r==UPG_HDR_FAIL || r==UPG_MD5_FAIL) {
-            cJSON_AddStringToObject(root, "msg", "invalid file"); 
+            cJSON_AddStringToObject(root, "msg", language_upgrade_invalid[lang_id]); 
         }
     }
     else {
-        cJSON_AddStringToObject(root, "msg", "error");
+        cJSON_AddStringToObject(root, "msg", language_upgrade_error[lang_id]);
     }
     
     cJSON_AddNumberToObject(root, "code", 500);       

pro/src/language_common.c

@@ -710,3 +710,29 @@ const char language_Operation_Tips_Failed[LANGUAGE_TYPE][LANGUAGE_SIZE] =
     " "
 } ;
 
+
+const char language_upgrade_invalid[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "无效固件",
+    "Invalid firmware",
+    "Неправильное прошивка",
+    " "
+} ;
+
+const char language_upgrade_busying[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "升级中...",
+    "Upgrading...",
+    "Повышение...",
+    " "
+} ;
+
+const char language_upgrade_error[LANGUAGE_TYPE][LANGUAGE_SIZE] = 
+{
+    "升级出错",
+    "Upgrade error",
+    "Ошибка обновления",
+    " "
+} ;
+
+

pro/src/language_common.h

@@ -164,8 +164,10 @@ extern const char language_sensor_access[LANGUAGE_TYPE][LANGUAGE_SIZE];
 
 extern const char* language_sensor_name[LANGUAGE_TYPE][8];
 
-const char language_Operation_Tips_Success[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
-
-const char language_Operation_Tips_Failure[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_Operation_Tips_Success[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_Operation_Tips_Failure[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_upgrade_invalid[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_upgrade_busying[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_upgrade_error[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
 
 #endif

pro/src/paras.c

@@ -2471,7 +2471,7 @@ static int proc_power(char *path, int op, GlobalPowerManger *power)
     switch(op) {
         case PARAS_CHECK:
         {
-            if(ppower->product_ch_addr<=0) {
+            if(ppower->product_ch_addr<0) {
                 LOGE("___ check power, product_ch_addr %d is invalid, must greater than 0\n", ppower->product_ch_addr);
                 r = -1; 
             }
@@ -2762,7 +2762,7 @@ static int proc_power3(char *path, int op, GlobalTreeACManager *power)
     switch(op) {
         case PARAS_CHECK:
         {
-            if(ppower->product_ch_addr<=0) {
+            if(ppower->product_ch_addr<0) {
                 LOGE("___ check power, product_ch_addr %d is invalid, must greater than 0\n", ppower->product_ch_addr);
                 r = -1; 
             }

pro/src/sys.c

@@ -1515,7 +1515,6 @@ int sys_chmod(void)
 }
 
 
-
 int sys_init(void)
 {
     initLogger();

pro/src/upg.c

@@ -228,34 +228,35 @@ static int board_proc(upg_handle_t *h, int quit)
     board_send(mm, 0, fbuf.buf, fbuf.dlen);
     while(1) {
         r = xlist_get_node(l, &ln, 0);
-        if(r==0) {
-            tmp = (board_info_t*)ln->data.buf;
-            for(i=0; i<RETRY_MAX; i++) {
-                r = board_get_info(mm, tmp->addr, &swinfo);
-                if(r==0) {
-                    break;
-                }
-                LOGE("___ board upgrade failed, retry %d\n", i+1);
-                board_send(mm, i, fbuf.buf, fbuf.dlen);
-            }
+        if(r) {
+            break;
+        }
 
-            if(r) {
-                tmp->status = UPGRADE_FAIL;
-                err++;
-            }
-            else {
-                sw_to_info(tmp->addr, tmp, &swinfo, UPGRADE_OK);
-                ok++;
+        tmp = (board_info_t*)ln->data.buf;
+        for(i=0; i<RETRY_MAX; i++) {
+            r = board_get_info(mm, tmp->addr, &swinfo);
+            if(r==0) {
+                break;
             }
-            board_info_set(tmp);
-            xlist_remove(l, 0);
+            LOGE("___ board upgrade failed, retry %d\n", i+1);
+            board_send(mm, i, fbuf.buf, fbuf.dlen);
         }
+
+        if(r) {
+            tmp->status = UPGRADE_FAIL;
+            err++;
+        }
+        else {
+            sw_to_info(tmp->addr, tmp, &swinfo, UPGRADE_OK);
+            ok++;
+        }
+        board_info_set(tmp);
+        
+        xlist_remove(l, 0);
     }
     free(fbuf.buf);
 
-    if(ok>0) {
-        exit(0);        //restart app
-    }
+    exit(0);        //restart app
 
     return 0;
 }
@@ -542,7 +543,7 @@ static int md5_check(buf_t *fb)
 
 int upg_board_file_check(char *path)
 {
-    int r;
+    int r=UPG_OK;
     buf_t fb;
     upg_handle_t *h=&uHandle;
 
@@ -558,15 +559,16 @@ int upg_board_file_check(char *path)
     fw_hdr_t *fh=(fw_hdr_t*)fb.buf;
     if(memcmp(fh->hdr.magic,FW_HEAD_MAGIC,sizeof(FW_HEAD_MAGIC))) {
         LOGE("not found %s, invalid board firmware\n", FW_HEAD_MAGIC);
-        return UPG_HDR_FAIL;
+        r = UPG_HDR_FAIL;
     }
 
     if(md5_check(&fb)) {
-        return UPG_MD5_FAIL;
+        LOGE("md5 check failed, invalid board firmware\n");
+        r = UPG_MD5_FAIL;
     }
     free(fb.buf);
 
-    return UPG_OK;
+    return r;
 }
 
 int upg_host_file_check(char *path)

pub

@@ -19,6 +19,7 @@
 PRJS="PRJ_TEST"
 #PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_TEST_AC_I3_O1"
+#PRJS="PRJ_INST2302_DC_OLED"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -63,7 +64,7 @@ function do_copy()
     
     if [ "$1" = "PRJ_IP_AC_I3_O3" ];then
         rootdir=$curdir/output/t113s/pack_dir
-	appdir=$rootdir/mnt/UDISK/app
+        appdir=$rootdir/mnt/UDISK/app
     fi
     
     mkdir -p $appdir/image
@@ -125,7 +126,7 @@ function do_copy()
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_SG_I3_O3" ]; then
         name=ac_in2_out1_sg24016
-    	cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_TEST" ]; then
         name=ac_in3_out1_test
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
@@ -141,6 +142,10 @@ function do_copy()
     elif [ "$1" = "PRJ_IP_AC_I3_O3" ];then
         name=ac_in3_out3_ip
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+    elif [ "$1" = "PRJ_INST2302_DC_OLED" ];then
+        name=dc_in_dc_out_oled
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+        cp -f $custdir/qt/Qt_Test_oled $appdir/Qt_Test
     else
         echo error! $RPJ not define!!!
         exit 1