refactor(chrg_north): 重构北向通信处理逻辑,增加配置版本校验机制
1. apps/chrg/applications/thread/chrg_comm.c: 新增通道配置版本递增逻辑,避免旧回码干扰新配置
2. apps/chrg/applications/thread/chrg_north.h: 更新config_version注释,补充用途说明
3. apps/chrg/applications/thread/chrg_north.c: 重构帧头解析函数,新增缓冲区操作辅助函数和通道切换复位逻辑
4. apps/chrg/applications/thread/chrg_roll_nor.c:
- 新增超时、重发等宏定义
- 重构协议设置函数,增加返回值处理
- 新增回码匹配校验、邮箱清理、等待响应等辅助函数
- 重构自动请求逻辑,增加重试和配置版本校验
- 简化线程入口处理逻辑,统一回码释放流程
5. apps/chrg/codex_build.log: 记录本次编译的代码尺寸变化
This commit is contained in:
@@ -27,6 +27,7 @@
|
||||
#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
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_apply_protocol_voltage_rule
|
||||
@@ -121,37 +122,43 @@ static int chrg_source_voltage_control(eIDX_SOU_CH idx,
|
||||
输入参数: frame_data:完整北向回码 idx:当前通道 pSW:通道控制结构体
|
||||
pNOR:北向总控结构体
|
||||
输出参数: 更新电压、电流、source.work_mode及电压重试计数
|
||||
返回说明: -
|
||||
返回说明: 0:回码正常 <0:参数错误、切换错误或功率板命令提交失败
|
||||
其它说明: 标准协议使用COM配置目标参与实际电压校验;快充协议读取
|
||||
frame_data[8~11]中的协商目标值,两个分支共用误差重试逻辑
|
||||
frame_data[8~11]中的协商目标值;frame_data[14]的bit2表示
|
||||
Source板协议/CC切换失败,错误回码不得驱动功率板输出
|
||||
*****************************************************************/
|
||||
void chrg_source_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
int chrg_source_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW, struct chrg_north_t *pNOR)
|
||||
{
|
||||
rt_uint16_t volt_mv;
|
||||
rt_uint16_t curr_ma;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return;
|
||||
(void)pNOR;
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL) ||
|
||||
(frame_data == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
pSW->source.qc_err = frame_data[14];
|
||||
if ((pSW->source.qc_err & SOURCE_QC_SWITCH_ERROR) != 0U) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
/* 标准协议不使用北向帧内目标值,但仍进入统一误差判断,确保INIT或
|
||||
* COM下发的目标电压没有生效时能够自动重试。 */
|
||||
if (pSW->source.protocol == PRO_NONE) {
|
||||
(void)chrg_source_voltage_control(idx, pSW,
|
||||
return chrg_source_voltage_control(idx, pSW,
|
||||
pSW->source.pd_set.mm.max_vol,
|
||||
pSW->source.pd_set.mm.max_cur);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((frame_data == RT_NULL) || !pSW->source.On_Flag) {
|
||||
return;
|
||||
if (!pSW->source.On_Flag) {
|
||||
return 0;
|
||||
}
|
||||
volt_mv = (frame_data[8] << 8) | frame_data[9];
|
||||
curr_ma = (frame_data[10] << 8) | frame_data[11];
|
||||
// /* 特殊协议规则只修正运行目标,不覆盖北向原始回码和COM协议配置。 */
|
||||
// volt_mv = chrg_source_apply_protocol_voltage_rule(pSW, volt_mv);
|
||||
(void)chrg_source_voltage_control(idx, pSW, volt_mv, curr_ma);
|
||||
return chrg_source_voltage_control(idx, pSW, volt_mv, curr_ma);
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
@@ -169,7 +176,7 @@ void chrg_source_setting(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
//执行输出调整
|
||||
if (pSW->source.On_Flag == 1) {
|
||||
/* 标准协议与快充协议都由解析入口选择各自目标值并统一校验。 */
|
||||
chrg_source_parse(frame_data, idx, pSW, pNOR);
|
||||
(void)chrg_source_parse(frame_data, idx, pSW, pNOR);
|
||||
}else if(pSW->source.On_Flag == 0){
|
||||
//chrg_source_stop(frame_data,pSW,idx,&pNOR->enable[idx]);
|
||||
pSW->sub = IDX_SET_SOURCE_STOP_STATE;
|
||||
@@ -357,84 +364,163 @@ int chrg_north_send (rt_uint8_t *data, rt_size_t length)
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_frame_head
|
||||
函数描述: 北向通道数据帧头提取
|
||||
输入参数: *rb: 缓冲区 *head: 帧头 id:编号
|
||||
函数名称: chrg_north_frame_shape_valid
|
||||
函数描述: 检查北向回码命令和长度组合是否符合协议定义
|
||||
输入参数: id:角色 length:帧长度 command:回码命令
|
||||
输出参数: -
|
||||
返回说明: <0: 错误 >0:帧长度
|
||||
其它说明: 提取3字节帧头
|
||||
返回说明: RT_TRUE:组合合法 RT_FALSE:组合非法
|
||||
其它说明: 0x20量测回码固定21字节,设置命令回码固定5字节
|
||||
*****************************************************************/
|
||||
static int chrg_north_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eIDX_ID id)
|
||||
static rt_bool_t chrg_north_frame_shape_valid(eIDX_ID id,
|
||||
rt_uint8_t length, rt_uint8_t command)
|
||||
{
|
||||
int i = 0;
|
||||
rt_uint8_t data = 0, stage = 0;
|
||||
rt_size_t ret = 0;
|
||||
rt_size_t len_rb = 0; // ring数据长度
|
||||
rt_uint8_t len_frame = 0; // 帧长度
|
||||
if (command == SRC_CMD_GET_VOLTAGE) {
|
||||
return (length == 21U) ? RT_TRUE : RT_FALSE;
|
||||
}
|
||||
if (command == SRC_CMD_GET_PROTOCOL) {
|
||||
return (length >= MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE;
|
||||
}
|
||||
|
||||
if (RT_NULL == rb) {
|
||||
rt_kprintf("len_rb=NULL%d\r\n",len_rb);
|
||||
if (id == ID_SOURCE) {
|
||||
if ((command == SRC_CMD_SET_CC_LEVEL) ||
|
||||
(command == SRC_CMD_SET_CC_CHOOSE) ||
|
||||
(command == SRC_CMD_SET_PROTOCOL)) {
|
||||
return (length == MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE;
|
||||
}
|
||||
return RT_FALSE;
|
||||
}
|
||||
|
||||
if (id == ID_SINK) {
|
||||
switch (command) {
|
||||
case SINK_CMD_SET_CC:
|
||||
case SINK_CMD_SET_LEVEL:
|
||||
case SINK_CMD_SET_QC20:
|
||||
case SINK_CMD_SET_QC30:
|
||||
case SINK_CMD_SET_FCP:
|
||||
case SINK_CMD_SET_AFC:
|
||||
case SINK_CMD_SET_SCP:
|
||||
case SINK_CMD_SET_VIVO:
|
||||
case SINK_CMD_SET_TFC:
|
||||
case SINK_CMD_SET_PD0:
|
||||
case SINK_CMD_SET_PPS:
|
||||
case SINK_CMD_SET_PD3P1:
|
||||
case SINK_CMD_SET_UFCS:
|
||||
case SINK_CMD_SET_VOOC:
|
||||
case SINK_CMD_SET_AVS:
|
||||
case LOAD_PRO_NONE:
|
||||
return (length == MIN_FRAME_LENGTH) ? RT_TRUE : RT_FALSE;
|
||||
default:
|
||||
return RT_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
return RT_FALSE;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_ringbuffer_byte
|
||||
函数描述: 不移动读指针地读取北向环形缓冲区指定偏移字节
|
||||
输入参数: rb:环形缓冲区 offset:相对当前读指针偏移 data:输出字节
|
||||
输出参数: data返回读取到的字节
|
||||
返回说明: 0:成功 <0:参数或偏移错误
|
||||
其它说明: 仅由北向接收线程调用,不与其它线程并发访问该环形缓冲区
|
||||
*****************************************************************/
|
||||
static int chrg_north_ringbuffer_byte(const struct rt_ringbuffer *rb,
|
||||
rt_size_t offset, rt_uint8_t *data)
|
||||
{
|
||||
rt_size_t index;
|
||||
|
||||
if ((rb == RT_NULL) || (data == RT_NULL) ||
|
||||
(offset >= rt_ringbuffer_data_len((struct rt_ringbuffer *)rb))) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
index = rb->read_index + offset;
|
||||
if (index >= rb->buffer_size) {
|
||||
index -= rb->buffer_size;
|
||||
}
|
||||
*data = rb->buffer_ptr[index];
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_ringbuffer_discard
|
||||
函数描述: 从北向环形缓冲区丢弃指定数量字节
|
||||
输入参数: rb:环形缓冲区 length:需要丢弃的字节数
|
||||
输出参数: -
|
||||
返回说明: -
|
||||
其它说明: 用于移除帧头前噪声,同时保留末尾可能未接收完整的帧头
|
||||
*****************************************************************/
|
||||
static void chrg_north_ringbuffer_discard(struct rt_ringbuffer *rb,
|
||||
rt_size_t length)
|
||||
{
|
||||
rt_uint8_t data;
|
||||
|
||||
while ((length > 0U) && (rt_ringbuffer_getchar(rb, &data) != 0U)) {
|
||||
length--;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_frame_head
|
||||
函数描述: 在北向字节流中查找并提取合法四字节帧头
|
||||
输入参数: rb:环形缓冲区 head:帧头输出区 id:当前通道角色
|
||||
输出参数: head返回长度、固定字节、角色和命令
|
||||
返回说明: >0:完整帧长度 0:暂未找到完整帧头 <0:参数或读取错误
|
||||
其它说明: 未找到时保留末尾3字节,支持帧头跨多次UART接收
|
||||
*****************************************************************/
|
||||
static int chrg_north_frame_head(struct rt_ringbuffer *rb,
|
||||
rt_uint8_t *head, eIDX_ID id)
|
||||
{
|
||||
rt_size_t i;
|
||||
rt_size_t j;
|
||||
rt_size_t len_rb;
|
||||
rt_uint8_t length;
|
||||
rt_uint8_t reserved;
|
||||
rt_uint8_t frame_id;
|
||||
rt_uint8_t command;
|
||||
|
||||
if ((rb == RT_NULL) || (head == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
len_rb = rt_ringbuffer_data_len(rb);
|
||||
|
||||
|
||||
if (len_rb < LEN_FRAME_HEAD) {
|
||||
return 0;
|
||||
}
|
||||
for (i = 0; i < len_rb - 2; i++) { // 找头三个字节 [帧长, 0x00, id]
|
||||
ret = rt_ringbuffer_getchar(rb, &data);
|
||||
if (0 == ret) {
|
||||
|
||||
/* 使用非破坏读取逐字节滑动,查找完整的4字节候选帧头。 */
|
||||
for (i = 0; (i + LEN_FRAME_HEAD) <= len_rb; i++) {
|
||||
if ((chrg_north_ringbuffer_byte(rb, i, &length) != 0) ||
|
||||
(chrg_north_ringbuffer_byte(rb, i + 1U, &reserved) != 0) ||
|
||||
(chrg_north_ringbuffer_byte(rb, i + 2U, &frame_id) != 0) ||
|
||||
(chrg_north_ringbuffer_byte(rb, i + 3U, &command) != 0)) {
|
||||
break;
|
||||
}
|
||||
|
||||
/* 长度、固定字节、角色或命令不匹配时继续搜索下一个候选位置。 */
|
||||
if ((reserved != 0x00U) || (frame_id != (rt_uint8_t)id) ||
|
||||
(length < MIN_FRAME_LENGTH) ||
|
||||
!chrg_north_frame_shape_valid(id, length, command)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (stage) {
|
||||
case 0:
|
||||
head[0] = data;
|
||||
len_frame = data;
|
||||
if (data < MIN_FRAME_LENGTH) { // 长度不符
|
||||
|
||||
stage = 0;
|
||||
continue;
|
||||
/* 找到合法帧头后,仅丢弃它前面的噪声,再正式取出4字节帧头。 */
|
||||
chrg_north_ringbuffer_discard(rb, i);
|
||||
for (j = 0; j < LEN_FRAME_HEAD; j++) {
|
||||
if (rt_ringbuffer_getchar(rb, &head[j]) == 0U) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
stage = 1;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
head[1] = data;
|
||||
if (0x00 != data) {
|
||||
stage = 0;
|
||||
} else {
|
||||
stage = 2;
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
head[2] = data;
|
||||
if ((rt_uint8_t)id != data) {
|
||||
stage = 0;
|
||||
} else {
|
||||
// if (id == ID_SINK) {
|
||||
// rt_uint8_t ext1, ext2;
|
||||
// // 主动读取并丢弃2字节扩展字段
|
||||
// rt_ringbuffer_getchar(rb, &ext1);
|
||||
// rt_ringbuffer_getchar(rb, &ext2);
|
||||
// rt_kprintf("Sink:%02X %02X\r\n", ext1, ext2);
|
||||
// }
|
||||
return len_frame;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
return length;
|
||||
}
|
||||
|
||||
return -1;
|
||||
/* 保留末尾可能尚未接收完整的4字节帧头,等待下一批UART数据续接。 */
|
||||
if (len_rb > (LEN_FRAME_HEAD - 1U)) {
|
||||
chrg_north_ringbuffer_discard(rb,
|
||||
len_rb - (LEN_FRAME_HEAD - 1U));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
@@ -650,6 +736,7 @@ void chrg_north_thread_entry (void *data)
|
||||
|
||||
int len = 0;
|
||||
rt_size_t put_len = 0;
|
||||
eIDX_NOR_CH frame_idx = IDX_NOR_CH1; // 当前未完成帧所属的物理通道
|
||||
struct chrg_tty_t *pTTY = RT_NULL;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
//北向协议板线程体通道初始化为CH1,
|
||||
@@ -690,6 +777,17 @@ void chrg_north_thread_entry (void *data)
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* 四个物理通道共用一个UART组帧器。切换通道后必须终止旧通道的未完成帧,
|
||||
* 防止旧帧继续吞入新通道回码。本复位只在接收线程执行,避免发送线程与
|
||||
* 接收线程同时操作环形缓冲区和组帧上下文。
|
||||
*/
|
||||
if (frame_idx != pNOR->idx) {
|
||||
rt_ringbuffer_reset(pNOR->rb);
|
||||
chrg_north_frame_reset(&pNOR->frame, RT_TRUE);
|
||||
frame_idx = pNOR->idx;
|
||||
}
|
||||
|
||||
put_len = rt_ringbuffer_put(pNOR->rb, pNOR->rx_buf, len);
|
||||
if (put_len != (rt_size_t)len) {
|
||||
LOG_E("north ringbuffer overflow: recv=%d put=%d", len, put_len);
|
||||
|
||||
Reference in New Issue
Block a user