1、确认看门狗超时时间只能设置在16秒以内，最大16秒

2、微调打包脚本

pro/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required (VERSION 2.8)
 
 set(CHIP t113i)
+#set(CHIP t113s)
+
 
 if(${CHIP} STREQUAL "t113i" )
 
@@ -130,12 +132,12 @@ add_executable(smartUPG ${UPG_SRC_LIST})
 target_link_libraries(smartUPG -lc -lpthread)
 
 add_custom_command(TARGET smartUPG  POST_BUILD
-                   COMMAND mkdir -p ${DST_DIR}/${CHIP}/usr/sbin
-                   COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/usr/sbin)
+                   COMMAND mkdir -p ${DST_DIR}/${CHIP}/pack_dir/usr/sbin
+                   COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/pack_dir/usr/sbin)
 
 add_custom_command(TARGET  smartPDU  POST_BUILD
-                   COMMAND mkdir -p ${DST_DIR}/${CHIP}/root/run/app
-                   COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/root/run/app)
+                   COMMAND mkdir -p ${DST_DIR}/${CHIP}/pack_dir/root/run/app
+                   COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/pack_dir/root/run/app)
 
 
 
@@ -273,11 +275,11 @@ set(PDU_SRC_LIST
 	add_executable(smartUPG ${UPG_SRC_LIST})
 	target_link_libraries(smartUPG -lc -lpthread)
 	add_custom_command(TARGET smartUPG  POST_BUILD
-	COMMAND mkdir -p ${DST_DIR}/${CHIP}/root/usr/sbin
-	COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/root/usr/sbin)
+	COMMAND mkdir -p ${DST_DIR}/${CHIP}/pack_dir/usr/sbin
+	COMMAND cp -upf  ${SRC_DIR}/smartUPG ${DST_DIR}/${CHIP}/pack_dir/usr/sbin)
 
 	add_custom_command(TARGET  smartPDU  POST_BUILD
-	COMMAND mkdir -p ${DST_DIR}/${CHIP}/root/mnt/UDISK/app
-	COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/root/mnt/UDISK/app)
+	COMMAND mkdir -p ${DST_DIR}/${CHIP}/pack_dir/mnt/UDISK/app
+	COMMAND cp -upf  ${SRC_DIR}/smartPDU ${DST_DIR}/${CHIP}/pack_dir/mnt/UDISK/app)
 
 endif()

pro/src/sys.c

@@ -1288,8 +1288,6 @@ static int wdog_init(void)
 
 #ifdef USE_WDOG
     char *path="/dev/watchdog";
-    struct watchdog_info info;
-    int option = WDIOS_DISABLECARD;
 
     if(wdog_fd<0) {
         wdog_fd = open(path, O_RDWR);   //O_WRONLY
@@ -1300,6 +1298,10 @@ static int wdog_init(void)
     }
 
 #if 0
+    int i,option,timeout;
+    struct watchdog_info info;
+    
+    option = WDIOS_DISABLECARD;
     r = ioctl(wdog_fd, WDIOC_SETOPTIONS, &option);
 
     r = ioctl(wdog_fd, WDIOC_GETSUPPORT, &info);
@@ -1309,7 +1311,11 @@ static int wdog_init(void)
     }
     printf("___ watchdog options: 0x%x\n", info.options&WDIOC_SETTIMEOUT);
 
+    timeout = 100;
     r = ioctl(wdog_fd, WDIOC_SETTIMEOUT, &timeout);
+    if(r) {
+        printf("______set__________ wdog set timeout: %d failed, errno: %d\n", timeout, errno);
+    }
 
     option = WDIOS_ENABLECARD;
     r = ioctl(wdog_fd, WDIOC_SETOPTIONS, &option);
@@ -1331,15 +1337,15 @@ static int wdog_enable(int en)
 }
 static int wdog_feed(void)
 {
-    int r=0,t1=100,t2=0;
+    int r=0,t1=200,t2=0;
 
 #ifdef USE_WDOG
-    r = ioctl(wdog_fd, WDIOC_KEEPALIVE, NULL);
+    r = ioctl(wdog_fd, WDIOC_KEEPALIVE, 0);
 
     //r = ioctl(wdog_fd, WDIOC_SETTIMEOUT, &t1);
-    //printf("______set__________ wdog timeout: %d\n", r);
-    //r = ioctl(wdog_fd, WDIOC_GETTIMEOUT, &t2);
-    //printf("________________ wdog timeout: %d\n", t2);
+    //printf("______set__________ wdog timeout: %d, errno: %d\n", r, errno);
+    r = ioctl(wdog_fd, WDIOC_GETTIMEOUT, &t2);
+    printf("________________ wdog timeout: %d\n", t2);
 #endif
     return r;
 }

pub

@@ -81,7 +81,6 @@ function do_copy()
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_ITK_AC_I1_O1" ]; then
         name=ac_in1_out1_russia_itk
-
         cp -f $custdir/db/pdu_dat_itk.db $appdir/pdu_dat.db
         cp -f $custdir/logo/logo_itk.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_ITK_AC_I3_O1" ]; then
@@ -173,7 +172,6 @@ function do_pack()
     echo do_pack ...
     if [ "$1" = "PRJ_IP_AC_I3_O3" ];then
         $curdir/output/t113s/pack.sh
-    
     else
         $curdir/output/t113i/pack.sh
     fi
@@ -190,14 +188,12 @@ function do_zip()
         files="push.bat pdutar tools/*"
         cd $zdir; zip -q $zname.zip $files
         mv $zname.zip $curdir/output/t113s/
-
     else
         zname="upgrade_"$ztm"_$name"
         zdir=$curdir/output/t113i/push
         files="push.bat pdutar tools/*"
         cd $zdir; zip -q $zname.zip $files
         mv $zname.zip $curdir/output/t113i/
-
     fi
 }