T113S 加入看门狗！！！

pro/CMakeLists.txt

@@ -175,14 +175,14 @@ add_definitions(-DSHELL_CFG_USER="shell_cfg_user.h")
 add_definitions(-DCHIP_TYPE=1)
 
 
-set(STAGING_DIR "/home/liyi/tina/out/t113-bingpi_m2/staging_dir")
-set(COMPILING_DIR "/home/liyi/tina/out/t113-bingpi_m2/compile_dir")
+#set(STAGING_DIR "/home/liyi/tina/out/t113-bingpi_m2/staging_dir")
+#set(COMPILING_DIR "/home/liyi/tina/out/t113-bingpi_m2/compile_dir")
 
 include_directories (${PROJECT_SOURCE_DIR}/modbus/src
                      ${PROJECT_SOURCE_DIR}/ini
                      ${PROJECT_SOURCE_DIR}/logo
                      ${PROJECT_SOURCE_DIR}/sqlite/inc)
-include_directories (${STAGING_DIR}/target/usr/include)
+include_directories ($ENV{STAGING_DIR}/target/usr/include)
 
 include_directories (${PROJECT_SOURCE_DIR}/easylogger/os/inc)
 include_directories (${PROJECT_SOURCE_DIR}/easylogger/inc)
@@ -203,11 +203,11 @@ include_directories (${SYS_ROOT})
 link_directories(${PROJECT_SOURCE_DIR}/snmp/lib_ip)
 #link_directories(${PROJECT_SOURCE_DIR}/sqlite/lib_ip)
 #link_directories(${PROJECT_SOURCE_DIR}/modbus/lib)
-link_directories(${STAGING_DIR}/target/usr/lib)
-link_directories(${STAGING_DIR}/target/lib)
-link_directories(${COMPILING_DIR}/target/lib)
-link_directories(${COMPILING_DIR}/target/usr/lib)
-link_directories(${COMPILING_DIR}/target/usr/lib/arm-qt/lib)
+link_directories($ENV{STAGING_DIR}/target/usr/lib)
+link_directories($ENV{STAGING_DIR}/target/lib)
+link_directories($ENV{COMPILING_DIR}/target/lib)
+link_directories($ENV{COMPILING_DIR}/target/usr/lib)
+link_directories($ENV{COMPILING_DIR}/target/usr/lib/arm-qt/lib)
 add_definitions("-Wall -g")
 
 set(PDU_SRC_LIST

pro/config/cfg.h

@@ -12,7 +12,7 @@
 //#define PRJ_USASL_AC_I3_O1
 //#define PRJ_USASL_AC_I3_O3
 //#define PRJ_ITK_AC_I1_O1
-#define PRJ_ITK_AC_I3_O1
+//#define PRJ_ITK_AC_I3_O1
 //#define PRJ_STSC_I3_O3
 //#define PRJ_STSC_I3_O1_OLED
 //#define PRJ_LITECH_AC_I1_O1
@@ -28,7 +28,7 @@
 //#define PRJ_INST2302_DC_OLED
 //#define PRJ_INST2106_AC_I1_O1_OLED
 //#define PRJ_IP_AC_I3_O1
-//#define PRJ_IP_AC_I1_O1
+#define PRJ_IP_AC_I1_O1
 //#define USE_BOARD_UPGRADE
 
 #define USE_MAIL

pro/src/common.c

@@ -909,10 +909,10 @@ void SetMenuAuthority(int RoleID)
 #endif
         // 8、设备维护菜单
         _GlobalMenuAuthority.SbcqEnabled = true;
-#ifndef NOT_USE_CONTROL
-        _GlobalMenuAuthority.GjsjEnabled = true;
-#else
+#if (CHIP_TYPE == CHIP_T113s)
         _GlobalMenuAuthority.GjsjEnabled = false;
+#else
+        _GlobalMenuAuthority.GjsjEnabled = true;
 #endif
         _GlobalMenuAuthority.KzbsjEnabled = true;
         _GlobalMenuAuthority.HhccszEnabled = false;

pro/src/dflt.c

@@ -65,7 +65,11 @@ GlobalDeviceInfo DFLT_PARAS={
         },
 
         .misc = {
+        #if (CHIP_TYPE == CHIP_T113s)
+            .watchdog = 1,
+        #else
             .watchdog = 0,
+        #endif
         #ifdef FLIP_TIME
             .flip_time = FLIP_TIME,
         #else

pro/src/json_handle.c

@@ -780,7 +780,7 @@ char* user_routers_info_to_json(void)
     cJSON_AddStringToObject(children7_meta1_data1_filed,"link","");    
     cJSON_AddItemToObject(children7_data1_filed, "meta", children7_meta1_data1_filed);
     if(_GlobalMenuAuthority.SbcqEnabled)cJSON_AddItemToObject(children7_data_array, "children", children7_data1_filed);
-
+#if (CHIP_TYPE != CHIP_T113s)
     cJSON* children7_data2_filed = cJSON_CreateObject(); 
     cJSON_AddStringToObject(children7_data2_filed,"name","Gjsj");    
     cJSON_AddStringToObject(children7_data2_filed,"path","gjsj");  
@@ -793,6 +793,7 @@ char* user_routers_info_to_json(void)
     cJSON_AddStringToObject(children7_meta2_data1_filed,"link","");    
     cJSON_AddItemToObject(children7_data2_filed, "meta", children7_meta2_data1_filed);
     if(_GlobalMenuAuthority.GjsjEnabled)cJSON_AddItemToObject(children7_data_array, "children", children7_data2_filed);
+#endif
 
 #ifdef USE_BOARD_UPGRADE
     tmp = cJSON_CreateObject(); 

pro/src/sys.c

@@ -1341,7 +1341,7 @@ static int wdog_init(void)
             }
         }
 
-#if 0
+#if (CHIP_TYPE == CHIP_T113s)
         int i,option,timeout;
         struct watchdog_info info;
         
@@ -1355,7 +1355,7 @@ static int wdog_init(void)
         }
         printf("___ watchdog options: 0x%x\n", info.options&WDIOC_SETTIMEOUT);
 
-        timeout = 100;
+        timeout = 40;
         r = ioctl(wdog_fd, WDIOC_SETTIMEOUT, &timeout);
         if(r) {
             printf("______set__________ wdog set timeout: %d failed, errno: %d\n", timeout, errno);