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

云南中配4G启动死机bug。

liyi 1 год назад
Родитель
Сommit
50b97b0d6e
4 измененных файлов с 10 добавлено и 8 удалено
  1. 2 2
      pro/config/cfg.h
  2. 2 1
      pro/src/Cellular.c
  3. 2 2
      pro/src/app.c
  4. 4 3
      pub

+ 2 - 2
pro/config/cfg.h

@@ -30,11 +30,11 @@
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_INST2302_DC_OLED
 //#define PRJ_INST2106_AC_I1_O1_OLED
-#define PRJ_YST_AC_I1_O1
+//#define PRJ_YST_AC_I1_O1
 
 //#define PRJ_IP_AC_I3_O1
 //#define PRJ_IP_AC_I1_O1
-//#define PRJ_IP_YUNNAN_AC_I1_O1
+#define PRJ_IP_YUNNAN_AC_I1_O1
 
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN

+ 2 - 1
pro/src/Cellular.c

@@ -552,7 +552,8 @@ static int port_wait(cell_handle_t *h, int timeout)
 
     tv.tv_sec = timeout/1000;
 	tv.tv_usec = (timeout%1000)*1000;
-
+    if(h->fd < 0)
+        return -1;
     FD_ZERO(&fset); FD_SET(h->fd, &fset);
     r = select(h->fd + 1, &fset, NULL, NULL, &tv);
     if (r<=0) {

+ 2 - 2
pro/src/app.c

@@ -3129,7 +3129,7 @@ int app_init(void)
         log_d("get breaker info ok.");
 
     _globalDeviceManager->dev_samp_flag = true;
-
+    cellular_init();
     thread_start(THREAD_ID_POWER,  power_thread,  _globalDeviceManager);
     thread_start(THREAD_ID_SENSOR, sensor_thread, _globalDeviceManager);
 
@@ -3158,7 +3158,7 @@ int app_init(void)
     websocket_init();
     appweb_init();
 
-    cellular_init();
+
 #if (CHIP_TYPE != CHIP_T113s)
     wifi_init();
 #endif

+ 4 - 3
pub

@@ -1,4 +1,3 @@
-export PATH=$PATH:/home/tronlong/T113/T113-i_v1.0/out/t113_i/tlt113-evm-emmc/longan/buildroot/host/bin
 #PRJS="PRJ_XIAN_AC_I1_O1_P4"
 #PRJS="PRJ_XIAN_AC_I1_O1_P8"
 #PRJS="PRJ_ITK_AC_I1_O1"
@@ -24,7 +23,7 @@ export PATH=$PATH:/home/tronlong/T113/T113-i_v1.0/out/t113_i/tlt113-evm-emmc/lon
 #PRJS="PRJ_TEST_AC_I3_O3"
 #PRJS="PRJ_INST2302_DC_OLED"
 #PRJS="PRJ_INST2106_AC_I1_O1_OLED"
-PRJS="PRJ_YST_AC_I1_O1"
+#PRJS="PRJ_YST_AC_I1_O1"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -36,7 +35,7 @@ PRJS="PRJ_YST_AC_I1_O1"
 #PRJS="PRJ_IP_AC_I3_O3"
 #PRJS="PRJ_IP_AC_I3_O1"
 #PRJS="PRJ_IP_AC_I1_O1"
-#PRJS="PRJ_IP_YUNNAN_AC_I1_O1"
+PRJS="PRJ_IP_YUNNAN_AC_I1_O1"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -168,6 +167,8 @@ function do_copy()
         name=ip_ac_in3_out1_release
     elif [ "$1" = "PRJ_IP_AC_I1_O1" ];then  
         name=ip_ac_in1_out1_release
+    elif [ "$1" = "PRJ_IP_YUNNAN_AC_I1_O1" ];then
+        name=ip_ac_yunnan_in1_out1_release
     else
         echo error! $RPJ not define!!!
         exit 1