1、修复230编译烧录失败或启动失败问题

2、修改cat1 at指令，nettest指令增加测试项参数
3、添加w9的modem 固件（替换fd230的rf.bin）

diff --git a/autobuild.sh b/autobuild.sh
index 4b31751..5a928a9 100755 (executable)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -31,10 +31,10 @@ version=HEAD
 DATE=$(date  +%Y%m%d_%H%M%S)
 HOMEDIR=$PWD
 DEFAULT_BUILD_TYPE=release
-DEFAULT_TARGET_PACK_NAME=pack_brandy_native_js
-DEFAULT_APPLICATION_NAME=brandy-native-js
-DEFAULT_RECOVERY_NAME=brandy-native-js-r
-DEFAULT_SSB_NAME=brandy-ssb
+DEFAULT_TARGET_PACK_NAME=pack_brandy_native_js_fd230
+DEFAULT_APPLICATION_NAME=brandy-native-js-fd230
+DEFAULT_RECOVERY_NAME=brandy-native-js-fd230-r
+DEFAULT_SSB_NAME=brandy-native-js-fd230-ssb
 DEFAULT_TARGET_PACK_NAME_USER=pack_brandy_native_js_user
 DEFAULT_APPLICATION_NAME_USER=brandy-native-js-user
 DEFAULT_CUSTOM_FW_VERSION=1.3.112
@@ -46,7 +46,7 @@ APPLICATION_NAME=$DEFAULT_APPLICATION_NAME
 RECOVERY_NAME=$DEFAULT_RECOVERY_NAME
 RELEASE_BUILD=$DEFAULT_BUILD_TYPE
 CLEAN=
-BUILD_NAME=
+BUILD_NAME=_FD230
 checkarguments()
 {
 if [ "$1" == "clean" ]
@@ -127,6 +127,8 @@ if [ "$1" == "fd230" ]
 then
 TARGET_PACK_NAME=pack_brandy_native_js_fd230
 APPLICATION_NAME=brandy-native-js-fd230
+RECOVERY_NAME=brandy-native-js-fd230-r
+DEFAULT_SSB_NAME=brandy-native-js-fd230-ssb
 BUILD_NAME=_FD230
 fi
 
@@ -273,4 +275,3 @@ fi
 read -n 1 -p "Press any key to continue..."
 
 build_target | tee $HOMEDIR/build.log
-

diff --git a/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip b/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip
new file mode 100644 (file)
index 0000000..235a072
--- /dev/null
+++ b/cat1modem/w9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20250226-2022_V18_W9.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d768ead69350b4da8efebf2ca1bd96c4ab7f004cec542d0600f17703659d3e6
+size 11624867

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index b3a09fe..cd25047 100755 (executable)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -527,7 +527,14 @@ target = {
                'fs_image_path':'fd230',
                'fs_image': True
     },
-
+    'brandy-native-js-fd230-r': {
+        'base_target_name': 'brandy-native-js-r',        
+        #自定义配置项，选择硬件及功能参数        
+    },
+    'brandy-native-js-fd230-ssb': {
+        'base_target_name': 'brandy-ssb',
+        #自定义配置项，选择硬件及功能参数        
+    },
     ################# w9 ############################
     'brandy-native-js-w9': {
         'base_target_name': 'brandy-native-js',
@@ -601,7 +608,7 @@ target_group = {
     'pack_brandy_native_js_cm_ai': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-cm-ai'],
     'pack_brandy_native_js_4part': ['brandy-ssb', 'brandy-native-js-r-4part', 'brandy-native-js-4part'],
     'pack_brandy_native_js_w9': ['brandy-native-js-w9-ssb', 'brandy-native-js-w9-r', 'brandy-native-js-w9'],
-    'pack_brandy_native_js_fd230': ['brandy-ssb', 'brandy-native-js-r', 'brandy-native-js-fd230'],
+    'pack_brandy_native_js_fd230': ['brandy-native-js-fd230-ssb', 'brandy-native-js-fd230-r', 'brandy-native-js-fd230'],
     'pack_brandy_xts': ['brandy-ssb', 'brandy-xts-r', 'brandy-xts'],
     'pack_brandy_native_js_oob128': ['brandy-ssb-oob128', 'brandy-native-js-r', 'brandy-native-js-oob128'],
     'brandy_all': ['brandy-ssb',

diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp
index 4f0220c..44b1d6e 100644 (file)
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp
@@ -58,7 +58,7 @@ static int ConvertCmdToParam(uint8_t *para, uint32_t paraLen,
     return PPG_SUCCESS;
 }
 
-
+extern void uapi_set4GCapability(bool isopen);
 static uint32_t cat1_power(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 {
     UNUSED(strCommonCmd);
@@ -82,9 +82,11 @@ static uint32_t cat1_power(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 
     if(enabled == 1)
     {
-        power_on_cat1();
+        // power_on_cat1();
+        uapi_set4GCapability(true);
     }else{
-        power_off_cat1();
+        // power_off_cat1();
+        uapi_set4GCapability(false);
     }
 
     return ERRCODE_SUCC;
@@ -165,14 +167,17 @@ static uint32_t at_cat1_getver(uint8_t *para, uint32_t paraLen, char *strCommonC
     return ERRCODE_SUCC;
 }
 
-extern void LwipTestEnter(void);
+extern void LwipTestEnter(char* testitem);
 
 static uint32_t cat1_nettest(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 {
-    UNUSED(strCommonCmd);
-    printf("CAT1TEST ATCMD  nettest  \n");
-    LwipTestEnter();
-
+    if (para==NULL || paraLen==0)
+    {
+        printf("CAT1TEST ATCMD  AT^CAT1NETTEST=[testitem]  \n testitem options: socket, udp, tcp, opt, order, inet, udpmore, tcpmore, tcpselect, tcppoll, netif, tcpdup, tcplong  \n");
+        return 0;
+    }
+    printf("CAT1TEST ATCMD  nettest  %s\n",(char*)para);
+    LwipTestEnter((char*)para);
     return ERRCODE_SUCC;
 }
 static uint32_t cat1_wakeup(uint8_t *para, uint32_t paraLen, char *strCommonCmd)

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt b/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
index 7972cee..421aa96 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
+++ b/code/sdk/open_source/openharmony/third_party/lwip/CMakeLists.txt
@@ -57,8 +57,8 @@ set(lwiptest_SRCS
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_006.c
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_007.c
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_008.c
-    # ${LWIP_ROOT_DIR}/port/test/net_socket_test_009.c
-    # ${LWIP_ROOT_DIR}/port/test/net_socket_test_010.c
+    ${LWIP_ROOT_DIR}/port/test/net_socket_test_009.c
+    ${LWIP_ROOT_DIR}/port/test/net_socket_test_010.c
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_011.c
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_012.c
     ${LWIP_ROOT_DIR}/port/test/net_socket_test_013.c

diff --git a/code/sdk/open_source/openharmony/third_party/lwip/port/test/test_main.c b/code/sdk/open_source/openharmony/third_party/lwip/port/test/test_main.c
index ad6ee11..88f6b32 100644 (file)
--- a/code/sdk/open_source/openharmony/third_party/lwip/port/test/test_main.c
+++ b/code/sdk/open_source/openharmony/third_party/lwip/port/test/test_main.c
@@ -73,20 +73,9 @@ extern void TcpTestLong();
 
 osTimerId_t g_lwipTestTimerId = NULL;
 
-// time out 1s
-static void LwipTestTimeoutCallback(void const *argument)
+static void lwip_run_testitem(int testcase)
 {
-    
-    g_lwipTimerCount++;
-    LogPrintln("LwipTestTimeoutCallback enter %d",g_lwipTimerCount);
-    if(g_lwipTimerCount > 130)
-    {
-           if (g_lwipTestTimerId != NULL) {
-                osTimerStop(g_lwipTestTimerId);
-           }
-           g_lwipTimerCount = 0;
-    }
-    switch (g_lwipTimerCount) {
+    switch (testcase) {
         case SOCKET_TEST:
             SocketTest();
             break;
@@ -112,10 +101,10 @@ static void LwipTestTimeoutCallback(void const *argument)
             TcpTestMore();
             break;
         case TCP_SELECT_TEST:
-            // TcpTestSelect();
+            TcpTestSelect();
             break;
         case TCP_POLL_TEST:
-            // TcpTestPoll();
+            TcpTestPoll();
             break;
         case NETIF_TEST:
             UdpTestNetif();
@@ -131,6 +120,22 @@ static void LwipTestTimeoutCallback(void const *argument)
     }
 }
 
+// time out 1s
+static void LwipTestTimeoutCallback(void const *argument)
+{
+    
+    g_lwipTimerCount++;
+    LogPrintln("LwipTestTimeoutCallback enter %d",g_lwipTimerCount);
+    if(g_lwipTimerCount > 130)
+    {
+           if (g_lwipTestTimerId != NULL) {
+                osTimerStop(g_lwipTestTimerId);
+           }
+           g_lwipTimerCount = 0;
+    }
+    lwip_run_testitem(g_lwipTimerCount);
+}
+
 
 void LwipTestStartTimer(uint32_t timeout)
 {
@@ -154,7 +159,69 @@ void LwipTestStartTimer(uint32_t timeout)
     }
 }
 
-void LwipTestEnter()
+void LwipTestEnter(char* testitem)
 {
-    LwipTestStartTimer(LWIP_TEST_TIMEOUT);
+
+    if(strcmp(testitem,"socket")==0)
+    {
+        lwip_run_testitem(SOCKET_TEST);
+    }
+    else if (strcmp(testitem,"udp")==0)
+    {
+        lwip_run_testitem(UDP_TEST);
+    }
+    else if (strcmp(testitem,"tcp")==0)
+    {
+        lwip_run_testitem(TCP_TEST);
+
+    }
+    else if (strcmp(testitem,"opt")==0)
+    {
+        lwip_run_testitem(OPT_TEST);
+
+    }
+    else if (strcmp(testitem,"order")==0)
+    {
+        lwip_run_testitem(ORDER_TEST);
+
+    }
+    else if (strcmp(testitem,"inet")==0)
+    {
+        lwip_run_testitem(INET_TEST);
+    }
+    else if (strcmp(testitem,"udpmore")==0)
+    {
+        lwip_run_testitem(UDP_MORE_TEST);
+
+    }
+    else if (strcmp(testitem,"tcpmore")==0)
+    {
+        lwip_run_testitem(TCP_MORE_TEST);
+
+    }
+    else if (strcmp(testitem,"tcpselect")==0)
+    {
+        lwip_run_testitem(TCP_SELECT_TEST);
+
+    }
+    else if (strcmp(testitem,"tcppoll")==0)
+    {
+        lwip_run_testitem(TCP_POLL_TEST);
+
+    }
+    else if (strcmp(testitem,"netif")==0)
+    {
+        lwip_run_testitem(NETIF_TEST);
+    }
+    else if (strcmp(testitem,"tcpdup")==0)
+    {
+        lwip_run_testitem(TCP_DUP_TEST);
+
+    }
+    else if (strcmp(testitem,"tcplong")==0)
+    {
+        lwip_run_testitem(TCP_LONG_TEST);
+
+    }
+    // LwipTestStartTimer(LWIP_TEST_TIMEOUT);
 }