处理断电重启表头无法获取IPbug

output/t113i/pack_dir/root/run/app/dbg

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-ip=192.168.1.132
-if [ -n "$1" ]; then
-    ip=$1
-fi
-
-echo ___debug on $ip
-gdbserver  $ip:1234 /root/run/app/smartPDU

pro/config/cfg.h

@@ -37,7 +37,7 @@
 //#define PRJ_INST2106_AC_I1_O1_OLED
 //#define PRJ_YST_AC_I1_O1
 //#define PRJ_YUNNAN_AC_I1_O1
-//#define PRJ_BYD_UPS_AC_I1_O1
+#define PRJ_BYD_UPS_AC_I1_O1
 //#define PRJ_DUALWIRES_AC_I3_O2
 //#define PRJ_2405_AC_I1_O1_OLED
 //#define PRJ_2503_AC_I1_O1_OLED
@@ -56,7 +56,7 @@
 //#define PRJ_IP_GOX001_4_AC_I3_O1
 
 //#define PRJ_IP_GANGKEDA_AC_I3_O1
-#define PRJ_709_AC_I3_O1_OLED
+//#define PRJ_709_AC_I3_O1_OLED
 
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
@@ -462,7 +462,7 @@
     #define USE_BEEP                            1
     #define USE_LED                             1
 
-    #define BRD_MAX                             10
+    #define BRD_MAX                             10                
 
     #define SENSOR_ACCESS_NONE
 
@@ -598,8 +598,8 @@
 
     #define USE_BEEP                            1
     #define USE_LED                             1
-
-    #define BRD_MAX                             5
+    #define SENSOR_ACCESS_NONE
+    #define BRD_MAX                             2
 
 #elif defined PRJ_DUALWIRES_AC_I3_O2
     #define LANGUAGE                            0           //chinese

pro/src/app.c

@@ -3474,8 +3474,9 @@ int app_init(void)
         return -1 ;
     }
     log_i("database %s open ok.\n", path);
-    
+#if (CHIP_TYPE == CHIP_T113i)
     radius_init();
+#endif
 #if 1
     if(_globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_AC ||
         _globalDeviceManager->_globalDevInfo.product.pwr_type == SmartPDU_DC)       // single AC

pro/src/appweb_handle.c

@@ -102,7 +102,12 @@ static char* g_product_board_cpu[] = {
     "xxx",
     "T113"
 };
- 
+
+
+
+#define RADIUS_TOOL  "/root/run/app/radius/radlogin"
+
+#define LDAP_TOOL    "/root/run/app/ldap/ldapwhoami"
 
 static web_handle_t webHandle;
 static int webSetCallback(void);
@@ -698,17 +703,18 @@ static void loginFunc(void* conn)
     if(ret) 
     {
         //database is not menber you need auth
+#if (CHIP_TYPE == CHIP_T113i)
         if(__globalDeviceManage._globalDevInfo.misc.radius)
         {
             char temp[256] = {0};
-            sprintf(temp,"radlogin -f /etc/radiusclient/radiusclient.conf -u %s -p %s",_newUserLogin->user_name,_newUserLogin->user_password);
+            sprintf(temp,"%s -f /etc/radiusclient/radiusclient.conf -u %s -p %s",RADIUS_TOOL,_newUserLogin->user_name,_newUserLogin->user_password);
             ret = system(temp);
             if(ret)
             {
                 if(__globalDeviceManage._globalDevInfo.ldap.ldap)
                 {
                     memset(temp,0,sizeof(temp));
-                    sprintf(temp,"ldapwhoami -x -D \"%s\" -H ldap://%s -w %s",_newUserLogin->user_name,__globalDeviceManage._globalDevInfo.ldap.ldip_server,_newUserLogin->user_password);
+                    sprintf(temp,"%s -x -D \"%s\" -H ldap://%s -w %s",LDAP_TOOL,_newUserLogin->user_name,__globalDeviceManage._globalDevInfo.ldap.ldip_server,_newUserLogin->user_password);
                     ret = system(temp);
                     if(ret)
                     {
@@ -801,7 +807,7 @@ static void loginFunc(void* conn)
         {
             char temp[256] = {0};
             memset(temp,0,sizeof(temp));
-            sprintf(temp,"ldapwhoami -x -D \"%s\" -H ldap://%s -w %s",_newUserLogin->user_name,__globalDeviceManage._globalDevInfo.ldap.ldip_server,_newUserLogin->user_password);
+            sprintf(temp,"%s -x -D \"%s\" -H ldap://%s -w %s",LDAP_TOOL,_newUserLogin->user_name,__globalDeviceManage._globalDevInfo.ldap.ldip_server,_newUserLogin->user_password);
             ret = system(temp);
             if(ret)
             {
@@ -848,6 +854,7 @@ static void loginFunc(void* conn)
             }
 
         }else
+#endif
         {
             UserInfo *node;
             UserInfo *next;

pro/src/breaker_detection.c

@@ -136,6 +136,11 @@ int breaker_485_get_all_chn_status(void* manger,int saddr,unsigned short *status
     int ret = 0 ;
     unsigned short data_temp[6] = {0};
     ret = g_modbus_read_x_reg(manger,saddr,BREADER_485_ADDR_CHN_REG+1,BREAKER_485_CHN_MAX,data_temp);
+    if(ret <= 0)
+    {
+        usleep(10000);
+        ret = g_modbus_read_x_reg(manger,saddr,BREADER_485_ADDR_CHN_REG+1,BREAKER_485_CHN_MAX,data_temp);
+    }
     for(int i =0;i < BREAKER_485_CHN_MAX;i++)
     {
         if(data_temp[i])

pro/src/common.c

@@ -963,8 +963,8 @@ void SetMenuAuthority(int RoleID)
         _GlobalMenuAuthority.GysbEnabled = true;
         _GlobalMenuAuthority.BroadcastEnable = true;
 #if (CHIP_TYPE == CHIP_T113i)
-        _GlobalMenuAuthority.RadiusEnabled = true;
-        _GlobalMenuAuthority.LdapEnabled = true;
+        _GlobalMenuAuthority.RadiusEnabled = false;
+        _GlobalMenuAuthority.LdapEnabled = false;
 #endif
     }
     // 管理员

pub

@@ -33,7 +33,7 @@
 #PRJS="PRJ_2503_AC_I1_O1_OLED"
 #PRJS="PRJ_CHANGCHUN_AC_I1_O1_OLED"
 #PRJS="PRJ_TIDA_AC_I3_O1"
-#PRJS="PRJ_BYD_UPS_AC_I1_O1"
+PRJS="PRJ_BYD_UPS_AC_I1_O1"
 #PRJS="PRJ_JUNGONG_KEKONG_AC_I1_O1_OLED"
 #PRJS="PRJ_INSPUR_AC_I1_O1"
 
@@ -57,7 +57,7 @@
 #PRJS="PRJ_IP_GANGKEDA_AC_I3_O1"
 
 
-PRJS="PRJ_709_AC_I3_O1_OLED"
+#PRJS="PRJ_709_AC_I3_O1_OLED"
 
 
 fulldir=$(realpath $0)