feat: 调整负载启动、掉电恢复及协议切换时序
详细修改: 1. 新增chrg_eload_get_sample_seq接口获取量测更新序号 2. 关闭LCD接收功能避免阻塞量测上报 3. 新增Sink北向事务状态枚举,区分完整重握手和软卸载流程 4. 调整北向调试开关配置,开启南向寄存器写命令调试 5. 重构Sink状态机,拆分INIT等待、掉电恢复、软卸载等阶段 6. 优化协议切换逻辑:仅电压变化使用软卸载,其余变更执行完整重握手 7. 增加电压稳定确认次数,避免瞬态电压误触发运行状态 8. 新增南向批量命令状态查询和优先量测请求功能 9. 调整继电器操作时序,副继电器回码后再执行后续初始化命令 10. 新增修改日志文档记录版本变更
This commit is contained in:
@@ -24,10 +24,12 @@
|
||||
#define DBG_LEVEL DBG_LOG
|
||||
#include <rtdbg.h>
|
||||
|
||||
#define SOURCE_VOLT_ERROR_MV 200U
|
||||
#define SOURCE_VOLT_RETRY_FRAMES 3U
|
||||
#define SOURCE_QC_MIN_VOLT_MV 5000U
|
||||
#define SOURCE_QC_SWITCH_ERROR 0x04U
|
||||
#define SOURCE_VOLT_ERROR_MV 200U // Source目标电压允许误差,单位mV
|
||||
#define SOURCE_VOLT_RETRY_FRAMES 3U // Source电压持续超差后的重发确认帧数
|
||||
#define SOURCE_QC_MIN_VOLT_MV 5000U // QC2.0/QC3.0允许使用的最低目标电压
|
||||
#define SOURCE_QC_SWITCH_ERROR 0x04U // Source协议或CC切换失败错误位
|
||||
#define SINK_CURRENT_START_GRACE_MS 200U // Sink启动后暂不判断无电流的保护时间
|
||||
#define SINK_VOLT_STABLE_CONFIRM_COUNT 2U // Sink进入RUNING前连续稳定电压帧数
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_apply_protocol_voltage_rule
|
||||
@@ -188,10 +190,10 @@ void chrg_source_setting(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
函数描述: 解析北向负载板回码并根据电压、电流反馈驱动Sink状态机
|
||||
输入参数: frame_data:完整北向回码 idx:当前通道 pSW:通道控制结构体
|
||||
pNOR:北向总控结构体
|
||||
输出参数: 更新VZ、VF、低压计数、无电流计数及sink.work_mode
|
||||
输出参数: 更新VZ、VF、低压计数、稳定电压计数、无电流计数及sink.work_mode
|
||||
返回说明: -
|
||||
其它说明: 电压连续低于门槛进入LOW;电压达到目标附近进入RUNING;
|
||||
运行电流连续过低时退回WAIT重新判断
|
||||
其它说明: 电压连续低于门槛进入LOW;掉电处理恢复副继电器后,电压重新
|
||||
出现时先重设协议和CC;连续两次达到目标附近才进入RUNING
|
||||
*****************************************************************/
|
||||
void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW, struct chrg_north_t *pNOR)
|
||||
@@ -200,6 +202,8 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
static rt_uint8_t volt_low[TOTAL_SOU_CHS] = {0};
|
||||
static rt_uint8_t no_curr[TOTAL_SOU_CHS] = {0};
|
||||
static rt_uint8_t volt_set_ok[TOTAL_SOU_CHS] = {0};
|
||||
static rt_uint8_t volt_stable_count[TOTAL_SOU_CHS] = {0};
|
||||
static rt_tick_t running_start_tick[TOTAL_SOU_CHS] = {0};
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return;
|
||||
@@ -214,8 +218,9 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
|
||||
if(pSW->sink.On_work == 1 && pSW->sink.test.test_mode == 0) {
|
||||
if (volt_mv <= WORK_MIN_VOLT) { // 电压过低,禁止进入工作状态机
|
||||
volt_stable_count[idx] = 0;
|
||||
if (volt_set_ok[idx] == 1) {
|
||||
if (++volt_low[idx] >= 3) {
|
||||
if (++volt_low[idx] >= 2) {
|
||||
volt_set_ok[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
pSW->sink.work_mode = SINK_WORK_LOW;
|
||||
@@ -226,18 +231,48 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
volt_low[idx] = 0;
|
||||
volt_set_ok[idx] = 1;
|
||||
pSW->change_flag = 0;
|
||||
if ((rt_uint32_t)volt_mv + 2000 >= pSW->sink.pro_loadv) {
|
||||
pSW->sink.work_mode = SINK_WORK_RUNING;
|
||||
if (pSW->Now_current <= 200 && (pSW->sink.pro_loadc >= 200)) {
|
||||
if (++no_curr[idx] >= 3) {
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
if (pSW->sink.work_mode == SINK_WORK_LOW_MONITOR) {
|
||||
/* 副继电器恢复后首次重新检测到输入电压,只启动协议重握手。
|
||||
* 当前回码不计入稳定电压次数,防止跳过协议设置直接带载。 */
|
||||
volt_stable_count[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
pSW->sub = IDX_SET_SINK_PD;
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
} else if ((pSW->sink.work_mode == SINK_WORK_LOW) ||
|
||||
(pSW->sink.work_mode == SINK_WORK_LOW_AUX_WAIT)) {
|
||||
/* 掉电安全批次完成前,即使收到残留回码也不得进入RUNING。 */
|
||||
volt_stable_count[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
} else if ((rt_uint32_t)volt_mv + 2000 >= pSW->sink.pro_loadv) {
|
||||
if ((pSW->sink.work_mode != SINK_WORK_RUNING) &&
|
||||
(pSW->sink.work_mode != SINK_WORK_SOFT_RUNNING)) {
|
||||
if (volt_stable_count[idx] < SINK_VOLT_STABLE_CONFIRM_COUNT) {
|
||||
volt_stable_count[idx]++;
|
||||
}
|
||||
if (volt_stable_count[idx] >= SINK_VOLT_STABLE_CONFIRM_COUNT) {
|
||||
/* 连续两次北向量测均达到目标电压附近后才允许带载,避免
|
||||
* 单次瞬态电压或旧回码导致负载提前进入RUNING。 */
|
||||
volt_stable_count[idx] = 0;
|
||||
pSW->sink.work_mode =
|
||||
(pSW->sink.work_mode == SINK_WORK_SOFT_RESUME_WAIT) ?
|
||||
SINK_WORK_SOFT_RESUME : SINK_WORK_RUNING;
|
||||
running_start_tick[idx] = rt_tick_get();
|
||||
no_curr[idx] = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
}
|
||||
} else if ((pSW->Now_current > 200) ||
|
||||
(pSW->sink.pro_loadc < 200)) {
|
||||
volt_stable_count[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
} else if ((rt_tick_t)(rt_tick_get() - running_start_tick[idx]) >=
|
||||
rt_tick_from_millisecond(SINK_CURRENT_START_GRACE_MS)) {
|
||||
volt_stable_count[idx] = 0;
|
||||
if (++no_curr[idx] >= 2) {
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
no_curr[idx] = 0;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
volt_stable_count[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
}
|
||||
}
|
||||
@@ -246,6 +281,7 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
volt_low[idx] = 0;
|
||||
no_curr[idx] = 0;
|
||||
volt_set_ok[idx] = 0;
|
||||
volt_stable_count[idx] = 0;
|
||||
}
|
||||
chrg_sink_work(idx,pSW);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user