解决ppp 串口测试的编译问题

diff --git a/code/sdk/zhihui/ppp/include/ppp_config.h b/code/sdk/zhihui/ppp/include/ppp_config.h
index 3a92b02..3ece8b9 100644 (file)
--- a/code/sdk/zhihui/ppp/include/ppp_config.h
+++ b/code/sdk/zhihui/ppp/include/ppp_config.h
@@ -53,10 +53,8 @@ extern "C" {
 #ifndef PPP_USE_INTERRUPT_MODE
 #define PPP_USE_INTERRUPT_MODE      1                  // 1=中断模式(UART中断接收), 0=轮询模式(线程轮询)
 #endif
-
-#ifndef PPP_DO_SERIAL_TEST
+//测试串口读取能力，注意不要注释掉，只用1和0 开启关闭即可。否则可能影响编译
 #define PPP_DO_SERIAL_TEST          0                   // 1=进行串口读取能力测试, 0=不进行串口读取能力测试
-#endif
 
 
 /* PPP性能优化配置 - 解决接收阻塞问题 */

diff --git a/code/sdk/zhihui/ppp/src/ppp_api.c b/code/sdk/zhihui/ppp/src/ppp_api.c
index 811d88c..abfbe7a 100644 (file)
--- a/code/sdk/zhihui/ppp/src/ppp_api.c
+++ b/code/sdk/zhihui/ppp/src/ppp_api.c
@@ -143,7 +143,7 @@ errcode_t zhihui_ppp_init(const ppp_config_t *config)
     memcpy_s(&g_ppp_config, sizeof(ppp_config_t), config, sizeof(ppp_config_t));
 
     // PPP_DO_SERIAL_TEST 不进行电源初始化, 用于调试串口读取能力测试。
-    #ifndef PPP_DO_SERIAL_TEST
+    #if PPP_DO_SERIAL_TEST
     ppp_api_power_init();
     #endif
 
@@ -171,7 +171,7 @@ errcode_t zhihui_ppp_init(const ppp_config_t *config)
     }
 
 
-    #ifndef PPP_DO_SERIAL_TEST
+    #if PPP_DO_SERIAL_TEST
 
     // 初始化AT命令处理器
     ret = ppp_at_handler_init(SIO_UART_BUS, g_ppp_config.baudrate, true);
@@ -213,7 +213,7 @@ errcode_t zhihui_ppp_init(const ppp_config_t *config)
     // 打开4G电源
     ppp_api_power_control(true);
 
-#ifndef PPP_DO_SERIAL_TEST
+#if PPP_DO_SERIAL_TEST
     PPP_DEBUG_PRINT("Waiting for modem stabilization after power control...\n");
     // 等待5秒让调制解调器完全稳定
     osal_msleep(5000);

diff --git a/code/sdk/zhihui/ppp/src/ppp_at_handler.c b/code/sdk/zhihui/ppp/src/ppp_at_handler.c
index aa6c56f..dd1443c 100644 (file)
--- a/code/sdk/zhihui/ppp/src/ppp_at_handler.c
+++ b/code/sdk/zhihui/ppp/src/ppp_at_handler.c
@@ -280,7 +280,7 @@ ppp_error_t ppp_at_set_baudrate(uint32_t baudrate)
         PPP_DEBUG_ERROR("Unsupported baudrate: %u", baudrate);
         return PPP_ERR_INVALID_PARAM;
     }
-#ifndef PPP_DO_SERIAL_TEST
+#if PPP_DO_SERIAL_TEST
 
     /* 先查询当前modem波特率 */
     uint32_t current_modem_baudrate = ppp_query_current_modem_baudrate();

diff --git a/code/sdk/zhihui/ppp/src/ppp_interrupt.c b/code/sdk/zhihui/ppp/src/ppp_interrupt.c
index d19877d..856f916 100644 (file)
--- a/code/sdk/zhihui/ppp/src/ppp_interrupt.c
+++ b/code/sdk/zhihui/ppp/src/ppp_interrupt.c
@@ -172,7 +172,7 @@ static void ppp_irq_process_thread(void *arg)
         }
         PPP_DEBUG_PRINT("\n");
         
-#ifndef PPP_DO_SERIAL_TEST
+#if PPP_DO_SERIAL_TEST
         // 获取PPP控制块
         ppp_pcb *ppp_pcb_ptr = ppp_lwip_get_pcb();
         if (!ppp_pcb_ptr || !ppp_lwip_is_initialized()) {

diff --git a/code/sdk/zhihui/ppp/src/ppp_lwip_thread.c b/code/sdk/zhihui/ppp/src/ppp_lwip_thread.c
index df32dca..ac05f00 100644 (file)
--- a/code/sdk/zhihui/ppp/src/ppp_lwip_thread.c
+++ b/code/sdk/zhihui/ppp/src/ppp_lwip_thread.c
@@ -269,7 +269,7 @@ static void ppp_lwip_process_thread(void *arg)
         }
         PPP_DEBUG_PRINT("\n");
         
-#ifndef PPP_DO_SERIAL_TEST
+#if PPP_DO_SERIAL_TEST
         // 获取PPP控制块
         ppp_pcb *ppp_pcb_ptr = ppp_lwip_get_pcb();
         if (!ppp_pcb_ptr || !ppp_lwip_is_initialized()) {