YuanHongbin/GateWay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(debug): para命令Cat1 IMEI/SIM始终显示+输出同时转发RS485 Ch1

Browse Source 
1. para命令的Cat1 IMEI和SIM打印不再受ChannelIsActive(CH_CAT1)限制,
   无论Cat1配置为Much/Auch/Duch/Cuch哪个通道(或未配置)都显示
2. 新增ParaEchoCh1标志: 执行para命令时, 除正常调试输出外,
   额外通过RS485Ch1UartSend向RS485 Ch1发送一份相同的调试信息,
   与Duch通讯方式无关; 命令结束后标志复位, 不影响其他命令
This commit is contained in:
YuanHongbin
2026-08-25 18:35:15 +08:00
parent ce1611dedc
commit 8bcc2c41d0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c
+10 -6
View File
@@ -36,6 +36,7 @@ static uint8_t DebugRxBuff[DBG_RX_LEN_MAX];
static uint8_t DebugRxTimeOut1mSCnt;
static rt_sem_t DebugRev_Sem;
static char tempBuff[DEBUG_BUFF_MAX];
static bool ParaEchoCh1 = false;
void Debug_Printf(char *format, ...)
{
@@ -57,6 +58,9 @@ void Debug_Printf(char *format, ...)
} else {
rt_kprintf(tempBuff);
}
if(ParaEchoCh1) {
RS485Ch1UartSend((uint8_t *)tempBuff, strlen(tempBuff));
}
va_end(args);
}
/*****************************************************************************************
@@ -1433,6 +1437,7 @@ static void DebugCmdGetPara(int argc, char *argv[])
return;
}
}
ParaEchoCh1 = true;
DBG_LOG("\r\n**********************************************************\r\n");
DBG_LOG("SoftWare V:%d.%d, HardWare V:%d.%d\r\n", SOFTWARE_VERSION / 10, SOFTWARE_VERSION % 10, HARDWARE_VERSION / 10, HARDWARE_VERSION % 10);
DBG_LOG("GateWay MAC: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
@@ -1447,12 +1452,10 @@ static void DebugCmdGetPara(int argc, char *argv[])
(GateWay->ConfigPara.CuchMask & CUCH_ETH) ? "eth " : "",
(GateWay->ConfigPara.CuchMask & CUCH_LORA) ? "lora " : "",
(GateWay->ConfigPara.CuchMask & CUCH_CAT1) ? "cat1 " : "");
if(ChannelIsActive(GateWay->ConfigPara, CH_CAT1)) {
char Imei[20], Sim[32];
CatReadImeiOrSim(Imei, Sim);
DBG_LOG("Cat1 IMEI: %s\r\n", Imei);
DBG_LOG("Cat1 SIM: %s\r\n", Sim);
}
char Imei[20], Sim[32];
CatReadImeiOrSim(Imei, Sim);
DBG_LOG("Cat1 IMEI: %s\r\n", Imei);
DBG_LOG("Cat1 SIM: %s\r\n", Sim);
DBG_LOG("CommUnitReadInterval: %d\r\n", GateWay->ConfigPara.CommUnitReadInterval);
DBG_LOG("Svr MAC: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
GateWay->SvrMac[0], GateWay->SvrMac[1], GateWay->SvrMac[2], GateWay->SvrMac[3], GateWay->SvrMac[4], GateWay->SvrMac[5]);
@@ -1498,6 +1501,7 @@ static void DebugCmdGetPara(int argc, char *argv[])
DBG_LOG("%d:",stime->tm_min);
DBG_LOG("%d\r\n",stime->tm_sec);
DBG_LOG("**********************************************************\r\n");
ParaEchoCh1 = false;
}
/*****************************************************************************************