From 64c36ecbd729ba99dcaba24c52512b0edb92a1b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 18 七月 2025 15:34:00 +0800
Subject: [PATCH] 工卡升级信标V1.0调通了串口下载文件到工卡里
---
keil/include/drivers/DBG.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/keil/include/drivers/DBG.c b/keil/include/drivers/DBG.c
index 4ae524b..5f75410 100644
--- a/keil/include/drivers/DBG.c
+++ b/keil/include/drivers/DBG.c
@@ -173,7 +173,7 @@
}
Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) acOutputBuf, u32Len);
-
+
return HIDO_OK;
}
HIDO_INT32 HIDO_Debug2(const HIDO_CHAR *_pcFmt, ...)
@@ -196,7 +196,7 @@
}
Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) acOutputBuf, u32Len);
-
+
return HIDO_OK;
}
@@ -226,7 +226,7 @@
// u32Len = HIDO_UtilSnprintf(acOutputBuf, sizeof(acOutputBuf), "%04u-%02u-%02u %02u:%02u:%02u.%03u ",
// stRTCDateTime.m_u16Year, stRTCDateTime.m_u8Month, stRTCDateTime.m_u8Day, stRTCDateTime.m_u8Hour,
// stRTCDateTime.m_u8Min, stRTCDateTime.m_u8Sec, HAL_GetTick() % 1000);
-//
+//
Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) acOutputBuf, u32Len);
va_start(ap, _pcFmt);
@@ -239,7 +239,7 @@
}
Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) acOutputBuf, u32Len);
-
+
return HIDO_OK;
}
@@ -315,9 +315,9 @@
/* 输出日志格式 */
RTC_GetDateTime(&stRTCDateTime);
u32Len = HIDO_UtilSnprintf(acOutputBuf, sizeof(acOutputBuf), "%04u-%02u-%02u %02u:%02u:%02u.%03u ",
- stRTCDateTime.m_u16Year, stRTCDateTime.m_u8Month, stRTCDateTime.m_u8Day, stRTCDateTime.m_u8Hour,
- stRTCDateTime.m_u8Min, stRTCDateTime.m_u8Sec, HAL_GetTick() % 1000);
-
+ stRTCDateTime.m_u16Year, stRTCDateTime.m_u8Month, stRTCDateTime.m_u8Day, stRTCDateTime.m_u8Hour,
+ stRTCDateTime.m_u8Min, stRTCDateTime.m_u8Sec, HAL_GetTick() % 1000);
+
Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) acOutputBuf, u32Len);
#endif
return Uart_Send(UART_ID_DBG_GPS, (HIDO_UINT8 *) _pu8String, _u32StringLen);
@@ -364,10 +364,18 @@
*******************************************************************************/
E_DBGMode DBG_GetMode(void)
{
+#ifdef UART_DEBUG_NORMALLY_OPEN
+// if(Get5VState() == 0)
+// {
+// return DBG_MODE_GPS;
+// }
+#else
if(Get5VState() == 0)
{
return DBG_MODE_GPS;
- }
+ }
+#endif
+
return l_eDBGMode;
}
@@ -385,13 +393,16 @@
uint8_t chargedbg_flag;
HIDO_VOID DBG_Poll(void)
{
+#ifdef UART_DEBUG_NORMALLY_OPEN
+ DBG_SetMode(DBG_MODE_SHELL);
+#endif
if(DBG_GetMode() == DBG_MODE_SHELL)
{
HIDO_InputPoll();
}
else if(DBG_GetMode() == DBG_MODE_GPS)
{
- GPS_Poll();
+// GPS_Poll();
}
else if(DBG_GetMode() == DBG_MODE_CHARGE)
{
@@ -419,7 +430,7 @@
{
l_u32ModeTick = 0;
}
- UsartParseDataHandler(u8RecvChar);
+ Usart1ParseDataHandler(u8RecvChar);
}
}
}
@@ -457,6 +468,6 @@
l_stSerialInput.m_fnPutc = DBG_SerialPutChar;
l_stSerialInput.m_fnPuts = DBG_SerialPutString;
HIDO_InputRegister(&l_stSerialInput);
-
+
Shell_Init();
}
--
Gitblit v1.9.3