From 9e334e88f1d1d7aeb89f38ff72f4ae3dca078762 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 16 三月 2025 16:58:50 +0800
Subject: [PATCH] 外包开发完ntrip，支持shell配置ID，测试ID正常，ntrip正常
---
keil/include/main/main.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 4f5e77a..94b17c8 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -386,7 +386,7 @@
RTCMMODE_TCP,
RTCMMODE_NTRIP,
*/
- g_com_map[RTCMMODE_INDEX] = RTCMMODE_TCP;
+ g_com_map[RTCMMODE_INDEX] = RTCMMODE_NTRIP;
snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
@@ -487,11 +487,12 @@
{
kai_4g_flag=1;
// PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
- Shell_Init();
+ //Shell_Init();
}
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{TCPClient_Poll_1();}
- HIDO_InputPoll();
+ //HIDO_InputPoll();
+ DBG_Poll();
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
@@ -568,6 +569,7 @@
uart_close(UART_ID1);//解绑原来串口1
uart_close(UART_ID0);//解绑原来串口0
}
+
uint8_t flag_4guart_needinit=0;
uint8_t index1,index2,index3;
int16_t Voltage_input;
@@ -601,7 +603,9 @@
calib_chip();
wdt_close(WDT_ID0);
Uart_Register(UART_ID_4G, UART_ID0);
-// Uart_Register(UART_ID_DBG, UART_ID1);
+ Uart_Register(UART_ID_DBG_GPS, UART_ID1);
+ DBG_Init();
+
Program_Init();
Internet_Init();
TCPClient_Init();
@@ -629,7 +633,6 @@
pca_input_detection_init(pca_handler);//pca检测输入
Uwb_init();
OpenUWB();
- DBG_Init();
// DBG_SetMode(DBG_MODE_SHELL);
// Shell_Init();
--
Gitblit v1.9.3