From 2f11f04c845d15dc2798e1a4cb1d7d964383c6e9 Mon Sep 17 00:00:00 2001 From: YuanHongbin <975559679@qq.com> Date: Fri, 7 Aug 2026 11:08:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(netcomm):=20up=E4=B8=8A=E4=BC=A0=E5=BA=94?= =?UTF-8?q?=E7=AD=94=E5=B8=A7Cmd=3D0x08=E8=B5=B0NET=5FCOMM=5FCMD=5FALARM?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit up命令发送NET_COMM_CMD_ALARM(0x08),服务器回传Cmd=0x08, switch原先无ALARM分支落入default。补充case NET_COMM_CMD_ALARM 处理up上传应答,并修正回调注释与HIS_DATA分支收尾格式。 --- Project/GateWay/source/User/Src/Public.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Project/GateWay/source/User/Src/Public.c b/Project/GateWay/source/User/Src/Public.c index 31fe2f1..2062791 100644 --- a/Project/GateWay/source/User/Src/Public.c +++ b/Project/GateWay/source/User/Src/Public.c @@ -879,8 +879,8 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData } /***************************************************************************************** -* 函数名称: Cat1RevCallBack -* 功能描述: 4G接收回调函数 +* 函数名称: _NetRevCallBack +* 功能描述: much、auch接收回调函数 * 参 数: rData,数据输入接口 rLen, 数据长度输入接口 * 返 回 值: 无 @@ -1129,9 +1129,8 @@ static int _NetRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, b continue; } } - } - - break; + break;} + case NET_COMM_CMD_ADD_UNIT:{ if(*Data == 1) { //录入成功 MAIN_DBG_LOG("Adding CommUnit succeeded...\r\n"); @@ -1183,7 +1182,10 @@ static int _NetRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, b UploadSend(MegData, sLen); rt_free(MegData); break;} - + case NET_COMM_CMD_ALARM:{ + MAIN_DBG_LOG("Received server response.....\r\n"); + break;} + case NET_COMM_CMD_CONT_LASER:{ memcpy(&CommUintMac[0], Data, 6); int ret = CheckCommUnitReg(GateWay, CommUintMac);