chore: 更新调试宏定义并关闭默认打印
1. 更新chrg_north.h中的调试宏命名规范,拆分原有DEBUG_NORTH为多个细分调试开关 2. 注释掉mb_crc16函数中默认的串口打印调试代码 3. 新增南向命令发送时的调试打印开关 4. 统一各模块调试宏的默认关闭状态 5. 新增大量.codex-*目录下的NuGet中间生成文件
This commit is contained in:
@@ -201,8 +201,8 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
pSW->VZ = ((frame_data[14] << 8) | frame_data[15]);
|
||||
pSW->VF = ((frame_data[16] << 8) | frame_data[17]);
|
||||
|
||||
#if DEBUG_NORTH
|
||||
// LOG_D("Sink[%d] real volt: %d mV", idx, volt_mv);
|
||||
#if NORTH_SINK_DEBUG
|
||||
LOG_D("Sink[%d] real volt: %d mV", idx, volt_mv);
|
||||
#endif
|
||||
|
||||
if(pSW->sink.On_work == 1 && pSW->sink.test.test_mode == 0) {
|
||||
@@ -243,32 +243,6 @@ void chrg_sink_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
chrg_sink_work(idx,pSW);
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_handle_Seting_Volt
|
||||
函数描述: 根据当前通道角色分发21字节电压电流回码
|
||||
输入参数: frame_data:完整北向回码 frame_len:回码长度
|
||||
输出参数: 调用Source或Sink解析函数更新当前通道状态
|
||||
返回说明: -
|
||||
其它说明: 当前通道由chrgnorth.idx确定,角色由pSW->id确定
|
||||
*****************************************************************/
|
||||
rt_uint8_t change_number = 0;
|
||||
static void chrg_north_handle_Seting_Volt(rt_uint8_t *frame_data, rt_uint16_t frame_len)
|
||||
{
|
||||
// 提取电压/电流值
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
rt_uint16_t idx = pNOR->idx;
|
||||
struct chrg_switch_t *pSW = &chrgnorth.sw[idx];
|
||||
|
||||
static uint8_t number = 0;
|
||||
//电源部分
|
||||
if(pSW->id==ID_SOURCE){
|
||||
chrg_source_parse(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR);
|
||||
}
|
||||
else{
|
||||
chrg_sink_parse(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR);
|
||||
}
|
||||
}
|
||||
|
||||
struct chrg_north_t chrgnorth = {
|
||||
.devname = DEV_NAME_NORTH, // 设备名
|
||||
.tty = RT_NULL, // 串口句柄初始为空
|
||||
@@ -373,7 +347,7 @@ int chrg_north_send (rt_uint8_t *data, rt_size_t length)
|
||||
struct chrg_tty_t *pTTY = chrgnorth.tty;
|
||||
|
||||
if (RT_NULL != pTTY) {
|
||||
#if DEBUG_NORTH //是否打印
|
||||
#if NORTH_FRAME_DEBUG
|
||||
LOG_HEX("sendN", 32, data, length);
|
||||
#endif
|
||||
ret = chrg_tty_send(pTTY, data, length);
|
||||
@@ -544,22 +518,44 @@ static int chrg_north_frame_append(struct rt_ringbuffer *rb,
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_north_frame_dispatch
|
||||
函数描述: 分发已经组装完成的北向数据帧
|
||||
函数描述: 校验并分发已经组装完成的北向数据帧
|
||||
输入参数: pFrame:包含完整pMB消息的帧接收上下文
|
||||
输出参数: 21字节回码进入电压解析,同时完整消息发送到北向轮询邮箱
|
||||
输出参数: 合法完整帧发送到北向轮询邮箱
|
||||
返回说明: -
|
||||
其它说明: 消息所有权移交邮箱后只复位上下文,不在此处释放pMB
|
||||
其它说明: 本函数只负责帧结构和CRC校验,不执行Source/Sink业务解析;
|
||||
校验失败时释放消息,校验成功后将消息所有权移交北向轮询线程
|
||||
*****************************************************************/
|
||||
static void chrg_north_frame_dispatch(struct pickup_info_t *pFrame)
|
||||
{
|
||||
struct mb_msg_t *pMB = pFrame->pMB;
|
||||
struct mb_msg_t *pMB;
|
||||
rt_uint8_t crc_calc;
|
||||
rt_uint8_t crc_recv;
|
||||
|
||||
if (pMB->length == 21) {
|
||||
chrg_north_handle_Seting_Volt(pMB->payload, pMB->length);
|
||||
if (pFrame == RT_NULL) {
|
||||
return;
|
||||
}
|
||||
pMB = pFrame->pMB;
|
||||
if ((pMB == RT_NULL) || (pMB->payload == RT_NULL) ||
|
||||
(pMB->length < MIN_FRAME_LENGTH) ||
|
||||
(pMB->length > 0xFFU) ||
|
||||
(pMB->payload[0] != (rt_uint8_t)pMB->length) ||
|
||||
(pMB->payload[1] != 0x00U)) {
|
||||
LOG_E("invalid north frame: len=%d", pMB ? pMB->length : 0);
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return;
|
||||
}
|
||||
|
||||
crc_calc = calc_crc8(pMB->payload, (rt_uint8_t)(pMB->length - 1U));
|
||||
crc_recv = pMB->payload[pMB->length - 1U];
|
||||
if (crc_calc != crc_recv) {
|
||||
LOG_E("north crc failed: len=%d calc=%02x recv=%02x",
|
||||
pMB->length, crc_calc, crc_recv);
|
||||
chrg_north_frame_reset(pFrame, RT_TRUE);
|
||||
return;
|
||||
}
|
||||
|
||||
chrg_north_frame_reset(pFrame, RT_FALSE);
|
||||
chrg_thread_mb_send(IDX_THR_NORTH, pMB);
|
||||
(void)chrg_thread_mb_send(IDX_THR_NORTH, pMB);
|
||||
}
|
||||
|
||||
static int chrg_north_pickup_frame (struct rt_ringbuffer *rb,
|
||||
@@ -701,7 +697,7 @@ void chrg_north_thread_entry (void *data)
|
||||
chrg_north_frame_reset(&pNOR->frame, RT_TRUE);
|
||||
continue;
|
||||
}
|
||||
#if DEBUG_NORTH
|
||||
#if NORTH_FRAME_DEBUG
|
||||
LOG_HEX("recvN", 32, pNOR->rx_buf, len);
|
||||
#endif
|
||||
chrg_north_pickup_frame(pNOR->rb, &pNOR->frame, pNOR->idx);
|
||||
|
||||
Reference in New Issue
Block a user