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:
@@ -65,7 +65,7 @@ struct chrg_comm_t chrgcomm = {
|
||||
|
||||
static void chrg_mb_write_sink(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW);
|
||||
static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW);
|
||||
static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU);
|
||||
static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value, struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU);
|
||||
|
||||
/*! \brief Function to set bits in a byte buffer.
|
||||
*
|
||||
@@ -960,7 +960,10 @@ eMBException funcWriteHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t reqLen,
|
||||
}
|
||||
else if (regAddress_H == HOLD_REG_SYS_BASE)
|
||||
{
|
||||
chrg_mb_write_sys(ch, reg_offset, sou_value, pSW, pNOR, pSOU);
|
||||
eStatus = chrg_mb_write_sys(ch, reg_offset, sou_value, pSW, pNOR, pSOU);
|
||||
if (eStatus != MB_EX_NONE) {
|
||||
return eStatus;
|
||||
}
|
||||
}
|
||||
|
||||
build_response:
|
||||
@@ -1355,23 +1358,23 @@ eMBException funcSinkTest (rt_uint8_t *reqFrame, rt_uint16_t reqLen,
|
||||
rt_kprintf("test_flag=%d\n",pTset->test_mode);
|
||||
#endif
|
||||
/*********************************************************/
|
||||
switch(test_mode)
|
||||
{
|
||||
case 0x01:
|
||||
// 短路测试(OCPC)
|
||||
sink_test_short_set(pSW, pData, devStatus);
|
||||
break;
|
||||
case 0x02:
|
||||
// OCP 测试
|
||||
sink_test_ocp_set(pSW, pData, devStatus);
|
||||
break;
|
||||
case 0x03:
|
||||
// 动态测试
|
||||
sink_test_dynamic_set(pSW, pData, devStatus);
|
||||
break;
|
||||
default:
|
||||
return MB_EX_ILLEGAL_FUNCTION;
|
||||
}
|
||||
// switch(test_mode)
|
||||
// {
|
||||
// case 0x01:
|
||||
// // 短路测试(OCPC)
|
||||
// sink_test_short_set(pSW, pData, devStatus);
|
||||
// break;
|
||||
// case 0x02:
|
||||
// // OCP 测试
|
||||
// sink_test_ocp_set(pSW, pData, devStatus);
|
||||
// break;
|
||||
// case 0x03:
|
||||
// // 动态测试
|
||||
// sink_test_dynamic_set(pSW, pData, devStatus);
|
||||
// break;
|
||||
// default:
|
||||
// return MB_EX_ILLEGAL_FUNCTION;
|
||||
// }
|
||||
/************ 启动 / 停止控制 ************/
|
||||
if(devStatus == 0) //启动
|
||||
{
|
||||
@@ -1515,7 +1518,10 @@ eMBException funcWriteMultipleHoldingRegister (rt_uint8_t *reqFrame, rt_uint16_t
|
||||
}
|
||||
else if (regAddress_H == HOLD_REG_SYS_BASE)
|
||||
{
|
||||
chrg_mb_write_sys(ch, ch_reg_offset, sou_value, pSW, pNOR, pSOU);
|
||||
eStatus = chrg_mb_write_sys(ch, ch_reg_offset, sou_value, pSW, pNOR, pSOU);
|
||||
if (eStatus != MB_EX_NONE) {
|
||||
return eStatus;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2210,7 +2216,7 @@ static void chrg_mb_write_src(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t
|
||||
//rt_kprintf("ret_offset = %d, value = %d",reg_offset,sou_value);
|
||||
}
|
||||
|
||||
static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value,
|
||||
static eMBException chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t sou_value,
|
||||
struct chrg_switch_t *pSW, struct chrg_north_t *pNOR, struct chrg_south_t *pSOU)
|
||||
{
|
||||
struct chrg_comm_t *pCOMM = &chrgcomm;
|
||||
@@ -2228,23 +2234,40 @@ static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t
|
||||
}
|
||||
break;
|
||||
|
||||
case SYS_REG_PARAM_EFFECT: // 0x01: 参数生效标志
|
||||
if (sou_value == 0x01)
|
||||
{
|
||||
g_shadow_dirty[ch] = 0; // 标记已生效
|
||||
case SYS_REG_PARAM_EFFECT: // 0x01: 参数生效标志
|
||||
if (sou_value == 0x01)
|
||||
{
|
||||
struct chrg_switch_t *pReal = &pNOR->sw[ch];
|
||||
rt_uint8_t pro_change = 0;
|
||||
sink_proto_diff_t diff_info;
|
||||
struct chrg_thread_t *pTHR_NOR = &chrgthr[IDX_THR_ROLL_NOR];
|
||||
rt_mutex_take(pTHR_NOR->mutex, RT_WAITING_FOREVER);
|
||||
|
||||
struct chrg_switch_t *pReal = &pNOR->sw[ch];
|
||||
rt_uint8_t pro_change = 0;
|
||||
sink_proto_diff_t diff_info;
|
||||
chrg_sink_get_proto_diff(pReal, pSW, &diff_info, &pro_change);
|
||||
eIDX_ID old_id = pReal->id;
|
||||
eIDX_ID new_id = pReal->id;
|
||||
rt_uint16_t sink_work = pSW->sink.Now_State;
|
||||
rt_uint16_t source_work = pSW->source.Now_State;
|
||||
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);
|
||||
rt_uint16_t sink_work = pSW->sink.Now_State;
|
||||
rt_uint16_t source_work = pSW->source.Now_State;
|
||||
rt_uint8_t old_cv_mode = pReal->CV_mode;
|
||||
rt_uint16_t old_loadv = pReal->sink.loadv;
|
||||
rt_uint16_t old_loadc = pReal->sink.loadc;
|
||||
//rt_uint8_t old_sink_test = pReal->sink.test.test_mode;
|
||||
struct chrg_thread_t *pTHR_NOR = &chrgthr[IDX_THR_ROLL_NOR];
|
||||
rt_mutex_take(pTHR_NOR->mutex, RT_WAITING_FOREVER);
|
||||
rt_memcpy(pReal, &g_shadow_sw[ch], sizeof(struct chrg_switch_t));
|
||||
rt_memcpy(pReal, &g_shadow_sw[ch], sizeof(struct chrg_switch_t));
|
||||
if (new_id == ID_SINK)
|
||||
{
|
||||
if (sink_work == 0x01) // 负载启动
|
||||
@@ -2288,7 +2311,14 @@ static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t
|
||||
else
|
||||
{
|
||||
// 仅下发差异寄存器
|
||||
chrg_sink_diff_send_reg((eIDX_SOU_CH)ch, &diff_info, pReal);
|
||||
if (chrg_sink_diff_send_reg((eIDX_SOU_CH)ch, &diff_info, pReal) != 0) {
|
||||
pReal->CV_mode = old_cv_mode;
|
||||
pReal->sink.loadv = old_loadv;
|
||||
pReal->sink.loadc = old_loadc;
|
||||
g_shadow_dirty[ch] = 1;
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
return MB_EX_SLAVE_BUSY;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2298,7 +2328,11 @@ static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t
|
||||
pReal->sink.On_work = 0;
|
||||
pReal->sink.work_mode = SINK_WORK_STOP;
|
||||
}
|
||||
chrg_sink_work(ch, pReal);
|
||||
if (chrg_sink_work(ch, pReal) != 0) {
|
||||
g_shadow_dirty[ch] = 1;
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
return MB_EX_SLAVE_BUSY;
|
||||
}
|
||||
}
|
||||
else if (new_id == ID_SOURCE && source_work == 0x01)
|
||||
{
|
||||
@@ -2311,10 +2345,12 @@ static void chrg_mb_write_sys(rt_uint8_t ch, rt_uint16_t reg_offset, rt_uint16_t
|
||||
rt_mutex_release(pTHR_NOR->mutex);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
rt_kprintf("[SYS CH%d] Unknown reg offset=0x%02X\n", ch + 1, reg_offset);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
rt_kprintf("[SYS CH%d] Unknown reg offset=0x%02X\n", ch + 1, reg_offset);
|
||||
break;
|
||||
}
|
||||
|
||||
return MB_EX_NONE;
|
||||
}
|
||||
void chrg_sink_get_proto_diff(struct chrg_switch_t *pReal,
|
||||
struct chrg_switch_t *pShadow,
|
||||
@@ -2335,23 +2371,31 @@ void chrg_sink_get_proto_diff(struct chrg_switch_t *pReal,
|
||||
!pDiff->ccset_changed && !pDiff->cvmode_changed) ? 0 : 1;
|
||||
|
||||
}
|
||||
void chrg_sink_diff_send_reg(eIDX_SOU_CH ch, sink_proto_diff_t *pDiff, struct chrg_switch_t *pReal)
|
||||
{
|
||||
chrg_sou_com_sou_set();
|
||||
if(pReal->CV_mode == 0x01){
|
||||
if (pDiff->volt_changed)
|
||||
{
|
||||
chrg_sou_com_batch_add_reg(ch, REG_VOLTAGE_OUT+1, pReal->sink.loadv);
|
||||
}
|
||||
}else{
|
||||
if (pDiff->curr_changed)
|
||||
{
|
||||
chrg_sou_com_batch_add_reg(ch, REG_CURRENT_OUT+1, pReal->sink.loadc);
|
||||
}
|
||||
}
|
||||
if(pDiff->cvmode_changed){
|
||||
chrg_sou_com_batch_add_reg(ch, REG_MODE, pReal->CV_mode);
|
||||
}
|
||||
int chrg_sink_diff_send_reg(eIDX_SOU_CH ch, sink_proto_diff_t *pDiff, struct chrg_switch_t *pReal)
|
||||
{
|
||||
rt_uint16_t regs[2];
|
||||
rt_uint16_t vals[2];
|
||||
rt_uint8_t count = 0;
|
||||
|
||||
if (pReal->CV_mode == 0x01) {
|
||||
if (pDiff->volt_changed) {
|
||||
regs[count] = REG_VOLTAGE_OUT + 1;
|
||||
vals[count++] = pReal->sink.loadv;
|
||||
}
|
||||
} else if (pDiff->curr_changed) {
|
||||
regs[count] = REG_CURRENT_OUT + 1;
|
||||
vals[count++] = pReal->sink.loadc;
|
||||
}
|
||||
if (pDiff->cvmode_changed) {
|
||||
regs[count] = REG_MODE;
|
||||
vals[count++] = pReal->CV_mode;
|
||||
}
|
||||
|
||||
if ((count > 0) && (chrg_sou_com_batch_submit(ch, regs, vals, count) != 0)) {
|
||||
LOG_E("CH%d sink diff batch submit failed", ch + 1);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user