适配110V美标控制盒过热复位流程：过热帧后低位强制下降触发复位，复位帧后先停2s再下降完成复位；新增报错观测日志(已关闭)
This commit is contained in:
@@ -400,6 +400,208 @@ const DBGFunType DebugFun[DEBUG_CMD_CNT] = {
|
||||
"wave", DBGWave_on_off,
|
||||
};
|
||||
|
||||
/*=========================================================================================
|
||||
* 函数名称: Uart3ErrLog_xxx
|
||||
* 功能描述: 控制盒报错(01 04)→复位→恢复 观测打印。接收中断中仅推事件入环形缓冲(不打印),
|
||||
* 由主循环Uart3ErrLogLoopHandler()统一打印, 完整呈现"触发报错→置复位标志→
|
||||
* 复位过程多包回应→复位完成恢复正常"的时间线。
|
||||
* 协议: 01 04 d2 d3 = 报错帧(d2/d3为错误码, 如过热); 01 01 h_hi h_lo = 高度帧(清除复位标志)
|
||||
*=========================================================================================*/
|
||||
#define U3ERR_EVT_MAX 16 /* 事件缓冲条数 */
|
||||
#define U3ERR_STATUS_NUM 12 /* 主状态机状态个数 */
|
||||
|
||||
/* 事件类型 */
|
||||
#define U3ERR_T_FIRST 0 /* 首次信息帧(复位标志 0→1) */
|
||||
#define U3ERR_T_REPLY 1 /* 复位中回应信息帧(复位标志已置位) */
|
||||
#define U3ERR_T_DONE 2 /* 复位完成(收到高度帧, 复位标志 1→0) */
|
||||
#define U3ERR_T_UNKNOWN 3 /* 未知帧(非高度/信息帧, 用于捕捉过热等其它报错) */
|
||||
|
||||
typedef struct{
|
||||
uint8_t Type; /* 事件类型 */
|
||||
uint8_t Bits; /* BIT0/BIT1 输出电平(bit0/bit1) */
|
||||
uint8_t Status; /* 事件时刻主状态机状态 */
|
||||
uint8_t Frame[4]; /* 原始4字节帧 */
|
||||
uint16_t Height; /* type2: 高度帧数值(mm) */
|
||||
uint16_t Repeat; /* 连发合并的重复包数(不含首包) */
|
||||
uint32_t Tick; /* 事件时刻(ms, 上电起) */
|
||||
}U3ErrEvt_t;
|
||||
|
||||
/* 连发合并状态: 相同帧500ms内只计数不重复入队, 防止过热帧持续广播刷爆缓冲 */
|
||||
static uint8_t m_U3ErrLastType = 0xFF; /* 上一帧类型(0xFF=无) */
|
||||
static uint8_t m_U3ErrLastFrame[4]; /* 上一帧内容 */
|
||||
static uint16_t m_U3ErrLastHeight = 0; /* 上一帧高度(type2) */
|
||||
static uint32_t m_U3ErrLastTick = 0; /* 上一帧时刻 */
|
||||
static uint16_t m_U3ErrRepeat = 0; /* 上一帧已合并的重复包数 */
|
||||
|
||||
static const char *m_U3ErrStatusName[U3ERR_STATUS_NUM] = {
|
||||
"IDLE", "ON", "OFF", "START_BEEP", "MOTOR_INIT", "ZERO_MARKING",
|
||||
"WAIT_MOTOR_INIT", "WAIT_MOTOR_CALI_UP", "WAIT_MOTOR_CALI_DOWN",
|
||||
"WAIT_STEADY", "END_BEEP", "HEIGHT_CONTROL"
|
||||
};
|
||||
|
||||
static U3ErrEvt_t m_U3ErrEvt[U3ERR_EVT_MAX]; /* 事件环形缓冲 */
|
||||
static volatile uint16_t m_U3ErrWr = 0; /* 写指针(中断) */
|
||||
static volatile uint16_t m_U3ErrRd = 0; /* 读指针(主循环) */
|
||||
static volatile uint32_t m_U3ErrLostCnt = 0; /* 缓冲满时丢弃条数 */
|
||||
|
||||
/* 函数名称: Uart3ErrLog_Enqueue
|
||||
* 功能描述: 将事件落入队列(内部使用, 关中断保护) */
|
||||
static void Uart3ErrLog_Enqueue(uint8_t type, const uint8_t *pFrame, uint16_t height, uint32_t tick, uint16_t repeat)
|
||||
{
|
||||
U3ErrEvt_t evt;
|
||||
evt.Type = type;
|
||||
evt.Bits = (uint8_t)((GET_BIT0_DOUT() ? 0x01u : 0u) | (GET_BIT1_DOUT() ? 0x02u : 0u));
|
||||
evt.Status = (uint8_t)App.Status;
|
||||
evt.Frame[0] = pFrame[0];
|
||||
evt.Frame[1] = pFrame[1];
|
||||
evt.Frame[2] = pFrame[2];
|
||||
evt.Frame[3] = pFrame[3];
|
||||
evt.Height = height;
|
||||
evt.Repeat = repeat;
|
||||
evt.Tick = tick;
|
||||
|
||||
uint32_t primask = __get_PRIMASK();
|
||||
__disable_irq();
|
||||
uint16_t next = (uint16_t)((m_U3ErrWr + 1U) % U3ERR_EVT_MAX);
|
||||
if(next != m_U3ErrRd){ /* 未满则入队 */
|
||||
m_U3ErrEvt[m_U3ErrWr] = evt;
|
||||
m_U3ErrWr = next;
|
||||
}
|
||||
else{ /* 满则丢弃当前条并计数 */
|
||||
m_U3ErrLostCnt++;
|
||||
}
|
||||
if(primask == 0U){
|
||||
__enable_irq();
|
||||
}
|
||||
}
|
||||
|
||||
/* 函数名称: Uart3ErrLog_Push
|
||||
* 功能描述: 记录一条报错/复位事件(在USART3接收中断中调用)。相同帧500ms内连发只合并计数,
|
||||
* 由主循环在连发结束(超时)或出现新帧时落一条带"连发N包"的事件, 避免缓冲溢出 */
|
||||
void Uart3ErrLog_Push(uint8_t type, const uint8_t *pFrame, uint16_t height)
|
||||
{
|
||||
uint32_t tick = SysTick_GetTick();
|
||||
/* 连发合并: 与上一帧类型/内容相同且间隔<500ms(type2复位完成除外), 只计数 */
|
||||
if((m_U3ErrLastType != 0xFF) && (type == m_U3ErrLastType) && (type != U3ERR_T_DONE) &&
|
||||
(pFrame[0] == m_U3ErrLastFrame[0]) && (pFrame[1] == m_U3ErrLastFrame[1]) &&
|
||||
(pFrame[2] == m_U3ErrLastFrame[2]) && (pFrame[3] == m_U3ErrLastFrame[3]) &&
|
||||
((tick - m_U3ErrLastTick) < 500U))
|
||||
{
|
||||
m_U3ErrRepeat++;
|
||||
m_U3ErrLastTick = tick;
|
||||
return;
|
||||
}
|
||||
/* 与上一帧不同: 先把滞留的上一帧连同连发计数落队 */
|
||||
if(m_U3ErrLastType != 0xFF){
|
||||
Uart3ErrLog_Enqueue(m_U3ErrLastType, m_U3ErrLastFrame, m_U3ErrLastHeight, m_U3ErrLastTick, m_U3ErrRepeat);
|
||||
m_U3ErrRepeat = 0;
|
||||
}
|
||||
/* 本帧记为新的滞留帧, 待其连发结束或下一帧到来时落队 */
|
||||
m_U3ErrLastType = type;
|
||||
m_U3ErrLastFrame[0] = pFrame[0];
|
||||
m_U3ErrLastFrame[1] = pFrame[1];
|
||||
m_U3ErrLastFrame[2] = pFrame[2];
|
||||
m_U3ErrLastFrame[3] = pFrame[3];
|
||||
m_U3ErrLastHeight = height;
|
||||
m_U3ErrLastTick = tick;
|
||||
}
|
||||
|
||||
/* 函数名称: Uart3ErrLog_BitsName
|
||||
* 功能描述: BIT0/BIT1输出电平转"升/降/停"描述(ASCII, 避免AC5源码集问题) */
|
||||
static const char *Uart3ErrLog_BitsName(uint8_t bits)
|
||||
{
|
||||
if((bits & 0x01u) && (bits & 0x02u)) return "STOP";
|
||||
if(bits & 0x02u) return "UP";
|
||||
if(bits & 0x01u) return "DOWN";
|
||||
return "?";
|
||||
}
|
||||
|
||||
/* 函数名称: Uart3ErrLog_CodeName
|
||||
* 功能描述: 已知帧内容转义(发现新帧格式后在此扩充) */
|
||||
static const char *Uart3ErrLog_CodeName(const uint8_t *pFrame)
|
||||
{
|
||||
if(pFrame[0] == 0x01 && pFrame[1] == 0x02 && pFrame[2] == 0x00 && pFrame[3] == 0x10) return "(OVERHEAT)";
|
||||
if(pFrame[2] == 0x01 && pFrame[3] == 0xAA) return "(RESET)";
|
||||
return "";
|
||||
}
|
||||
|
||||
/* 函数名称: Uart3ErrLog_StatusName
|
||||
* 功能描述: 主状态机状态值转可读名 */
|
||||
static const char *Uart3ErrLog_StatusName(uint8_t status)
|
||||
{
|
||||
if(status < U3ERR_STATUS_NUM){
|
||||
return m_U3ErrStatusName[status];
|
||||
}
|
||||
return "?";
|
||||
}
|
||||
|
||||
/* 函数名称: Uart3ErrLogLoopHandler
|
||||
* 功能描述: 主循环中调用, 打印报错→复位→恢复的完整事件时间线(连发帧合并为一条并显示包数) */
|
||||
void Uart3ErrLogLoopHandler(void)
|
||||
{
|
||||
uint8_t cnt;
|
||||
/* 连发已结束(超时500ms无同帧)且有滞留帧 → 先落队一条 */
|
||||
if((m_U3ErrLastType != 0xFF) && (m_U3ErrRepeat > 0U) &&
|
||||
((SysTick_GetTick() - m_U3ErrLastTick) >= 500U))
|
||||
{
|
||||
Uart3ErrLog_Enqueue(m_U3ErrLastType, m_U3ErrLastFrame, m_U3ErrLastHeight, m_U3ErrLastTick, m_U3ErrRepeat);
|
||||
m_U3ErrLastType = 0xFF;
|
||||
m_U3ErrRepeat = 0;
|
||||
}
|
||||
for(cnt = 0; cnt < 8U; cnt++){
|
||||
char rep[20];
|
||||
if(m_U3ErrRd == m_U3ErrWr){
|
||||
break;
|
||||
}
|
||||
U3ErrEvt_t evt = m_U3ErrEvt[m_U3ErrRd];
|
||||
m_U3ErrRd = (uint16_t)((m_U3ErrRd + 1U) % U3ERR_EVT_MAX);
|
||||
uint32_t s = evt.Tick / 1000U;
|
||||
uint32_t ms = evt.Tick % 1000U;
|
||||
if(evt.Repeat > 0U){
|
||||
sprintf(rep, ",burst %u", evt.Repeat + 1U);
|
||||
}
|
||||
else{
|
||||
rep[0] = '\0';
|
||||
}
|
||||
switch(evt.Type){
|
||||
case U3ERR_T_FIRST: /* 首次信息帧: 置复位标志 */
|
||||
DBG_LOG("[T+%3u.%03us][%s|OUT:%s] INFO: code=0x%02X%02X%s -> SetRestFlag%s\r\n",
|
||||
s, ms, Uart3ErrLog_StatusName(evt.Status),
|
||||
Uart3ErrLog_BitsName(evt.Bits),
|
||||
evt.Frame[2], evt.Frame[3],
|
||||
Uart3ErrLog_CodeName(evt.Frame), rep);
|
||||
break;
|
||||
case U3ERR_T_REPLY: /* 复位中回应信息帧 */
|
||||
DBG_LOG("[T+%3u.%03us][%s|OUT:%s] INFO-REPLY: code=0x%02X%02X%s (RestFlag set%s)\r\n",
|
||||
s, ms, Uart3ErrLog_StatusName(evt.Status),
|
||||
Uart3ErrLog_BitsName(evt.Bits),
|
||||
evt.Frame[2], evt.Frame[3],
|
||||
Uart3ErrLog_CodeName(evt.Frame), rep);
|
||||
break;
|
||||
case U3ERR_T_DONE: /* 复位完成: 收到高度帧 */
|
||||
DBG_LOG("[T+%3u.%03us][%s|OUT:%s] Height=%dmm -> RestFlag cleared, normal\r\n",
|
||||
s, ms, Uart3ErrLog_StatusName(evt.Status),
|
||||
Uart3ErrLog_BitsName(evt.Bits), evt.Height);
|
||||
break;
|
||||
case U3ERR_T_UNKNOWN: /* 未知帧: 过热等其它报错可能在此 */
|
||||
DBG_LOG("[T+%3u.%03us][%s|OUT:%s] UNKNOWN: %02X %02X %02X %02X %s(ATTENTION)%s\r\n",
|
||||
s, ms, Uart3ErrLog_StatusName(evt.Status),
|
||||
Uart3ErrLog_BitsName(evt.Bits),
|
||||
evt.Frame[0], evt.Frame[1], evt.Frame[2], evt.Frame[3],
|
||||
Uart3ErrLog_CodeName(evt.Frame), rep);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if((m_U3ErrRd == m_U3ErrWr) && (m_U3ErrLostCnt > 0U)){ /* 缓冲曾溢出 */
|
||||
uint32_t tick = SysTick_GetTick();
|
||||
DBG_LOG("[T+%3u.%03us] NOTE: ErrLog buf overflow, lost %u events\r\n",
|
||||
tick / 1000U, tick % 1000U, m_U3ErrLostCnt);
|
||||
m_U3ErrLostCnt = 0;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user