chore: 更新调试宏定义并关闭默认打印

1.  更新chrg_north.h中的调试宏命名规范,拆分原有DEBUG_NORTH为多个细分调试开关
2.  注释掉mb_crc16函数中默认的串口打印调试代码
3.  新增南向命令发送时的调试打印开关
4.  统一各模块调试宏的默认关闭状态
5.  新增大量.codex-*目录下的NuGet中间生成文件
This commit is contained in:
wrh
2026-07-30 11:39:16 +08:00
parent 79c63f7b8e
commit f21492fa50
180 changed files with 82212 additions and 376 deletions
+6 -3
View File
@@ -150,9 +150,12 @@ int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len)
u16_to_u8v(value, &buf[4]);
crc = mb_crc16(buf, 6);
u16_to_u8v(swap_u16(crc), &buf[6]);
rt_kprintf("addr = %d,reg = %02x,value = %02x\n",addr,reg,value);
return chrg_south_send(buf, 8);
}
#if SOUTH_COMMAND_DEBUG
rt_kprintf("south write: addr=%d reg=0x%04x value=0x%04x\n",
addr, reg, value);
#endif
return chrg_south_send(buf, 8);
}
/*****************************************************************
函数名称: chrg_eload_send_ymodem_data
@@ -76,7 +76,7 @@ int chrg_north_pkg_decode (rt_uint8_t *data, rt_uint16_t length, struct chrg_swi
struct get_vol_ack_t *pAck = (struct get_vol_ack_t *)data;
pS->vc.voltage = pAck->voltage;
pS->vc.version = pAck->version;
// ?
//
}
break;
+41 -22
View File
@@ -33,6 +33,9 @@ static int chrg_source_work_running(eIDX_SOU_CH idx,
int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
{
/* Source启动参数一次入队,最后发送WORK_START使功率板开始输出。 */
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
return -1;
}
rt_uint16_t regs[5] = {
REG_ELOAD,
REG_MODE,
@@ -48,9 +51,6 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
WORK_START
};
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
return -1;
}
return chrg_sou_com_batch_submit(idx, regs, vals, 5);
}
@@ -134,7 +134,8 @@ static int chrg_source_work_running(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
输入参数: idx:南向功率通道编号 pSW:当前通道控制结构体
输出参数: 清除目标电压、运行、使能和在线标志,关闭北向继电器
返回说明: 0:停止成功 非0:停止命令提交失败
其它说明: 先写电压0再发送WORK_STOP;只有整批命令入队成功后才清零set_volt
其它说明: 依次关闭功率板两路继电器、清零电压并发送WORK_STOP;
只有整批命令入队成功后才清零set_volt
*****************************************************************/
static int chrg_source_work_stop(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
{
@@ -142,11 +143,11 @@ static int chrg_source_work_stop(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
struct chrg_north_t *pNOR = &chrgnorth;
int ret;
rt_uint16_t regs[2] = {REG_VOLTAGE_OUT + 1, REG_WORK};
rt_uint16_t vals[2] = {0, WORK_STOP};
rt_uint16_t regs[3] = {REG_REL_ON, REG_VOLTAGE_OUT + 1, REG_WORK};
rt_uint16_t vals[3] = {ALL_REL_OFF, 0, WORK_STOP};
/* 电压清零与停止必须保持顺序,避免下次启动继承旧目标而产生过压。 */
ret = chrg_sou_com_batch_submit(idx, regs, vals, 2);
/* 先断开两路功率继电器,再清零输出并停止,避免关机瞬间继续向外供电。 */
ret = chrg_sou_com_batch_submit(idx, regs, vals, 3);
if (ret != 0) {
return ret;
}
@@ -304,11 +305,13 @@ int source_set_cc_choose (rt_uint8_t cc_set)
data[0] = cc_set;
chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_CC_CHOOSE, data, 1, frame, &len);
rt_kprintf("\n");
for(int i=0;i<len;i++){
rt_kprintf("%d ");
#if NORTH_SOURCE_DEBUG
rt_kprintf("source set cc frame:");
for (int i = 0; i < len; i++) {
rt_kprintf(" %02x", frame[i]);
}
rt_kprintf("\n");
#endif
return chrg_north_send(frame, len);
}
@@ -326,9 +329,13 @@ rt_uint8_t parse_mulit_gear_One(rt_uint16_t min_volt_mv,rt_uint16_t max_volt_mv,
Pro_Group_VCMM[0][4] = (max_volt_mv >> 8) & 0xFF; // vmax_H
Pro_Group_VCMM[0][5] = max_volt_mv & 0xFF; // vmax_L
Pro_Group_VCMM[0][6] = (max_curr_ma >> 8) & 0xFF; // cur_set_H
#if NORTH_SOURCE_DEBUG
rt_kprintf("H_C=%02x",Pro_Group_VCMM[0][6]);
#endif
Pro_Group_VCMM[0][7] = max_curr_ma & 0xFF; // cur_set_L
#if NORTH_SOURCE_DEBUG
rt_kprintf("L_C=%02x\n",Pro_Group_VCMM[0][7]);
#endif
return 0;
}
@@ -360,12 +367,12 @@ void parse_power_single_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t
// rt_kprintf("%0x",pData[i]);
// }
// rt_kprintf("\n");
#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
rt_kprintf("one_gear");
rt_kprintf("min_volt_mv = %d\n",min_volt_mv);
rt_kprintf("max_volt_mv = %d\n",max_volt_mv);
rt_kprintf("prtect_curr= %04x",*protect_curr);
#endif
#endif
*pro_gear_idx = 1; // 单档协议固定1
// 按协议命令码赋值
switch (protoCmd)
@@ -472,7 +479,7 @@ void parse_pd_11group_pdo(rt_uint8_t *pdoData, rt_uint8_t pdo_group_num) {
// 电流/功率拆分
Pro_Group_VCMM[i][6] = (cur_power >> 8) & 0xFF; // cur_set_H
Pro_Group_VCMM[i][7] = cur_power & 0xFF; // cur_set_L
#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
// 调试打印
rt_kprintf("max_H=%d",Pro_Group_VCMM[i][4]);
rt_kprintf("max_L=%d",Pro_Group_VCMM[i][5]);
@@ -513,9 +520,13 @@ void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t re
rt_int16_t comp_volt_mv = 0; // 补偿电压(mV)
// 数据区索引:0=状态+通道,1=CC线,2=恒压恒流模式,3=PDO组数(bit12-15)
#if NORTH_SOURCE_DEBUG
rt_kprintf("pdata=%04x",pData[3]);
#endif
pdo_group_num = (pData[3] >> 4) & 0x0F; // Bit12-15提取组数
#if NORTH_SOURCE_DEBUG
rt_kprintf("num=%d\n",pdo_group_num);
#endif
*pro = PRO_PD0PSS;
*pro_gear_idx = pdo_group_num;
// 解析11组PDO(小端序,44字节)
@@ -524,9 +535,9 @@ void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t re
// 解析保留字段(20字节) + 保护电流 + 补偿电压
*protect_ma = u8v_to_u16(&pData[4 + 44 + 20]); // 67-68字节
comp_volt_mv = (rt_int16_t)u8v_to_u16(&pData[4 + 44 + 22]); // 69-70字节
// #if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
rt_kprintf("project_curr=%d mA, add_volt=%d mV\n", *protect_ma, comp_volt_mv);
// #endif.
#endif
}
/*****************************************************************
@@ -614,7 +625,7 @@ rt_uint8_t parse_mulit_gear_more(rt_uint8_t *pData, rt_uint8_t gear_num) {
Pro_Group_VCMM[i][5] = vmax_mv & 0xFF; // vmax_L
Pro_Group_VCMM[i][6] = (cur_power >> 8) & 0xFF; // cur_set_H
Pro_Group_VCMM[i][7] = cur_power & 0xFF; // cur_set_L
#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
// 调试打印
rt_kprintf("parse_mulit_gear_pd0 PDO[%d]:rc=0x%02X, pps=0x%02X,V_Min=%dmV,V_MAX=%dmV,C/P=%d\n",
i, Pro_Group_VCMM[i][0], Pro_Group_VCMM[i][1], vmin_mv, vmax_mv, cur_power);
@@ -649,7 +660,9 @@ void parse_multi_gear_more(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t r
return;
}
*pro_gear_idx = gear_num;
#if NORTH_SOURCE_DEBUG
rt_kprintf("pro_gear_idx = %d\n",gear_num);
#endif
// 解析保护电流和补偿电压(不同协议偏移不同)
switch (protoCmd)
{
@@ -668,7 +681,7 @@ void parse_multi_gear_more(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t r
}
*protect_ma = u8v_to_u16(&pData[4 + 16]); // 19-20字节
comp_volt_mv = (rt_int16_t)u8v_to_u16(&pData[4 + 18]);
#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
for(int i = 0;i<30;i++){
rt_kprintf("data[%d]=%02x",i,pData[i]);
}
@@ -730,7 +743,7 @@ rt_uint8_t parse_ufcs_gear_more(rt_uint8_t *pData, rt_uint8_t gear_num) {
Pro_Group_VCMM[i][5] = vmax_mv & 0xFF;
Pro_Group_VCMM[i][6] = (cur_ma >> 8) & 0xFF;
Pro_Group_VCMM[i][7] = cur_ma & 0xFF;
#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
// ================= 打印格式 =================
rt_kprintf("parse_ufcs_gear_more PDO[%d]:PPS/AVS,V_Min=%dmV,V_MAX=%dmV,Max_Current=%dmA\n",
i, vmin_mv, vmax_mv, cur_ma);
@@ -774,10 +787,10 @@ void parse_power_ufcs(rt_uint8_t *pData, rt_uint16_t reqLen, uint8_t *pro_gear_i
// rt_kprintf("data[%d]=%02x",i,pData[i]);
// }
comp_volt_mv = 0;//(rt_int16_t)u8v_to_u16(&pData[3 + 14]);
//#if PRO_TEST_DEBUG
#if NORTH_SOURCE_DEBUG
rt_kprintf("parse_power_ufcs:gear=%d,protect=%dmA,comp=%dmV\n",
gear_num,*protect_ma, comp_volt_mv);
//#endif
#endif
// 调用下面的循环解析
parse_ufcs_gear_more(&pData[4], gear_num);
@@ -1094,7 +1107,13 @@ int source_set_pro(rt_uint8_t pro, struct chrg_switch_t *pSW)
idx += fill_len;
send_len = idx; // 总填充字节数
chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_PROTOCOL, data, send_len, frame, &len);
rt_kprintf("idx = %d ",idx);
#if NORTH_SOURCE_DEBUG
rt_kprintf("source protocol frame:");
for (rt_uint16_t i = 0; i < len; i++) {
rt_kprintf(" %02x", frame[i]);
}
rt_kprintf("\n");
#endif
// for(rt_uint8_t i=0;i<idx;i++){
// rt_kprintf("%02x",data[i]);
// }
+6 -6
View File
@@ -75,12 +75,12 @@ rt_uint16_t mb_crc16 (rt_uint8_t *pucFrame, rt_uint16_t usLen)
rt_uint8_t ucCRCLo = 0xFF;
int iIndex;
if(usLen==8){
for(int i = 0;i<usLen;i++){
rt_kprintf("%02x ",pucFrame[i]);
}
rt_kprintf("\n");
}
// if(usLen==8){
// for(int i = 0;i<usLen;i++){
// rt_kprintf("%02x ",pucFrame[i]);
// }
// rt_kprintf("\n");
// }
while ( usLen-- ) {
iIndex = ucCRCLo ^ *(pucFrame++);