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

feat(update): 升级链路打通(0x7D+DevMac协议)+Boot参数配置迁移(MAC/服务器/Lora频率/通道)+清理死代码(SD/FatFS/utils/protocol/ringbuffer等) 软件版本V1.1

Browse Source
This commit is contained in:
YuanHongbin
2026-09-01 11:14:07 +08:00
parent 8bcc2c41d0
commit 68a5a185fc
134 changed files with 278 additions and 39180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/GateWay/source/User/Src/update_protocol.c
+17 -4
View File
@@ -8,6 +8,13 @@ static struct
}g_update_protoc;
static uint8_t s_DevMac[6] = {0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01};
void update_set_devmac(uint8_t *DevMac)
{
if(DevMac != NULL)
memcpy(s_DevMac, DevMac, 6);
}
void update_send_cmd(uint8_t Cmd, uint16_t Indx, int PageNum)
{
@@ -17,8 +24,8 @@ void update_send_cmd(uint8_t Cmd, uint16_t Indx, int PageNum)
update_protocol_hd_t *Frame = (update_protocol_hd_t*)sData;
Frame->Header = 0x7a;
Frame->SlvAddr = 0x01;
Frame->Header = 0x7d;
memcpy(Frame->DevMac, s_DevMac, 6);
Frame->Cmd = Cmd;
if (Cmd == 0x01)
@@ -58,14 +65,20 @@ int update_unpack(uint8_t* rxData, int rLen,uint8_t *cmd, uint8_t* dev_addr, vo
crc16 = (rxData[rLen - 1] << 8) | rxData[rLen - 2];
if (check != crc16 || rxData[0] !=0x7a || pload ==0)
if (check != crc16 || rxData[0] !=0x7d || pload ==0)
{
return -1;
}
update_protocol_hd_t *Frame = (update_protocol_hd_t*)rxData;
*dev_addr = Frame->SlvAddr;
/*仅精确匹配网关MAC*/
if(memcmp(Frame->DevMac, s_DevMac, 6) != 0) {
return -1;
}
if(dev_addr != NULL)
memcpy(dev_addr, Frame->DevMac, 6);
*cmd = Frame->Cmd;