refactor: 重构电源通道控制逻辑,引入状态机管理
1. 删除apps/chrg/applications/thread/chrg_lcd.h中的chrg_sou_work函数声明 2. 移除chrg_source.h中冗余的状态标志定义,新增电源工作状态机枚举 3. 重构chrg_lcd.c,删除旧的启动/停止流程代码和冗余标志位操作 4. 重写chrg_roll_nor.c的协议设置和通道控制逻辑,替换为状态机处理 5. 重写chrg_source.c,新增统一的电源工作状态机实现,替换旧的协议设置函数 6. 重构chrg_north.c的电源解析逻辑,移除旧的停止流程和冗余标志位 7. 简化chrg_comm.c的Modbus协议处理逻辑,改为通过状态机控制电源通道
This commit is contained in:
@@ -30,42 +30,6 @@ uint16_t chrg_compare(rt_int16_t a, rt_int16_t b)
|
||||
else return b - a;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_stop
|
||||
功能描述: 南向功率源停止流程控制函数(分步执行停止操作)
|
||||
函数描述: 通过状态机分步执行南向功率停止流程:停止功率输出 -> 关闭北向继电器 -> 清空控制标志并禁用使能
|
||||
输入参数:
|
||||
frame_data :原始数据帧指针,用于提取当前电压值
|
||||
pSW :北向通道控制结构体指针
|
||||
idx :通道编号(功率通道/北向通道索引)
|
||||
enable :北向通道使能,停止后关掉使能
|
||||
返回说明: 无返回值
|
||||
*****************************************************************/
|
||||
void chrg_source_stop(rt_uint8_t *frame_data,struct chrg_switch_t *pSW,rt_uint8_t idx,rt_uint8_t *enable){
|
||||
switch(pSW->source.Stop_step_flag){
|
||||
case 0: // 停止工作
|
||||
chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_STOP);
|
||||
rt_thread_mdelay(50);
|
||||
rt_uint16_t volt_mv_Now = (frame_data[4] << 8) | frame_data[5];
|
||||
volt = volt_mv_Now;
|
||||
if(volt_mv_Now < 1000){
|
||||
pSW->source.Stop_step_flag = 1;
|
||||
}
|
||||
break;
|
||||
case 1: // 关闭北向继电器
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx,0);
|
||||
rt_thread_mdelay(50);
|
||||
pSW->source.Stop_step_flag = 2;
|
||||
break;
|
||||
case 2: // 状态2:已执行完停止操作,清空标志位
|
||||
pSW->source.Set_CV_Flag = 0;
|
||||
*enable = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_standard_output
|
||||
功能描述: 南向功率源标准输出控制函数
|
||||
@@ -97,49 +61,47 @@ void chrg_source_standard_output(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
}
|
||||
|
||||
//电源快充
|
||||
void chrg_source_fast_output(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW, struct chrg_north_t *pNOR)
|
||||
void chrg_source_parse(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW, struct chrg_north_t *pNOR)
|
||||
{
|
||||
struct chrg_rollsou_t *pROLL = &chrgrollsou;
|
||||
rt_uint16_t volt_mv = (frame_data[8] << 8) | frame_data[9];
|
||||
rt_uint16_t Curr_mA = (frame_data[10] << 8) | frame_data[11];
|
||||
rt_uint16_t volt_mv_Now = (frame_data[4] << 8) | frame_data[5];
|
||||
rt_uint16_t Curr_mA_Now = (frame_data[6] << 8) | frame_data[7];
|
||||
rt_uint16_t volt_compare = chrg_compare(volt_mv, volt_mv_Now);
|
||||
rt_uint16_t Curr_compare = chrg_compare(Curr_mA, Curr_mA_Now);
|
||||
static rt_uint16_t last_volt_mv[TOTAL_SOU_CHS] = {0};
|
||||
static rt_uint8_t number = 0;
|
||||
#if LCD_OPEN
|
||||
// rt_kprintf("volt_mv=%d,volt_mv_Now=%d,compare=%d\r\n",volt_mv,volt_mv_Now,volt_compare);
|
||||
if(volt_compare<5000){ //比较设定值与实际值差距,小于2V认为达成设定,允许屏幕开始变换
|
||||
number++;
|
||||
number = number%10;
|
||||
if(number == 9)
|
||||
{
|
||||
pSW->change_flag = 0;
|
||||
}
|
||||
}else { //没有达成设定,屏幕不允许变换
|
||||
pSW->change_flag = 0x01;
|
||||
int ret;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
// if(volt_mv_Now==0){
|
||||
// chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_START);
|
||||
// }
|
||||
// else{
|
||||
if (pSW->source.Set_CV_Flag == 0){
|
||||
{
|
||||
chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_VOLTAGE_OUT+1, volt_mv);
|
||||
}
|
||||
pSW->source.Set_CV_Flag = 1;
|
||||
#if DEBUG_NORTH
|
||||
rt_kprintf("Volt_Set%d\r\n",volt_mv);
|
||||
#endif
|
||||
}
|
||||
else if(pSW->source.Set_CV_Flag==1){
|
||||
chrg_set_sou_reg((eIDX_SOU_CH)idx, REG_WORK, WORK_START);
|
||||
pSW->source.Set_CV_Flag = 0;
|
||||
}else{
|
||||
pSW->source.Set_CV_Flag=0;
|
||||
pSW->source.vc.set_voltage = volt_mv;
|
||||
pSW->source.vc.set_current = Curr_mA;
|
||||
// #if LCD_OPEN
|
||||
// // rt_kprintf("volt_mv=%d,volt_mv_Now=%d,compare=%d\r\n",volt_mv,volt_mv_Now,volt_compare);
|
||||
// if(volt_compare<5000){ //比较设定值与实际值差距,小于2V认为达成设定,允许屏幕开始变换
|
||||
// number++;
|
||||
// number = number%10;
|
||||
// if(number == 9)
|
||||
// {
|
||||
// pSW->change_flag = 0;
|
||||
// }
|
||||
// }else { //没有达成设定,屏幕不允许变换
|
||||
// pSW->change_flag = 0x01;
|
||||
// }
|
||||
// #endif
|
||||
if (pSW->source.On_Flag && (volt_mv_Now > 2000)) {
|
||||
if ((volt_mv == last_volt_mv[idx])) {
|
||||
pSW->source.work_mode = SOURCE_WORK_WAIT;
|
||||
} else {
|
||||
pSW->source.work_mode = SOURCE_WORK_RUNING;
|
||||
}
|
||||
}
|
||||
ret = chrg_source_work_state(idx, pSW);
|
||||
if ((ret >= 0) && (pSW->source.work_mode == SOURCE_WORK_RUNING)) {
|
||||
last_volt_mv[idx] = volt_mv;
|
||||
}
|
||||
}
|
||||
|
||||
//电源设置
|
||||
@@ -152,7 +114,7 @@ void chrg_source_setting(rt_uint8_t *frame_data, eIDX_SOU_CH idx,
|
||||
chrg_source_standard_output(idx, pSW);
|
||||
}
|
||||
else{ //快充部分按协商结果输出
|
||||
chrg_source_fast_output(frame_data, idx, pSW, pNOR);
|
||||
chrg_source_parse(frame_data, idx, pSW, pNOR);
|
||||
// rt_kprintf("set_end\r\n");
|
||||
}
|
||||
}else if(pSW->source.On_Flag == 0){
|
||||
@@ -240,7 +202,7 @@ static void chrg_north_handle_Seting_Volt(rt_uint8_t *frame_data, rt_uint16_t fr
|
||||
static uint8_t number = 0;
|
||||
//电源部分
|
||||
if(pSW->id==ID_SOURCE){
|
||||
chrg_source_setting(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR);
|
||||
chrg_source_parse(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR);
|
||||
}
|
||||
else{
|
||||
chrg_sink_parse(frame_data,(eIDX_SOU_CH)idx, pSW, pNOR);
|
||||
@@ -262,7 +224,6 @@ struct chrg_north_t chrgnorth = {
|
||||
.source = { // 电源侧参数初始化
|
||||
.On_Flag = 0, // 启动标志初始关闭
|
||||
.Set_CV_Flag = 1, // 启停控制初始置1
|
||||
.Set_Pro_Flag = 1 // 电压/电流切换初始置1
|
||||
}, // 关键:补充逗号分隔source和sink
|
||||
.sink = {
|
||||
.protocol = 0xFE,
|
||||
@@ -280,7 +241,6 @@ struct chrg_north_t chrgnorth = {
|
||||
.source = {
|
||||
.On_Flag = 0,
|
||||
.Set_CV_Flag = 1,
|
||||
.Set_Pro_Flag = 1
|
||||
},
|
||||
.sink = {
|
||||
.protocol = 0xFE,
|
||||
@@ -297,7 +257,6 @@ struct chrg_north_t chrgnorth = {
|
||||
.source = {
|
||||
.On_Flag = 0,
|
||||
.Set_CV_Flag = 1,
|
||||
.Set_Pro_Flag = 1
|
||||
},
|
||||
.sink = {
|
||||
.protocol = 0xFE,
|
||||
@@ -314,7 +273,6 @@ struct chrg_north_t chrgnorth = {
|
||||
.source = {
|
||||
.On_Flag = 0,
|
||||
.Set_CV_Flag = 1,
|
||||
.Set_Pro_Flag = 1
|
||||
},
|
||||
.sink = {
|
||||
.protocol = 0xFE,
|
||||
|
||||
Reference in New Issue
Block a user