Просмотр исходного кода

1、默认开启看门狗
2、增加手动停止的脚本x

guohui 1 год назад
Родитель
Сommit
8877c0adeb

+ 4 - 0
output/t113i/pack_dir/root/run/app/x

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+killall smartPDU smartMonitor.sh
+echo V > /dev/watchdog

+ 4 - 0
output/t113s/pack_dir/mnt/UDISK/app/x

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+killall smartPDU smartMonitor.sh
+echo V > /dev/watchdog

+ 2 - 6
pro/config/cfg.h

@@ -26,7 +26,7 @@
 //#define PRJ_TEST_AC_I3_O1
 //#define PRJ_IP_AC_I3_O3
 
-//#define USE_WDOG
+#define USE_WDOG
 //#define USE_BOARD_UPGRADE
 
 #define USE_MAIL
@@ -178,9 +178,6 @@
 
     #define PROD_POWER_TYPE                     5
 
-    #define CONFIG_XPORT
-    #define LOG_SEND_MAIL
-
 #elif defined PRJ_TEST_AC_I1_O1
     #define LANGUAGE                            0           //chinese
     #define SMPLE_TIME                          30          //ms
@@ -210,8 +207,7 @@
     #define PHASE_GROUP                         8
     #define CHANNEL_DELAY                       8
     #define PROD_POWER_TYPE                     3
-    #define CONFIG_XPORT
-    #define LOG_SEND_MAIL
+
     #define NOT_USE_CONTROL
 #else
     #error define a PRJ_XXXX please!

+ 0 - 2
pro/src/appweb_handle.c

@@ -262,7 +262,6 @@ static int file_io(void *conn, int ftype, int io, char *buf)
         }
         break;
 
-#ifdef CONFIG_XPORT
         case FILE_SERV_CFG:
         {
             sprintf(path, "/tmp/service.ini");
@@ -327,7 +326,6 @@ static int file_io(void *conn, int ftype, int io, char *buf)
             }
         }
         break;
-#endif
 
         case FILE_POWER_ALL:
         case FILE_POWER_CHN:

+ 3 - 2
pro/src/sys.c

@@ -1344,8 +1344,9 @@ static int wdog_feed(void)
 
     //r = ioctl(wdog_fd, WDIOC_SETTIMEOUT, &t1);
     //printf("______set__________ wdog timeout: %d, errno: %d\n", r, errno);
-    r = ioctl(wdog_fd, WDIOC_GETTIMEOUT, &t2);
-    printf("________________ wdog timeout: %d\n", t2);
+    
+    //r = ioctl(wdog_fd, WDIOC_GETTIMEOUT, &t2);
+    //printf("________________ wdog timeout: %d\n", t2);
 #endif
     return r;
 }