YuanHongbin
df27be161b
- 升级成功(CRC32校验通过)后AppFlag置APP_BOOT_UPGRADE_FLAG(0x5A5A55A5),每次升级均置位 - 启动判断放行该标记: 升级完成后直接启动App,不再停留在BL_IDLE - 擦除动作由App初始化完成: 检测标记后擦除外部SPI Flash参数分区(扇区0~1,非全片擦除,历史日志保留),随后恢复APP_START_FLAG并加载默认参数 - 目的: 防止固件升级后参数结构体布局变化导致字段错位(曾引发注册表乱码/传感器无法注册) - main.h统一UTF-8编码,新增APP_BOOT_UPGRADE_FLAG定义(与App侧bsp.h保持一致) - bsp.h配置更新: 网关编号0x0003,服务器端口8083
77 lines
1.7 KiB
C
77 lines
1.7 KiB
C
#ifndef __MAIN__H
|
|
#define __MAIN__H
|
|
#include "bsp.h"
|
|
|
|
#define CRC16_BASE 0xA001
|
|
|
|
#define APP_START_FLAG 0x55AA5A5A
|
|
#define APP_UPDATE_FLAG 0xA5A5AA55
|
|
#define APP_BOOT_UPGRADE_FLAG 0x5A5A55A5 //升级完成标记：Boot升级成功后置位，App启动时据此擦除外部参数分区并恢复APP_START_FLAG(与App侧bsp.h定义保持一致)
|
|
|
|
typedef enum {
|
|
UPDATE_CMD_NULL,
|
|
UPDATE_CMD_SLAVE_RES = 0x01, //从机应答命令(ACK)
|
|
UPDATE_CMD_SLAVE_REQ_DATA = 0x02, //从机请求数据命令
|
|
UPDATE_CMD_MASTER_REQ = 0x81, //主机升级请求
|
|
UPDATE_CMD_MASTRE_RES_DATA = 0x82, //主机下发数据
|
|
}UpdateCmd_m;
|
|
|
|
//帧头结构体
|
|
typedef struct {
|
|
uint8_t Header;
|
|
uint8_t DevMac[6];
|
|
uint8_t Cmd;
|
|
uint8_t PayloadLen;
|
|
}__attribute__ ((packed))FrameHeader_t, *FrameH;
|
|
|
|
|
|
//主机下发升级请求载荷结构体
|
|
typedef struct {
|
|
uint16_t PackageNum;
|
|
uint32_t AppSize;
|
|
uint32_t AppCrc32;
|
|
}__attribute__ ((packed))UpDataRequset_t, *UDReq;
|
|
|
|
//从机请求下发数据结构体
|
|
typedef struct {
|
|
uint16_t PackageIndex;
|
|
uint16_t PackageNum;
|
|
}__attribute__ ((packed))GetDataRequest_t, *GDReq;
|
|
|
|
//主机应答下发数据结构体
|
|
typedef struct {
|
|
uint16_t PackageIndex;
|
|
uint16_t PackageNum;
|
|
uint8_t DataLen;
|
|
}__attribute__ ((packed))DownResponse_t, *DownRes;
|
|
|
|
typedef enum {
|
|
BL_IDLE,
|
|
BL_ERASE_FLASH,
|
|
BL_GET_DATA,
|
|
BL_WAIT_REV,
|
|
BL_GET_DATA_TIMEOUT,
|
|
BL_START_APP,
|
|
BL_RESET
|
|
}BootStatus_m;
|
|
|
|
typedef struct {
|
|
BootPara_t Para;
|
|
BootStatus_m Status;
|
|
|
|
uint32_t AppPackageCnt;
|
|
uint32_t AppPackageIdx;
|
|
uint32_t RevErrCnt;
|
|
|
|
uint32_t FeedDogDlyCnt;
|
|
uint32_t BootLoader1mSDlyCnt;
|
|
|
|
bool RxFlag;
|
|
uint32_t UartRevTimeOutCnt;
|
|
uint8_t RxBuff[260];
|
|
uint16_t RxLen;
|
|
uint16_t UpDateFlag;
|
|
}BootLoader_t;
|
|
#endif
|
|
|