Merge #2863 into sdk650pathc0423 from refs/changes/2863/head

Code review from snickersun@163.com

* refs/changes/2863/head: (3 commits squashed)

  - 增加产测模式打印

  - Merge branch 'sdk650pathc0423' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423

  - 最新EG800AK固件

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2863

diff --git a/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1022_LN_PY_SRV_V27_20251204-2047.zip b/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1022_LN_PY_SRV_V27_20251204-2047.zip
new file mode 100644 (file)
index 0000000..e9bfdb9
Binary files /dev/null and b/cat1modem/leiniao/EG800AKCN91LCR07A01M04_OCPU_QPY_BETA1022_LN_PY_SRV_V27_20251204-2047.zip differ

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index 07b9343..666688c 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -779,6 +779,13 @@ if ( cm_poweron_cat1_on_bootup_flag() )
     // if(!custom_get_factory_test_flag())
         // ppp_start_dial();
 // #endif
+#ifdef CUSTOM_UTILS
+if (custom_get_factory_test_flag() != 0 ) {
+    PRINT("FACTORY TEST MODE: ENABLED \n");
+} else {
+    PRINT("FACTORY TEST MODE: DISABLED \n");
+}
+#endif
 
 #endif
 

diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
index f283b8d..a1899e5 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
@@ -1,7 +1,7 @@
 
 // #include "custom_utils.h"
 
-
+#include <string.h>
 #include "at_cmd_api.h"
 #include "pm_control.h"
 #include "custom_utils.h"
@@ -1911,7 +1911,7 @@ static uint32_t custom_audio_test(uint8_t *para, uint32_t paraLen, char *strComm
     return ERRCODE_SUCC;
 }
 
-// 录音相关AT指令实现
+// 产测模式AT指令实现
 static uint32_t custom_enter_factory_test_mode(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
 {
     UNUSED(strCommonCmd);
@@ -1920,14 +1920,32 @@ static uint32_t custom_enter_factory_test_mode(uint8_t *para, uint32_t paraLen,
 
     int ret = ConvertCmdToParam(para, paraLen, argv, &argc);
     if (ret != CUSTOM_UTILS_SUCCESS) {
-        wstp_print("AUDIO TEST ATCMD Convert Command Failed\n");
+        wstp_print("FACTORY ATCMD Convert Command Failed\n");
         return ERRCODE_FAIL;
     }
 
+    // 查询模式：无参数或参数为"?"
+    if (argc == 0 || (argc == 1 && strcmp((char*)argv[0], "?") == 0)) {
+        // 获取产测模式标志
+        uint8_t factory_flag = custom_get_factory_test_flag();
+        
+        // 获取runtime中的产测状态
+        uint8_t factory_status = uapi_dev_runtime_get_factory_test_status_flag();
+        
+        if (factory_flag != 0 || factory_status != 0) {
+            wstp_print("FACTORY TEST MODE: ENABLED (flag=%d, status=%d)\n", factory_flag, factory_status);
+        } else {
+            wstp_print("FACTORY TEST MODE: DISABLED (flag=%d, status=%d)\n", factory_flag, factory_status);
+        }
+        
+        return ERRCODE_SUCC;
+    }
+
+    // 设置模式：需要参数
     if (argc != 1) {
-        wstp_print("AUDIO TEST ATCMD Set Parameter Failed argc %d\n", argc);
-        wstp_print("Usage: AT^AUDIOTEST=cmd\n");
-        wstp_print("  cmd: 1=start record, 2=stop record, 3=start play, 4=stop play\n");
+        wstp_print("FACTORY ATCMD Set Parameter Failed argc %d\n", argc);
+        wstp_print("Usage: AT^FACTORY=cmd  or  AT^FACTORY?\n");
+        wstp_print("  cmd: 0=restore factory, 1-255=set factory test flag\n");
         return ERRCODE_FAIL;
     }