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:
@@ -15,9 +15,11 @@
|
||||
#include "chrg_source.h"
|
||||
#include "chrg_eload.h"
|
||||
#include "chrg_roll_sou.h"
|
||||
#include "chrg_rel.h"
|
||||
|
||||
int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
/* Source启动参数一次入队,最后发送WORK_START使功率板开始输出。 */
|
||||
rt_uint16_t regs[5] = {
|
||||
REG_ELOAD,
|
||||
REG_MODE,
|
||||
@@ -30,7 +32,7 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
pSW->CV_mode,
|
||||
pSW->source.max_vol,
|
||||
pSW->source.protective_curr,
|
||||
WORK_STOP
|
||||
WORK_START
|
||||
};
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
@@ -38,6 +40,99 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
}
|
||||
return chrg_sou_com_batch_submit(idx, regs, vals, 5);
|
||||
}
|
||||
|
||||
static int chrg_source_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
struct chrg_south_t *pSOU = &chrgsouth;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
int ret;
|
||||
|
||||
/* 只有整批命令成功入队后,才打开通道并进入等待状态。 */
|
||||
ret = chrg_source_init_submit(idx, pSW);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
pSW->source.On_Flag = 1;
|
||||
pSOU->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;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_source_work_wait(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
/* WAIT状态不产生南向命令,等待下一帧北向电压数据。 */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_source_work_running(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
/* RUNING只下发协商后的目标电压,不重复发送启动命令。 */
|
||||
rt_uint16_t reg = REG_VOLTAGE_OUT + 1;
|
||||
rt_uint16_t value = pSW->source.vc.set_voltage;
|
||||
|
||||
return chrg_sou_com_batch_submit(idx, ®, &value, 1);
|
||||
}
|
||||
|
||||
static int chrg_source_work_low(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
/* 电压异常时先停止功率板输出,保留状态供上层判断。 */
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
return chrg_sou_com_batch_submit(idx, ®, &value, 1);
|
||||
}
|
||||
|
||||
static int chrg_source_work_stop(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
struct chrg_south_t *pSOU = &chrgsouth;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
int ret;
|
||||
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
/* 停止命令入队成功后再关闭使能和北向继电器。 */
|
||||
ret = chrg_sou_com_batch_submit(idx, ®, &value, 1);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
pSW->source.On_Flag = 0;
|
||||
pSOU->enable[idx] = 0;
|
||||
pNOR->enable[idx] = 0;
|
||||
pSOU->online[idx] = 0;
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0);
|
||||
pSW->source.work_mode = SOURCE_WORK_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int chrg_source_work_state(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* 所有Source功率板控制统一从本状态机出口执行。 */
|
||||
switch (pSW->source.work_mode) {
|
||||
case SOURCE_WORK_INIT:
|
||||
return chrg_source_work_init(idx, pSW);
|
||||
case SOURCE_WORK_WAIT:
|
||||
return chrg_source_work_wait(idx, pSW);
|
||||
case SOURCE_WORK_RUNING:
|
||||
return chrg_source_work_running(idx, pSW);
|
||||
case SOURCE_WORK_LOW:
|
||||
return chrg_source_work_low(idx, pSW);
|
||||
case SOURCE_WORK_STOP:
|
||||
return chrg_source_work_stop(idx, pSW);
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
rt_uint8_t Pro_Group_VCMM[11][8] = {
|
||||
{0} // 11个挡位,8个参数(src, pps, vmin_H,vmin_L, vmax_H,vmax_L,cur_set_H,cur_set_L)
|
||||
};
|
||||
@@ -346,8 +441,6 @@ void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t re
|
||||
// #endif.
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: parse_mulit_gear_more
|
||||
函数描述: 解析三-四挡位原始数据,填充8参数高低字节缓冲区(同步修改)
|
||||
@@ -859,34 +952,8 @@ rt_uint8_t pd_fill_single_group_UFCS(rt_uint8_t *data, rt_uint8_t start_idx,stru
|
||||
return idx - start_idx; // 返回填充的总字节数
|
||||
}
|
||||
|
||||
int source_set_pd_com(rt_uint8_t pro,rt_uint8_t pro_gear_idx)
|
||||
{
|
||||
rt_uint16_t len = 0;
|
||||
rt_uint8_t data[150] = {0};
|
||||
rt_uint8_t frame[150] = {0};
|
||||
rt_uint8_t send_len = 0; //数据长度
|
||||
rt_uint8_t max_group_idx = 0; //挡位索引
|
||||
data[0] = pro; //协议
|
||||
rt_uint8_t idx = 1;
|
||||
for(rt_uint8_t i = 0;i<pro_gear_idx;i++){
|
||||
rt_uint8_t fill_len = pd_fill_single_group_com(data,idx,i);
|
||||
if (fill_len == 0) {
|
||||
rt_kprintf("Error: fill group %d failed\n", i);
|
||||
return -1;
|
||||
}
|
||||
idx += fill_len; // 偏移到下一组起始位置
|
||||
}
|
||||
send_len = idx; // 总填充字节数
|
||||
|
||||
chrg_north_pkg_encode(ID_SOURCE, SRC_CMD_SET_PROTOCOL, data, send_len, frame, &len);
|
||||
// for(rt_uint8_t i=0;i<len+5;i++){
|
||||
// rt_kprintf("%02x",data[i]);
|
||||
// }
|
||||
// rt_kprintf("idx=%d",idx);
|
||||
return chrg_north_send(frame, len);
|
||||
}
|
||||
|
||||
int source_set_pd_new_com(rt_uint8_t pro, struct chrg_switch_t *pSW)
|
||||
int source_set_pro(rt_uint8_t pro, struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t len = 0;
|
||||
rt_uint8_t data[150] = {0};
|
||||
@@ -917,4 +984,3 @@ int source_set_pd_new_com(rt_uint8_t pro, struct chrg_switch_t *pSW)
|
||||
return chrg_north_send(frame, len);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -160,16 +160,25 @@ struct chrg_src_t {
|
||||
rt_uint8_t Now_State; // 当前状态
|
||||
rt_uint8_t On_Flag; // 启动总标志(0/1)
|
||||
rt_uint8_t Set_CV_Flag; // 电压/电流切换标志(0/1)
|
||||
rt_uint8_t Set_Pro_Flag; // 设置协议标志位(0/1/2)0代表没设置协议,1代表设置了但还没执行,2代表设置了并执行
|
||||
rt_uint8_t LCD_Set_Pro_Flag; // LCD设置协议标志位
|
||||
rt_uint8_t Work_step_flag; // 工作步骤标志位
|
||||
rt_uint8_t Stop_step_flag; // 停止步骤标志位
|
||||
rt_uint8_t change_sink_Flag; // 从source切换到sink标志位
|
||||
rt_uint8_t work_mode; // 0=停止 1=工作 2=低电压
|
||||
rt_uint8_t work_mode;
|
||||
struct src_vc_t vc; // 读取数据
|
||||
struct vc_pd_t pd_get[2]; // 读取PD协议数据
|
||||
struct vc_pd_t pd_set[2]; // 设置PD协议数据
|
||||
};
|
||||
// 电源工作状态机:COM只切换状态,具体功率板指令由状态处理函数下发
|
||||
enum {
|
||||
SOURCE_WORK_INIT = 0, // 初始化功率板并启动输出
|
||||
SOURCE_WORK_WAIT, // 参数未变化,不下发功率板指令
|
||||
SOURCE_WORK_RUNING, // 协商电压变化,下发一次新电压
|
||||
SOURCE_WORK_LOW, // 电压过低,停止功率板输出
|
||||
SOURCE_WORK_STOP, // 主动停止并关闭通道
|
||||
SOURCE_WORK_ON_TEST_DYNA,
|
||||
SOURCE_WORK_ON_TEST_SHORT,
|
||||
};
|
||||
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: source_get_vc
|
||||
函数描述: source电压电流查询请求
|
||||
@@ -248,10 +257,11 @@ extern void parse_power_single_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_u
|
||||
extern void parse_power_pdo_gear(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t reqLen,uint8_t *pro_gear_idx,uint8_t *pro,rt_uint16_t *protect_ma);
|
||||
extern void parse_multi_gear_more(rt_uint8_t protoCmd, rt_uint8_t *pData, rt_uint16_t reqLen,uint8_t *pro_gear_idx,uint8_t *pro,rt_uint16_t *protect_ma);
|
||||
extern void parse_power_ufcs(rt_uint8_t *pData, rt_uint16_t reqLen, uint8_t *pro_gear_idx, uint8_t *pro,rt_uint16_t *protect_ma);
|
||||
extern int source_set_pd_new_com(rt_uint8_t pro, struct chrg_switch_t *pSW);
|
||||
extern int source_set_pro(rt_uint8_t pro, struct chrg_switch_t *pSW);
|
||||
|
||||
/* 提交 Source 功率板初始化参数;北向协议设置完成后调用。 */
|
||||
extern int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW);
|
||||
extern int chrg_source_work_state(rt_uint8_t idx, struct chrg_switch_t *pSW);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user