feat: 新增电源/负载切换功能,优化通道切换逻辑
1. 新增SINK_WORK_SWITCH和SOURCE_WORK_SWITCH状态,实现切换流程 2. 实现chrg_sink_work_switch和chrg_source_work_switch切换处理函数 3. 修改Keil工程ROM起始地址为0x8000000 4. 开启north线程调试输出,调整初始通道使能状态 5. 简化串口包编码调试打印,优化source初始化寄存器配置 6. 重构modbus通道切换逻辑,支持活跃状态下的角色切换 7. 清理部分冗余调试代码和注释 8. 重构bootloader代码,简化启动流程
This commit is contained in:
@@ -1867,21 +1867,8 @@ static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_
|
||||
struct chrg_thread_t *pTHR_NOR = &chrgthr[IDX_THR_ROLL_NOR];
|
||||
rt_mutex_take(pTHR_NOR->mutex, RT_WAITING_FOREVER);
|
||||
|
||||
/* 保存复制前的真实角色,复制后据此判断是否需要先停后切。 */
|
||||
eIDX_ID old_id = pReal->id;
|
||||
eIDX_ID new_id = pSW->id;
|
||||
rt_bool_t old_active = RT_FALSE;
|
||||
if (old_id == ID_SOURCE) {
|
||||
old_active = (pReal->source.On_Flag || pReal->source.Now_State);
|
||||
} else if (old_id == ID_SINK) {
|
||||
old_active = (pReal->sink.On_work || pReal->sink.Now_State);
|
||||
}
|
||||
|
||||
if ((old_id != new_id) && old_active) {
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
LOG_W("CH%d direction change rejected while active: %d -> %d",
|
||||
ch + 1, old_id, new_id);
|
||||
return MB_EX_SLAVE_BUSY;
|
||||
}
|
||||
|
||||
g_shadow_dirty[ch] = 0;
|
||||
chrg_sink_get_proto_diff(pReal, pSW, &diff_info, &pro_change);
|
||||
@@ -1892,6 +1879,31 @@ static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_
|
||||
rt_uint16_t old_loadc = pReal->sink.loadc;
|
||||
//rt_uint8_t old_sink_test = pReal->sink.test.test_mode;
|
||||
rt_memcpy(pReal, &g_shadow_sw[ch], sizeof(struct chrg_switch_t));
|
||||
eIDX_ID new_id = pReal->id;
|
||||
|
||||
if (old_id != new_id)
|
||||
{
|
||||
int switch_ret;
|
||||
|
||||
/* 复制后按新角色选择状态机,保证id与work_mode归属一致。 */
|
||||
if (new_id == ID_SOURCE) {
|
||||
pReal->source.work_mode = SOURCE_WORK_SWITCH;
|
||||
switch_ret = chrg_source_work_state(ch, pReal);
|
||||
} else {
|
||||
pReal->sink.work_mode = SINK_WORK_SWITCH;
|
||||
switch_ret = chrg_sink_work((eIDX_SOU_CH)ch, pReal);
|
||||
}
|
||||
|
||||
if (switch_ret != 0) {
|
||||
g_shadow_dirty[ch] = 1;
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
return MB_EX_SLAVE_BUSY;
|
||||
}
|
||||
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
return MB_EX_NONE;
|
||||
}
|
||||
|
||||
if (new_id == ID_SINK)
|
||||
{
|
||||
if (sink_work == 0x01) // 负载启动
|
||||
@@ -1961,6 +1973,7 @@ static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_
|
||||
else if (new_id == ID_SOURCE && source_work == 0x01)
|
||||
{
|
||||
/* COM只触发状态,初始化命令由Source状态机统一下发。 */
|
||||
pReal->sub = IDX_SET_SOURCE_CC_SET;
|
||||
pReal->source.On_Flag = 1;
|
||||
pReal->source.work_mode = SOURCE_WORK_INIT;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user