From 4c16cf5693d5df801fe4b54c52d945db2aa55b0e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 21 三月 2025 10:00:48 +0800
Subject: [PATCH] 修改4g打印乱码的错误问题
---
keil/include/main/main.c | 66 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 4f5e77a..7ced589 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -370,31 +370,31 @@
// g_com_map[IP_3]=6;
// g_com_map[PORT]=6666;
- g_com_map[IP_0]=117;
- g_com_map[IP_1]=72;
- g_com_map[IP_2]=111;
- g_com_map[IP_3]=237;
- g_com_map[PORT]=7000;
-
- g_com_map[TCP_IP_0]=111;
- g_com_map[TCP_IP_1]=198;
- g_com_map[TCP_IP_2]=60;
- g_com_map[TCP_IP_3]=6;
- g_com_map[TCP_PORT]=1234;
+// g_com_map[IP_0]=117;
+// g_com_map[IP_1]=72;
+// g_com_map[IP_2]=111;
+// g_com_map[IP_3]=237;
+// g_com_map[PORT]=7000;
+//
+// g_com_map[TCP_IP_0]=111;
+// g_com_map[TCP_IP_1]=198;
+// g_com_map[TCP_IP_2]=60;
+// g_com_map[TCP_IP_3]=6;
+// g_com_map[TCP_PORT]=1234;
/*
RTCMMODE_NONE,
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");
- g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
-// snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
- snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
- snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
- snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");
+// snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
+// g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
+//// snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
+// snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
+// snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
+// snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");
if(g_com_map[BIND_DEV_ID]==0)
@@ -434,13 +434,13 @@
{
LOG_INFO(TRACE_MODULE_APP,"单点定位模式模式. \r\n");
}
+ delay_ms(500);
}
uint32_t adctick = 0;
uint8_t only_one_flag;
uint16_t chongman_time;
uint8_t bat_percent_old=100;
uint8_t input5vflag;
-uint8_t kai_4g_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -483,15 +483,10 @@
}
if(DBG_GetMode() == DBG_MODE_SHELL)
{
- if(kai_4g_flag==0)
- {
- kai_4g_flag=1;
-// PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
- 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();
@@ -506,6 +501,12 @@
if(DBG_GetMode() == DBG_MODE_SHELL)
{
Set4LEDColor(uwbled,rtkled,led4g,powerled);
+ if(g_com_map[CNT_RESTART]==1)
+ {
+ g_com_map[CNT_RESTART]=0;
+ save_com_map_to_flash();
+ NVIC_SystemReset();
+ }
}
else
{
@@ -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();
@@ -656,13 +659,6 @@
TCPClient_Poll();
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{TCPClient_Poll_1();}
-// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP&&gps_ntripsend==2)
-// {
-// gps_ntripsend=0;
-// NTRIPApp_ReportGGA(YUANGPS_ParseGGA_data, YUANGPS_ParseGGA_changdu);
-// memset(YUANGPS_ParseGGA_data,0,YUANGPS_ParseGGA_changdu);
-// YUANGPS_ParseGGA_changdu=0;
-// }
if(flag_secondtask)
{
flag_secondtask = 0;
--
Gitblit v1.9.3