fix: 修复南向分包、线程通信和批量下发逻辑
1. apps/chrg/debug_hot.ini: 增加调试断点配置 2. apps/chrg/applications/thread/chrg_north.h: 开启北向调试日志 3. 修正多个头文件函数返回值类型,从void改为int 4. 重构chrg_thread.c: 新增mb消息释放函数,优化邮箱发送逻辑 5. 重写chrg_south.c: 修复分包越界和内存泄漏,增加帧超时处理 6. 重构chrg_sink.c: 统一批量下发接口,修正初始化和运行逻辑 7. 重写chrg_comm.c: 修复系统寄存器写入逻辑,增加通道激活校验 8. 重构chrg_north.c: 修复北向分包越界和内存泄漏,增加超时处理和诊断命令 9. 重构chrg_roll_sou.c: 重构批量下发逻辑,增加重试机制和错误处理
This commit is contained in:
@@ -269,13 +269,14 @@ static void chrg_north_handle_Seting_Volt(rt_uint8_t *frame_data, rt_uint16_t fr
|
||||
struct chrg_north_t chrgnorth = {
|
||||
.devname = DEV_NAME_NORTH, // 设备名
|
||||
.tty = RT_NULL, // 串口句柄初始为空
|
||||
.enable = {0, 0, 0, 0}, // 4个通道使能初始关闭
|
||||
.enable = {1, 0, 0, 0}, // 4个通道使能初始关闭
|
||||
.free_flag = 1,
|
||||
// 通道1(IDX_NOR_CH1)初始化
|
||||
.sw[IDX_NOR_CH1] = {
|
||||
.CV_mode = 2,
|
||||
.change_flag = 0,
|
||||
.show_step = 0,
|
||||
.sub = IDX_GET_SINK_VC,
|
||||
.id = ID_SINK, // 初始为负载模式
|
||||
.source = { // 电源侧参数初始化
|
||||
.On_Flag = 0, // 启动标志初始关闭
|
||||
@@ -374,7 +375,7 @@ int chrg_north_send (rt_uint8_t *data, rt_size_t length)
|
||||
|
||||
if (RT_NULL != pTTY) {
|
||||
#if DEBUG_NORTH //是否打印
|
||||
// LOG_HEX("sendN", 32, data, length);
|
||||
LOG_HEX("sendN", 32, data, length);
|
||||
#endif
|
||||
ret = chrg_tty_send(pTTY, data, length);
|
||||
}
|
||||
@@ -406,22 +407,8 @@ static int chrg_north_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eI
|
||||
len_rb = rt_ringbuffer_data_len(rb);
|
||||
|
||||
|
||||
if (len_rb < LEN_FRAME_HEAD + 2) { // 最短5字节
|
||||
// =============================
|
||||
// 简单版:打印错误帧 + 清空缓冲区
|
||||
// =============================
|
||||
rt_kprintf("[ERROR] 帧长度不足,len=%d, data: ", len_rb);
|
||||
|
||||
// 把所有数据读出来、打印、同时清空
|
||||
rt_uint8_t dummy;
|
||||
while (rt_ringbuffer_getchar(rb, &dummy) == RT_EOK)
|
||||
{
|
||||
rt_kprintf("%02x ", dummy); // 打印每一个字节
|
||||
}
|
||||
|
||||
rt_kprintf("\r\n");
|
||||
|
||||
return -1;
|
||||
if (len_rb < LEN_FRAME_HEAD) {
|
||||
return 0;
|
||||
}
|
||||
for (i = 0; i < len_rb - 2; i++) { // 找头三个字节 [帧长, 0x00, id]
|
||||
ret = rt_ringbuffer_getchar(rb, &data);
|
||||
@@ -486,10 +473,77 @@ static int chrg_north_frame_head (struct rt_ringbuffer *rb, rt_uint8_t *head, eI
|
||||
其它说明: -
|
||||
*****************************************************************/
|
||||
int a_number;
|
||||
|
||||
#define NORTH_FRAME_TIMEOUT_MS 100
|
||||
|
||||
static void chrg_north_frame_reset(struct pickup_info_t *pFrame, rt_bool_t release)
|
||||
{
|
||||
if (RT_NULL == pFrame) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (release && (RT_NULL != pFrame->pMB)) {
|
||||
if (RT_NULL != pFrame->pMB->payload) {
|
||||
rt_free(pFrame->pMB->payload);
|
||||
}
|
||||
rt_free(pFrame->pMB);
|
||||
}
|
||||
|
||||
pFrame->last_tick = 0;
|
||||
pFrame->length = 0;
|
||||
pFrame->findhead = 0;
|
||||
pFrame->len_msg = 0;
|
||||
pFrame->pMB = RT_NULL;
|
||||
}
|
||||
|
||||
static int chrg_north_frame_append(struct rt_ringbuffer *rb,
|
||||
struct pickup_info_t *pFrame)
|
||||
{
|
||||
rt_size_t remaining;
|
||||
rt_size_t copied;
|
||||
|
||||
if ((RT_NULL == rb)||(RT_NULL == pFrame)||(RT_NULL == pFrame->pMB)||
|
||||
(RT_NULL == pFrame->pMB->payload)||(pFrame->len_msg <= 0)||
|
||||
(pFrame->length > (rt_size_t)pFrame->len_msg)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
remaining = (rt_size_t)pFrame->len_msg - pFrame->length;
|
||||
if (0 == remaining) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
copied = rt_ringbuffer_data_len(rb);
|
||||
if (copied > remaining) {
|
||||
copied = remaining;
|
||||
}
|
||||
if (copied > 0) {
|
||||
copied = rt_ringbuffer_get(rb,
|
||||
&pFrame->pMB->payload[pFrame->length], copied);
|
||||
pFrame->length += copied;
|
||||
pFrame->last_tick = rt_tick_get();
|
||||
}
|
||||
|
||||
return (pFrame->length == (rt_size_t)pFrame->len_msg) ? 1 : 0;
|
||||
}
|
||||
|
||||
static void chrg_north_frame_dispatch(struct pickup_info_t *pFrame)
|
||||
{
|
||||
struct mb_msg_t *pMB = pFrame->pMB;
|
||||
|
||||
if (pMB->length == 21) {
|
||||
chrg_north_handle_Seting_Volt(pMB->payload, pMB->length);
|
||||
}
|
||||
|
||||
chrg_north_frame_reset(pFrame, RT_FALSE);
|
||||
chrg_thread_mb_send(IDX_THR_NORTH, pMB);
|
||||
}
|
||||
|
||||
static int chrg_north_pickup_frame (struct rt_ringbuffer *rb,
|
||||
struct pickup_info_t *pFrame, eIDX_NOR_CH idx)
|
||||
{
|
||||
int cnt = 0;
|
||||
int status = 0;
|
||||
rt_size_t len_rb = 0;
|
||||
if ((RT_NULL == rb)||(RT_NULL == pFrame)) {
|
||||
return -1;
|
||||
@@ -503,63 +557,52 @@ static int chrg_north_pickup_frame (struct rt_ringbuffer *rb,
|
||||
pFrame->len_msg = chrg_north_frame_head(rb, pFrame->head, pSW->id);
|
||||
// rt_kprintf("msg=:%d",pFrame->len_msg);
|
||||
if (pFrame->len_msg > 0) {
|
||||
if ((pFrame->len_msg < LEN_FRAME_HEAD)||
|
||||
(pFrame->len_msg >= SIZE_BUF_TTY)) {
|
||||
LOG_E("invalid msg length: %d", pFrame->len_msg);
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return -3;
|
||||
}
|
||||
|
||||
pFrame->pMB = (struct mb_msg_t *)rt_malloc(sizeof(struct mb_msg_t));
|
||||
if (RT_NULL == pFrame->pMB) {
|
||||
LOG_E("malloc mb failed.");
|
||||
chrg_north_frame_reset(pFrame, RT_FALSE);
|
||||
return -2;
|
||||
}
|
||||
pFrame->pMB->length = pFrame->len_msg;
|
||||
if (pFrame->pMB->length >= SIZE_BUF_TTY) {
|
||||
rt_free(pFrame->pMB);
|
||||
pFrame->pMB = RT_NULL;
|
||||
LOG_E("too long msg.");
|
||||
return -3;
|
||||
}
|
||||
pFrame->pMB->payload = RT_NULL;
|
||||
pFrame->pMB->payload = (rt_uint8_t *)rt_malloc(pFrame->len_msg);
|
||||
if (RT_NULL == pFrame->pMB->payload) {
|
||||
LOG_E("malloc buf failed.");
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return -4;
|
||||
}
|
||||
rt_memcpy(pFrame->pMB->payload, pFrame->head, LEN_FRAME_HEAD);
|
||||
pFrame->length = LEN_FRAME_HEAD;
|
||||
pFrame->findhead = 1;
|
||||
pFrame->last_tick = rt_tick_get();
|
||||
|
||||
len_rb = rt_ringbuffer_data_len(rb);
|
||||
// rt_kprintf("len_rb=%d\r\n",len_rb);
|
||||
// rt_kprintf("len=%d",pFrame->len_msg - LEN_FRAME_HEAD);
|
||||
if (len_rb >= pFrame->len_msg - LEN_FRAME_HEAD) {
|
||||
rt_ringbuffer_get(rb, &pFrame->pMB->payload[LEN_FRAME_HEAD],
|
||||
pFrame->len_msg - LEN_FRAME_HEAD);
|
||||
if(pFrame->pMB->length==21){
|
||||
chrg_north_handle_Seting_Volt(pFrame->pMB->payload, pFrame->pMB->length);
|
||||
}
|
||||
chrg_thread_mb_send(IDX_THR_NORTH, pFrame->pMB);
|
||||
pFrame->length = 0;
|
||||
pFrame->len_msg = 0;
|
||||
status = chrg_north_frame_append(rb, pFrame);
|
||||
if (status > 0) {
|
||||
chrg_north_frame_dispatch(pFrame);
|
||||
cnt++;
|
||||
} else if (status < 0) {
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return -5;
|
||||
} else {
|
||||
rt_ringbuffer_get(rb, &pFrame->pMB->payload[LEN_FRAME_HEAD], len_rb);
|
||||
pFrame->length = LEN_FRAME_HEAD + len_rb;
|
||||
pFrame->findhead = 1;
|
||||
pFrame->last_tick = rt_tick_get();
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
len_rb = rt_ringbuffer_data_len(rb);
|
||||
int len_need = pFrame->len_msg - LEN_FRAME_HEAD;
|
||||
if (len_rb >= len_need) {
|
||||
rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_need);
|
||||
|
||||
chrg_thread_mb_send(IDX_THR_NORTH, pFrame->pMB);
|
||||
//chrg_north_pkg_decode(pFrame->pMB->payload, pFrame->len_msg, pSW);
|
||||
|
||||
pFrame->length = 0;
|
||||
pFrame->findhead = 0;
|
||||
pFrame->len_msg = 0;
|
||||
status = chrg_north_frame_append(rb, pFrame);
|
||||
if (status > 0) {
|
||||
chrg_north_frame_dispatch(pFrame);
|
||||
cnt++;
|
||||
} else if (status < 0) {
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return -5;
|
||||
} else {
|
||||
rt_ringbuffer_get(rb, &pFrame->pMB->payload[pFrame->length], len_rb);
|
||||
pFrame->length += len_rb;
|
||||
pFrame->last_tick = rt_tick_get();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -587,6 +630,7 @@ void chrg_north_thread_entry (void *data)
|
||||
}
|
||||
|
||||
int len = 0;
|
||||
rt_size_t put_len = 0;
|
||||
struct chrg_tty_t *pTTY = RT_NULL;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
//北向协议板线程体通道初始化为CH1,
|
||||
@@ -613,6 +657,13 @@ void chrg_north_thread_entry (void *data)
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (pNOR->frame.findhead &&
|
||||
((rt_tick_t)(rt_tick_get() - pNOR->frame.last_tick) >=
|
||||
rt_tick_from_millisecond(NORTH_FRAME_TIMEOUT_MS))) {
|
||||
chrg_north_frame_reset(&pNOR->frame, RT_TRUE);
|
||||
LOG_W("partial frame timeout");
|
||||
}
|
||||
|
||||
rt_memset(pNOR->rx_buf, 0, sizeof(pNOR->rx_buf));
|
||||
len = chrg_tty_recv(pTTY, pNOR->rx_buf, sizeof(pNOR->rx_buf));
|
||||
if (len <= 0) {
|
||||
@@ -620,17 +671,16 @@ void chrg_north_thread_entry (void *data)
|
||||
continue;
|
||||
}
|
||||
|
||||
rt_ringbuffer_put(pNOR->rb, pNOR->rx_buf, len);
|
||||
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);
|
||||
rt_ringbuffer_reset(pNOR->rb);
|
||||
chrg_north_frame_reset(&pNOR->frame, RT_TRUE);
|
||||
continue;
|
||||
}
|
||||
#if DEBUG_NORTH
|
||||
LOG_HEX("recvN", 32, pNOR->rx_buf, len);
|
||||
#endif
|
||||
if (1 == pNOR->frame.findhead) {
|
||||
if (rt_tick_get() >= pNOR->frame.last_tick + 100) { // 100ms
|
||||
pNOR->frame.findhead = 0; // reset
|
||||
//LOG_E("timeo\r\n");
|
||||
}
|
||||
}
|
||||
|
||||
chrg_north_pickup_frame(pNOR->rb, &pNOR->frame, pNOR->idx);
|
||||
}
|
||||
}
|
||||
@@ -654,5 +704,25 @@ static int north_ch(rt_uint8_t argc, char **argv)
|
||||
|
||||
MSH_CMD_EXPORT(north_ch, north channel select);
|
||||
|
||||
static int north_diag(int argc, char **argv)
|
||||
{
|
||||
rt_uint8_t i;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
struct chrg_rollnor_t *pROLL = &chrgrollnor;
|
||||
|
||||
rt_kprintf("roll: run=%d idx=%d ch=%d type=%d sub=%d\r\n",
|
||||
pROLL->run, pROLL->idx, pROLL->ch, pROLL->type, pROLL->sub);
|
||||
rt_kprintf("rx: rb_len=%d findhead=%d frame_len=%d received=%d\r\n",
|
||||
pNOR->rb ? rt_ringbuffer_data_len(pNOR->rb) : 0,
|
||||
pNOR->frame.findhead, pNOR->frame.len_msg, pNOR->frame.length);
|
||||
for (i = 0; i < TOTAL_NOR_CHS; i++) {
|
||||
rt_kprintf("ch%d: enable=%d id=%d sub=%d\r\n", i,
|
||||
pNOR->enable[i], pNOR->sw[i].id, pNOR->sw[i].sub);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
MSH_CMD_EXPORT(north_diag, show north polling and frame state);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user