refactor: 重构南向充电控制与参数管理逻辑

1.  apps/chrg/applications/thread/chrg_south.c: 新增支持YM_CAN应答类型处理
2.  apps/chrg/applications/utils/chrg_source.h: 移除冗余的max_vol、protective_curr字段
3.  apps/chrg/applications/utils/chrg_sink.h: 新增OCP测试状态枚举与注释
4.  apps/chrg/applications/thread/chrg_comm.h: 移除废弃的sink_proto_diff_t结构体及相关声明
5.  apps/chrg/applications/thread/chrg_roll_sou.h/.c: 重构南向升级逻辑,新增帧缓存与安全发送机制
6.  apps/chrg/applications/utils/chrg_eload.c: 重构Ymodem应答队列,优化并发访问处理
7.  apps/chrg/applications/utils/chrg_sink.c: 新增OCP测试功能实现与状态切换逻辑
8.  apps/chrg/applications/utils/chrg_source.c: 替换protective_curr为vc.set_current,移除冗余enable标志
9.  apps/chrg/applications/thread/chrg_north.c: 重构电源电压控制逻辑,简化快充输出流程
10. apps/chrg/applications/thread/chrg_comm.c: 全面重构Ymodem升级协议与参数差异处理逻辑
This commit is contained in:
wrh
2026-07-25 10:16:45 +08:00
parent 1fc998f168
commit 4beeb02382
11 changed files with 927 additions and 426 deletions
+45 -11
View File
@@ -32,10 +32,31 @@ static rt_uint8_t g_eload_ymodem_ready = 0; // 应答就绪标志(1=有新应
函数描述: 存储南向板返回的ymodem应答字节(由chrg_roll_sou在RUN_UPDATA调用)
输入参数: resp: 南向ymodem应答 (ACK=0x06 / NAK=0x15 / 'C'=0x43)
*****************************************************************/
#define ELOAD_YMODEM_RESP_DEPTH 8
static rt_uint8_t g_ymodem_resp_queue[ELOAD_YMODEM_RESP_DEPTH];
static rt_uint8_t g_ymodem_resp_read = 0;
static rt_uint8_t g_ymodem_resp_write = 0;
static rt_uint8_t g_ymodem_resp_count = 0;
void chrg_eload_set_ymodem_resp(rt_uint8_t resp)
{
g_eload_ymodem_resp = resp;
g_eload_ymodem_ready = 1;
rt_base_t level = rt_hw_interrupt_disable();
/* 队列已满时丢弃周期性的C,保留更关键的ACK/NAK/CAN。 */
if (g_ymodem_resp_count >= ELOAD_YMODEM_RESP_DEPTH) {
if (resp == ACK_C) {
rt_hw_interrupt_enable(level);
return;
}
g_ymodem_resp_read = (g_ymodem_resp_read + 1) % ELOAD_YMODEM_RESP_DEPTH;
g_ymodem_resp_count--;
}
g_ymodem_resp_queue[g_ymodem_resp_write] = resp;
g_ymodem_resp_write = (g_ymodem_resp_write + 1) % ELOAD_YMODEM_RESP_DEPTH;
g_ymodem_resp_count++;
g_eload_ymodem_resp = resp;
g_eload_ymodem_ready = 1;
rt_hw_interrupt_enable(level);
}
/*****************************************************************
@@ -45,13 +66,19 @@ void chrg_eload_set_ymodem_resp(rt_uint8_t resp)
*****************************************************************/
rt_uint8_t chrg_eload_get_ymodem_resp(void)
{
rt_uint8_t resp = 0;
if (g_eload_ymodem_ready) {
resp = g_eload_ymodem_resp;
g_eload_ymodem_ready = 0;
g_eload_ymodem_resp = 0;
}
return resp;
rt_uint8_t resp = 0;
rt_base_t level = rt_hw_interrupt_disable();
if (g_ymodem_resp_count > 0) {
resp = g_ymodem_resp_queue[g_ymodem_resp_read];
g_ymodem_resp_read = (g_ymodem_resp_read + 1) % ELOAD_YMODEM_RESP_DEPTH;
g_ymodem_resp_count--;
}
g_eload_ymodem_ready = (g_ymodem_resp_count > 0);
g_eload_ymodem_resp = g_eload_ymodem_ready ?
g_ymodem_resp_queue[g_ymodem_resp_read] : 0;
rt_hw_interrupt_enable(level);
return resp;
}
/*****************************************************************
@@ -60,8 +87,15 @@ rt_uint8_t chrg_eload_get_ymodem_resp(void)
*****************************************************************/
void chrg_eload_clear_ymodem_resp(void)
{
g_eload_ymodem_resp = 0;
g_eload_ymodem_ready = 0;
rt_base_t level = rt_hw_interrupt_disable();
g_ymodem_resp_read = 0;
g_ymodem_resp_write = 0;
g_ymodem_resp_count = 0;
g_eload_ymodem_resp = 0;
g_eload_ymodem_ready = 0;
rt_memset(g_ymodem_resp_queue, 0, sizeof(g_ymodem_resp_queue));
rt_hw_interrupt_enable(level);
}
static int memcmp_8bytes(const rt_uint8_t *buf1, const rt_uint8_t *buf2)
+39 -3
View File
@@ -144,10 +144,14 @@ static int chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
rt_uint16_t vals[5] = {0, pSW->CV_mode,pSW->sink.volt_on, 0, 0};
rt_uint8_t count = 3;
if (pSW->sink.test.test_mode_old == 1) {
if (pSW->sink.test.test_mode_old == SINK_TEST_SHORT) {
regs[count] = ModbusRTU_ShortTest_CMD_MODE_FLAG;
vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP;
} else if (pSW->sink.test.test_mode_old == 3) {
} else if (pSW->sink.test.test_mode_old == SINK_TEST_OCP) {
/* 从OCP测试返回普通负载时,先停止功率板的OCP测试状态机。 */
regs[count] = ModbusRTU_OCPTest_CMD_MODE_FLAG;
vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP;
} else if (pSW->sink.test.test_mode_old == SINK_TEST_DYNA) {
regs[count] = ModbusRTU_DYNA_CMD_MODE_FLAG;
vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP;
}
@@ -159,7 +163,6 @@ static int chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
}
pSW->sink.On_work = 1;
pSOU->enable[idx] = 1;
pSOU->online[idx] = 1;
pNOR->enable[idx] = 1;
@@ -315,6 +318,36 @@ static int chrg_sink_TEST_SHORT_ON(rt_uint8_t ch, struct chrg_switch_t *pSW)
return chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, regs, vals, 3);
}
/*****************************************************************
函数名称: chrg_sink_TEST_OCP_ON
函数描述: 配置并启动负载OCP过流保护测试
输入参数: ch:南向功率通道编号 pSW:当前通道控制结构体
输出参数: -
返回说明: 0:命令提交成功 非0:命令提交失败
其它说明: 一次提交功率继电器、OCP参数、测试命令和WORK_START;
set_mode为0时保持指定时间后恢复,为1时一直保持
*****************************************************************/
static int chrg_sink_TEST_OCP_ON(rt_uint8_t ch, struct chrg_switch_t *pSW)
{
struct test_OCP *pOCP = &pSW->sink.test.OCP_test;
rt_uint16_t regs[11] = {REG_REL_ON, REG_REL_ON,
ModbusRTU_OCPTest_StartCurrent, ModbusRTU_OCPTest_StopCurrent,
ModbusRTU_OCPTest_Step_CURR, ModbusRTU_OCPTest_Step_Hold_Time,
ModbusRTU_OCPTest_Vtrig_Stop, ModbusRTU_OCPTest_Hold_Time,
ModbusRTU_OCPTest_HOLD_CURR, ModbusRTU_OCPTest_CMD_MODE_FLAG,
REG_WORK};
rt_uint16_t vals[11] = {0x02, 0x03,
pOCP->start_curr, pOCP->end_curr, pOCP->change_curr,
pOCP->change_keep_time, pOCP->stop_volt, pOCP->hold_time,
pOCP->hold_curr, ModbusRTU_DYNA_CMD_MODE_RUN_NO_CURR,
WORK_START};
if (pOCP->set_mode != 0) {
vals[9] = ModbusRTU_DYNA_CMD_MODE_RUN_ALWAYS_KEPP;
}
return chrg_sou_com_batch_submit((eIDX_SOU_CH)ch, regs, vals, 11);
}
/*****************************************************************
函数名称: chrg_sink_work
@@ -354,6 +387,9 @@ int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
case SINK_WORK_ON_TEST_SHORT:
ret = chrg_sink_TEST_SHORT_ON(idx,pSW);
break;
case SINK_WORK_ON_TEST_OCP:
ret = chrg_sink_TEST_OCP_ON(idx,pSW);
break;
case SINK_WORK_LOW:
ret = chrg_sink_nor_work_low(idx,pSW);
break;
+1 -2
View File
@@ -211,6 +211,7 @@ enum {
SINK_WORK_SWITCH, // 停止旧电源后进入负载INIT
SINK_WORK_ON_TEST_DYNA,
SINK_WORK_ON_TEST_SHORT,
SINK_WORK_ON_TEST_OCP, // 配置并启动OCP过流保护测试
};
// sink 参数结构
@@ -234,11 +235,9 @@ struct chrg_sink_t {
rt_uint8_t work_mode; // 0=停止 1=工作 2=低电压
};
//纹波寄存器
#define ModbusRTU_Ripple_Value 0x35 //读取纹波
/******************** 负载测试 ************************* */
#define ModbusRTU_CAL_WriteEnable 0x34 //使能写入;0x4361代表使能写入;C+a ASCII码
#define ModbusRTU_Test_CMD 0x4361 //
+26 -27
View File
@@ -41,7 +41,7 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
pSW->CV_mode,
0x03,
0,
pSW->source.protective_curr,
pSW->source.vc.set_current,
WORK_START
};
@@ -72,8 +72,7 @@ static int chrg_source_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
}
pSW->source.On_Flag = 1;
pSOU->enable[idx] = 1;
pNOR->enable[idx] = 1;
pNOR->enable[idx] = 1;
pSOU->online[idx] = 1;
chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SOURCE);
pSW->source.work_mode = SOURCE_WORK_WAIT;
@@ -902,8 +901,8 @@ rt_uint8_t pd_fill_single_group_need_src_com(rt_uint8_t *data, rt_uint8_t start_
data[idx++] = 0x13;
data[idx++] = 0x88;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -914,11 +913,11 @@ rt_uint8_t pd_fill_single_group_need_src_com(rt_uint8_t *data, rt_uint8_t start_
data[idx++] = source->min_vol >> 8;
data[idx++] = source->min_vol & 0xFF;
// 3. 最大电压(高+低,直接取已拆分好的值)
data[idx++] = source->max_vol >> 8;
data[idx++] = source->max_vol & 0xFF;
data[idx++] = source->vc.set_voltage >> 8;
data[idx++] = source->vc.set_voltage & 0xFF;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -936,11 +935,11 @@ rt_uint8_t pd_fill_single_group_no_src_com(rt_uint8_t *data, rt_uint8_t start_id
data[idx++] = source->min_vol >> 8;
data[idx++] = source->min_vol & 0xFF;
// 3. 最大电压(高+低,直接取已拆分好的值)
data[idx++] = source->max_vol >> 8;
data[idx++] = source->max_vol & 0xFF;
data[idx++] = source->vc.set_voltage >> 8;
data[idx++] = source->vc.set_voltage & 0xFF;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -961,8 +960,8 @@ rt_uint8_t pd_fill_single_group_FCP_AFC(rt_uint8_t *data, rt_uint8_t start_idx,s
data[idx++] = 0x13;
data[idx++] = 0x88;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -970,14 +969,14 @@ rt_uint8_t pd_fill_single_group_FCP_AFC(rt_uint8_t *data, rt_uint8_t start_idx,s
data[idx++] = 0x00;
data[idx++] = 0x00;
// 2. 最小电压(高+低,直接取已拆分好的值)
data[idx++] = source->max_vol >> 8;
data[idx++] = source->max_vol & 0xFF;
data[idx++] = source->vc.set_voltage >> 8;
data[idx++] = source->vc.set_voltage & 0xFF;
// 3. 最大电压(高+低,直接取已拆分好的值)
data[idx++] = source->max_vol >> 8;
data[idx++] = source->max_vol & 0xFF;
data[idx++] = source->vc.set_voltage >> 8;
data[idx++] = source->vc.set_voltage & 0xFF;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -998,8 +997,8 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru
data[idx++] = 0x13;
data[idx++] = 0x88;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -1010,11 +1009,11 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru
data[idx++] = source->min_vol >> 8;
data[idx++] = source->min_vol & 0xFF;
// 3. 最大电压(高+低,直接取已拆分好的值)
data[idx++] = source->max_vol >> 8;
data[idx++] = source->max_vol & 0xFF;
data[idx++] = source->vc.set_voltage >> 8;
data[idx++] = source->vc.set_voltage & 0xFF;
// 4. 电流/功率(高+低,直接取已拆分好的值)
data[idx++] = source->protective_curr >> 8;
data[idx++] = source->protective_curr & 0xFF;
data[idx++] = source->vc.set_current >> 8;
data[idx++] = source->vc.set_current & 0xFF;
// 5. 保留位6字节(直接填0)
memset(&data[idx], 0x00, 6);
idx+=6;
@@ -150,10 +150,8 @@ struct chrg_src_t {
rt_uint8_t pps; // PPS类型
rt_uint8_t pro_gear_idx; // 挡位
rt_uint16_t min_vol; // 最小电压 mV
rt_uint16_t max_vol; // 最大电压 mV
rt_uint8_t vol_lvl; // CC线电平
rt_uint8_t cc_set; // cc线选择 //0代表1+2,1代表cc1,2代表cc2
rt_uint16_t protective_curr; // 保护电流
rt_uint8_t Now_State; // 当前状态
rt_uint8_t On_Flag; // 启动总标志(0/1)
rt_uint8_t LCD_Set_Pro_Flag; // LCD设置协议标志位