可正常使用版本,代价是5V比较慢
chore: 完成充电控制软件多项功能迭代与优化 1. 修改chrg.uvprojx,开启调试前更新Flash 2. 新增协议回码等待状态,注释掉协议优先于CC的测试流程 3. 启用南向寄存器写命令调试日志 4. 重构Sink工作状态机,拆分关机流程为多阶段等待 5. 新增主继电器0V持续掉电保护功能 6. 优化南向单次量测队列管理,修复多通道低电流确认异常 7. 调整电压稳定确认逻辑,为5V目标增加更长确认窗口 8. 移除软恢复相关状态与逻辑,简化状态流转
This commit is contained in:
@@ -22,16 +22,29 @@
|
||||
|
||||
#define SINK_UNLOAD_QUERY_INTERVAL_MS 20U // 卸载期间两次优先量测请求的最小间隔
|
||||
#define SINK_UNLOAD_CURRENT_MAX_MA 200U // 判定负载已安全卸载的最大实际电流
|
||||
#define SINK_UNLOAD_CONFIRM_COUNT 2U // 连续满足低电流条件的量测帧数
|
||||
#define SINK_CLOSE_CURRENT_MA 1000U // 安全关闭阶段写入功率板的电流设定值
|
||||
#define SINK_UNLOAD_CONFIRM_COUNT 5U // 连续满足低电流条件的量测帧数
|
||||
|
||||
/* 主继电器闭合跟踪:1=已提交ALL_REL_ON(主继电器应已闭合) 0=未闭合/已断开。
|
||||
* 用于0V硬保护区分"首次开载/握手恢复"(主继电器未闭合,Now_voltage=0属正常)
|
||||
* 与"运行或待机中主继电器已闭合但输入电压为0"(协议板断电窗口,禁止开载)。 */
|
||||
static rt_uint8_t g_sink_rel_main_closed[TOTAL_SOU_CHS] = {0};
|
||||
|
||||
/* 主继电器电压到位确认:1=提交闭合后实测电压已到达工作下限,继电器确认闭合。
|
||||
* 持续0V监控只对已到位通道生效,避免继电器动作期间(电压尚未建立)误触发掉电保护。 */
|
||||
static rt_uint8_t g_sink_rel_main_ready[TOTAL_SOU_CHS] = {0};
|
||||
|
||||
/* 卸载确认只接受停止批次成功后产生的新P1量测。 */
|
||||
static rt_uint32_t g_sink_unload_sample_seq[TOTAL_SOU_CHS] = {0};
|
||||
static rt_bool_t g_sink_unload_batch_confirmed[TOTAL_SOU_CHS] = {RT_FALSE};
|
||||
static rt_bool_t g_sink_unload_current_confirmed[TOTAL_SOU_CHS] = {RT_FALSE};
|
||||
static rt_tick_t g_sink_unload_query_tick[TOTAL_SOU_CHS] = {0};
|
||||
static rt_uint8_t g_sink_unload_confirm_count[TOTAL_SOU_CHS] = {0};
|
||||
|
||||
enum {
|
||||
SINK_UNLOAD_NEXT_RUNNING = 0,
|
||||
SINK_UNLOAD_NEXT_HANDSHAKE,
|
||||
SINK_UNLOAD_NEXT_STOP_RELAY
|
||||
};
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_load_should_start
|
||||
函数描述: 判断普通负载的设定值是否允许启动南向电子负载
|
||||
@@ -68,7 +81,6 @@ static void chrg_sink_unload_confirm_reset(eIDX_SOU_CH idx)
|
||||
}
|
||||
g_sink_unload_sample_seq[idx] = 0U;
|
||||
g_sink_unload_batch_confirmed[idx] = RT_FALSE;
|
||||
g_sink_unload_current_confirmed[idx] = RT_FALSE;
|
||||
g_sink_unload_query_tick[idx] = 0U;
|
||||
g_sink_unload_confirm_count[idx] = 0U;
|
||||
}
|
||||
@@ -83,14 +95,6 @@ static void chrg_sink_unload_confirm_reset(eIDX_SOU_CH idx)
|
||||
其它说明: 基线建立后返回成功,实际低电流确认仍由当前状态函数继续执行;
|
||||
用于允许北向协议/CC与南向低电流确认并行推进
|
||||
*****************************************************************/
|
||||
rt_bool_t chrg_sink_handshake_north_ready(eIDX_SOU_CH idx)
|
||||
{
|
||||
if (idx >= TOTAL_SOU_CHS) {
|
||||
return RT_FALSE;
|
||||
}
|
||||
return g_sink_unload_current_confirmed[idx];
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_unload_query_submit
|
||||
函数描述: 按最小间隔提交当前通道的一次性P1量测请求
|
||||
@@ -253,7 +257,7 @@ static int chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
first_start = (pSW->sink.work_mode != SINK_WORK_INIT_AUX_WAIT) ?
|
||||
RT_TRUE : RT_FALSE;
|
||||
vals[2] = pSW->CV_mode;
|
||||
vals[3] = pSW->sink.volt_on;
|
||||
vals[3] = pSW->sink.volt_on <= 500 ? 500 : pSW->sink.volt_on;
|
||||
if (pSW->sink.test.test_mode_old == SINK_TEST_SHORT) {
|
||||
regs[count] = ModbusRTU_ShortTest_CMD_MODE_FLAG;
|
||||
vals[count++] = ModbusRTU_DYNA_CMD_MODE_STOP;
|
||||
@@ -273,6 +277,7 @@ static int chrg_sink_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
/* 南向批次已入队,北向按“CC->协议”顺序立即开始完整握手。 */
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SINK);
|
||||
pNOR->enable[idx] = 1;
|
||||
/* Protocol-before-CC test flow is disabled in this version. */
|
||||
pSW->sub = IDX_SET_SINK_CC_BEFORE_PD;
|
||||
}
|
||||
pSW->sink.work_mode = SINK_WORK_INIT_AUX_WAIT;
|
||||
@@ -312,6 +317,40 @@ static int chrg_sink_work_init_aux_wait(eIDX_SOU_CH idx,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_volt_low_protect
|
||||
函数描述: 主继电器闭合后持续监控南向实测输入电压,掉电立即转掉电保护
|
||||
输入参数: idx:南向功率通道编号 pSW:当前通道控制结构体
|
||||
输出参数: 电压到位时确认ready;掉电时强制进入SINK_WORK_LOW并执行掉电批次
|
||||
返回说明: 0:正常或保护批次已提交 <0:参数错误或保护批次提交失败
|
||||
其它说明: 由北向轮询线程每轮调用,不依赖北向0x20回码。协议板断电时北向
|
||||
回码会中断(volt_low计数不再累积),而南向P1量测由功率板独立
|
||||
供电持续刷新,是本保护唯一可靠的电量来源。只有"提交闭合且实测
|
||||
电压已到位"的通道才启用掉电判定,继电器动作期间不误触发
|
||||
*****************************************************************/
|
||||
int chrg_sink_volt_low_protect(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (g_sink_rel_main_closed[idx] == 0) {
|
||||
return 0;
|
||||
}
|
||||
if (pSW->Now_voltage >= WORK_MIN_VOLT) {
|
||||
/* 实测电压到达工作下限,确认主继电器已闭合。 */
|
||||
g_sink_rel_main_ready[idx] = 1;
|
||||
return 0;
|
||||
}
|
||||
if (g_sink_rel_main_ready[idx] != 0) {
|
||||
/* 曾经到位后再次掉电:协议板处于断电窗口,禁止负载带载,
|
||||
* 强制进入掉电安全处理等待协议板重新上电。 */
|
||||
pSW->sink.work_mode = SINK_WORK_LOW;
|
||||
return chrg_sink_work(idx, pSW);
|
||||
}
|
||||
/* 已提交闭合但电压尚未建立(继电器动作中),继续等待不保护。 */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_work_volt_runing
|
||||
函数描述: 执行负载RUNING状态,闭合全部继电器并启动负载
|
||||
@@ -342,70 +381,40 @@ static int chrg_sink_work_volt_runing(eIDX_SOU_CH idx, struct chrg_switch_t *pSW
|
||||
ret = chrg_sou_com_batch_submit(idx, stop_regs, stop_vals, 2U);
|
||||
if (ret == 0) {
|
||||
pSW->sink.work_mode = SINK_WORK_LOAD_STANDBY;
|
||||
g_sink_rel_main_closed[idx] = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (pSW->CV_mode == MODE_CONSTANT_VOLTAGE) {
|
||||
regs[2] = REG_VOLTAGE_OUT + 1;
|
||||
vals[2] = pSW->sink.loadv;
|
||||
} else {
|
||||
regs[2] = REG_CURRENT_OUT + 1;
|
||||
vals[2] = pSW->sink.loadc;
|
||||
/* 只有南向实测电压曾经到位后再次掉到低压,才判定为掉电。
|
||||
* 初次RUNING时继电器批次刚入队,Now_voltage可能仍是上一帧的0,
|
||||
* 此时不能取消尚未发送到WORK_START的启动批次。 */
|
||||
if ((g_sink_rel_main_ready[idx] != 0) &&
|
||||
(pSW->Now_voltage < WORK_MIN_VOLT)) {
|
||||
pSW->sink.work_mode = SINK_WORK_LOW;
|
||||
return 0;
|
||||
}
|
||||
return chrg_sou_com_batch_submit(idx, regs, vals, 3U);
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_work_soft_resume
|
||||
函数描述: 协议电压或协议电流变化完成后恢复负载
|
||||
输入参数: idx:南向功率通道编号 pSW:当前通道控制结构体
|
||||
输出参数: 命令入队成功后将工作状态切换为SINK_WORK_SOFT_RUNNING
|
||||
返回说明: 0:命令提交成功 <0:参数或命令提交失败
|
||||
其它说明: 命令顺序为ALL_REL_ON、目标电流/电压、WORK_START;快速切换时
|
||||
主继电器可能在完整握手阶段被关闭,恢复必须先确保继电器闭合
|
||||
再启动电子负载,避免WORK_START先于主继电器带载;南向固件
|
||||
继电器独立控制,ALL_REL_ON只开不关,不会误关已闭合的副继电器
|
||||
*****************************************************************/
|
||||
static int chrg_sink_work_soft_resume(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t regs[3] = {REG_REL_ON, 0, REG_WORK};
|
||||
rt_uint16_t vals[3] = {ALL_REL_ON, 0, WORK_START};
|
||||
int ret;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (!chrg_sink_load_should_start(pSW)) {
|
||||
/* 软卸载未切继电器,低电流下保持原继电器和协议,只关闭电子负载。 */
|
||||
regs[0] = REG_WORK;
|
||||
vals[0] = WORK_STOP;
|
||||
ret = chrg_sou_com_batch_submit(idx, regs, vals, 1U);
|
||||
if (ret == 0) {
|
||||
pSW->sink.work_mode = SINK_WORK_LOAD_SOFT_STANDBY;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
if (pSW->CV_mode == MODE_CONSTANT_VOLTAGE) {
|
||||
regs[2] = REG_VOLTAGE_OUT + 1;
|
||||
vals[2] = pSW->sink.loadv;
|
||||
regs[1] = REG_VOLTAGE_OUT + 1;
|
||||
vals[1] = pSW->sink.loadv;
|
||||
} else {
|
||||
regs[2] = REG_CURRENT_OUT + 1;
|
||||
vals[2] = pSW->sink.loadc;
|
||||
regs[1] = REG_CURRENT_OUT + 1;
|
||||
vals[1] = pSW->sink.loadc;
|
||||
}
|
||||
if (chrg_sou_com_batch_submit(idx, regs, vals, 3U) != 0) {
|
||||
return -1;
|
||||
/* RUNING批次必须完整发送:ALL_REL_ON、目标负载值、WORK_START。 */
|
||||
ret = chrg_sou_com_batch_submit(idx, regs, vals, 3U);
|
||||
if (ret == 0) {
|
||||
g_sink_rel_main_closed[idx] = 1;
|
||||
}
|
||||
pSW->sink.work_mode = SINK_WORK_SOFT_RUNNING;
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_work_load_stop
|
||||
函数描述: 普通负载运行中设定电流降到最低门限以下时安全停止带载
|
||||
输入参数: idx:南向功率通道编号 pSW:当前通道控制结构体
|
||||
输出参数: 命令入队成功后进入SINK_WORK_LOAD_SOFT_STANDBY
|
||||
输出参数: 命令入队成功后进入SINK_WORK_LOAD_STANDBY
|
||||
返回说明: 0:命令提交成功 <0:参数或命令提交失败
|
||||
其它说明: 命令只发送WORK_STOP;不改变北向协议、CC、电流设定和
|
||||
主副继电器,保证后续恢复有效电流时无需重新协议握手
|
||||
@@ -422,26 +431,7 @@ static int chrg_sink_work_load_stop(eIDX_SOU_CH idx,
|
||||
if (chrg_sou_com_batch_submit(idx, ®, &val, 1U) != 0) {
|
||||
return -1;
|
||||
}
|
||||
pSW->sink.work_mode = SINK_WORK_LOAD_SOFT_STANDBY;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_sink_work_load_resume
|
||||
函数描述: 从保持继电器的低电流待机状态恢复普通电子负载
|
||||
输入参数: idx:南向功率通道编号 pSW:当前通道控制结构体
|
||||
输出参数: 命令入队成功后进入SINK_WORK_SOFT_RUNNING
|
||||
返回说明: 0:命令提交成功 <0:参数或命令提交失败
|
||||
其它说明: 本状态只作为待恢复标记,不直接下发WORK_START;必须由北向解析确认
|
||||
实际电压稳定后转入SINK_WORK_SOFT_RESUME,再恢复目标电流和WORK_START
|
||||
*****************************************************************/
|
||||
static int chrg_sink_work_load_resume(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL) ||
|
||||
!chrg_sink_load_should_start(pSW)) {
|
||||
return -1;
|
||||
}
|
||||
pSW->sink.work_mode = SINK_WORK_LOAD_STANDBY;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -477,12 +467,8 @@ static int chrg_sink_work_load_start(eIDX_SOU_CH idx,
|
||||
*****************************************************************/
|
||||
static int chrg_sink_nor_work_low(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t regs[4] = {
|
||||
REG_WORK, REG_CURRENT_OUT + 1, REG_REL_ON, REG_REL_ON
|
||||
};
|
||||
rt_uint16_t vals[4] = {
|
||||
WORK_STOP, SINK_CLOSE_CURRENT_MA, ALL_REL_OFF, FU_REL_ON
|
||||
};
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
@@ -491,9 +477,14 @@ static int chrg_sink_nor_work_low(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
if (chrg_sou_com_batch_cancel(idx) != 0) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_submit(idx, regs, vals, 4U) != 0) {
|
||||
/* Low voltage stops the electronic load only. Do not alter South relays:
|
||||
* an intentional protocol transition must not cause a relay-induced drop. */
|
||||
if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) {
|
||||
return -1;
|
||||
}
|
||||
/* 主继电器已随掉电批次断开,闭合跟踪与电压到位确认一并清除。 */
|
||||
g_sink_rel_main_closed[idx] = 0;
|
||||
g_sink_rel_main_ready[idx] = 0;
|
||||
pSW->sink.work_mode = SINK_WORK_LOW_AUX_WAIT;
|
||||
return 0;
|
||||
}
|
||||
@@ -535,22 +526,74 @@ static int chrg_sink_work_low_aux_wait(eIDX_SOU_CH idx,
|
||||
返回说明: 0:关机成功 <0:停止命令提交失败
|
||||
其它说明: 先断开功率继电器并发送WORK_STOP,再关闭软件通道
|
||||
*****************************************************************/
|
||||
static int chrg_sink_nor_work_off(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
static int chrg_sink_work_stop_prepare(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_cancel(idx) != 0) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* 主动关机先停止电子负载。WORK_STOP收到匹配回码后,必须通过
|
||||
* 停止命令之后的新P1量测连续确认低电流,才允许断开功率继电器。 */
|
||||
chrg_sink_unload_confirm_reset(idx);
|
||||
pSW->sink.work_mode = SINK_WORK_STOP_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_sink_work_stop_relay(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t reg = REG_REL_ON;
|
||||
rt_uint16_t value = ALL_REL_OFF;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* 继电器关闭命令已提交,等待南向回码后再清理软件通道。 */
|
||||
pSW->sink.work_mode = SINK_WORK_STOP_RELAY_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_sink_work_stop_relay_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
struct chrg_south_t *pSOU = &chrgsouth;
|
||||
struct chrg_north_t *pNOR = &chrgnorth;
|
||||
rt_uint16_t regs[2] = {REG_REL_ON, REG_WORK};
|
||||
rt_uint16_t vals[2] = {ALL_REL_OFF, WORK_STOP};
|
||||
int result;
|
||||
|
||||
if (chrg_sou_com_batch_submit(idx, regs, vals, 2) != 0) {
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_is_pending(idx)) {
|
||||
return 0;
|
||||
}
|
||||
result = chrg_sou_com_batch_get_result(idx);
|
||||
if (result <= 0) {
|
||||
return chrg_sink_work_stop_relay(idx, pSW);
|
||||
}
|
||||
|
||||
pSW->sink.On_work = 0;
|
||||
pSOU->online[idx] = 0;
|
||||
pNOR->enable[idx] = 0;
|
||||
g_sink_rel_main_closed[idx] = 0;
|
||||
g_sink_rel_main_ready[idx] = 0;
|
||||
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0); //关闭北向继电器
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0);
|
||||
/* 主动停止已经完成,退出异步等待状态,禁止下一轮重复执行。 */
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -585,6 +628,7 @@ static int chrg_sink_work_switch(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
/* 停止成功入队后,清除旧Source运行标志。 */
|
||||
pSW->source.On_Flag = 0;
|
||||
/* 首次进入Sink时先设置目标CC线,CC稳定后再设置协议。 */
|
||||
/* Protocol-before-CC test flow is disabled in this version. */
|
||||
pSW->sub = IDX_SET_SINK_CC_BEFORE_PD;
|
||||
/* SWITCH只负责旧角色退出,后续启动统一交给Sink INIT状态。 */
|
||||
pSW->sink.work_mode = SINK_WORK_INIT;
|
||||
@@ -629,12 +673,8 @@ static int chrg_sink_work_protocol_unload(eIDX_SOU_CH idx, struct chrg_switch_t
|
||||
static int chrg_sink_work_handshake_prepare(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t regs[4] = {
|
||||
REG_WORK, REG_CURRENT_OUT + 1, REG_REL_ON, REG_REL_ON
|
||||
};
|
||||
rt_uint16_t vals[4] = {
|
||||
WORK_STOP, SINK_CLOSE_CURRENT_MA, ALL_REL_OFF, FU_REL_ON
|
||||
};
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
@@ -643,11 +683,11 @@ static int chrg_sink_work_handshake_prepare(eIDX_SOU_CH idx,
|
||||
if (chrg_sou_com_batch_cancel(idx) != 0) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_submit(idx, regs, vals, 4) != 0) {
|
||||
if (chrg_sou_com_batch_submit(idx, ®, &value, 1U) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* 四条写回码完成后,还必须连续确认两帧实际电流不大于200mA。 */
|
||||
/* 协议或CC切换先停止电子负载,连续5次确认低电流后再操作继电器。 */
|
||||
chrg_sink_unload_confirm_reset(idx);
|
||||
pSW->sink.work_mode = SINK_WORK_HANDSHAKE_WAIT;
|
||||
return 0;
|
||||
@@ -664,7 +704,7 @@ static int chrg_sink_work_handshake_prepare(eIDX_SOU_CH idx,
|
||||
还要求CURRENT=1000mA、ALL_REL_OFF和FU_REL_ON回码成功,但保持北向Sink继电器接通
|
||||
*****************************************************************/
|
||||
static int chrg_sink_work_current_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW, rt_bool_t full_handshake)
|
||||
struct chrg_switch_t *pSW, rt_uint8_t next_action)
|
||||
{
|
||||
rt_uint32_t sample_seq;
|
||||
int batch_result;
|
||||
@@ -678,14 +718,24 @@ static int chrg_sink_work_current_wait(eIDX_SOU_CH idx,
|
||||
|
||||
batch_result = chrg_sou_com_batch_get_result(idx);
|
||||
if (batch_result < 0) {
|
||||
/* 写命令失败时重新执行完整卸载批次,禁止使用量测值提前放行。 */
|
||||
return full_handshake ? chrg_sink_work_handshake_prepare(idx, pSW) :
|
||||
chrg_sink_work_protocol_unload(idx, pSW);
|
||||
/* 写命令失败时重新执行停止命令,禁止使用量测值提前放行。 */
|
||||
if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) {
|
||||
return chrg_sink_work_handshake_prepare(idx, pSW);
|
||||
}
|
||||
if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) {
|
||||
return chrg_sink_work_stop_prepare(idx, pSW);
|
||||
}
|
||||
return chrg_sink_work_protocol_unload(idx, pSW);
|
||||
}
|
||||
if (batch_result == 0) {
|
||||
/* 无有效批次结果时保持阻塞,并重新提交完整卸载动作。 */
|
||||
return full_handshake ? chrg_sink_work_handshake_prepare(idx, pSW) :
|
||||
chrg_sink_work_protocol_unload(idx, pSW);
|
||||
/* 无有效批次结果时保持阻塞,并重新提交停止动作。 */
|
||||
if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) {
|
||||
return chrg_sink_work_handshake_prepare(idx, pSW);
|
||||
}
|
||||
if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) {
|
||||
return chrg_sink_work_stop_prepare(idx, pSW);
|
||||
}
|
||||
return chrg_sink_work_protocol_unload(idx, pSW);
|
||||
}
|
||||
|
||||
if (!g_sink_unload_batch_confirmed[idx]) {
|
||||
@@ -702,10 +752,17 @@ static int chrg_sink_work_current_wait(eIDX_SOU_CH idx,
|
||||
g_sink_unload_confirm_count[idx]++;
|
||||
if (g_sink_unload_confirm_count[idx] >= SINK_UNLOAD_CONFIRM_COUNT) {
|
||||
g_sink_unload_batch_confirmed[idx] = RT_FALSE;
|
||||
g_sink_unload_current_confirmed[idx] = RT_TRUE;
|
||||
g_sink_unload_confirm_count[idx] = 0U;
|
||||
pSW->sink.work_mode = full_handshake ?
|
||||
SINK_WORK_WAIT : SINK_WORK_SOFT_RESUME_WAIT;
|
||||
if (next_action == SINK_UNLOAD_NEXT_HANDSHAKE) {
|
||||
/* 协议或CC切换保持南向继电器状态,低电流确认后直接开始北向配置。 */
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
} else if (next_action == SINK_UNLOAD_NEXT_STOP_RELAY) {
|
||||
pSW->sink.work_mode = SINK_WORK_STOP_RELAY;
|
||||
} else {
|
||||
/* Keep relays closed and resume through the common
|
||||
* voltage-confirmed RUNING path. */
|
||||
pSW->sink.work_mode = SINK_WORK_WAIT;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@@ -808,6 +865,7 @@ static int chrg_sink_TEST_OCP_ON(rt_uint8_t ch, struct chrg_switch_t *pSW)
|
||||
返回说明: 0:状态处理成功 <0:参数、状态或命令提交失败
|
||||
其它说明: 每通道记录上次成功状态,相同状态不重复下发寄存器
|
||||
*****************************************************************/
|
||||
int workmode = 0;
|
||||
int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
{
|
||||
static uint8_t last_state[TOTAL_SOU_CHS] ={100,100,100,100};
|
||||
@@ -818,9 +876,12 @@ int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
return -1;
|
||||
}
|
||||
work_mode = pSW->sink.work_mode;
|
||||
workmode = work_mode;
|
||||
/* 异步等待状态需要持续检查批次或新量测,其余相同状态保持去重。 */
|
||||
if ((work_mode == last_state[idx]) &&
|
||||
(work_mode != SINK_WORK_INIT_AUX_WAIT) &&
|
||||
(work_mode != SINK_WORK_STOP_WAIT) &&
|
||||
(work_mode != SINK_WORK_STOP_RELAY_WAIT) &&
|
||||
(work_mode != SINK_WORK_UNLOAD_WAIT) &&
|
||||
(work_mode != SINK_WORK_LOW_AUX_WAIT) &&
|
||||
(work_mode != SINK_WORK_HANDSHAKE_WAIT)) {
|
||||
@@ -858,7 +919,17 @@ int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
ret = 0;
|
||||
break;
|
||||
case SINK_WORK_STOP:
|
||||
ret = chrg_sink_nor_work_off(idx,pSW);
|
||||
ret = chrg_sink_work_stop_prepare(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_STOP_WAIT:
|
||||
ret = chrg_sink_work_current_wait(idx, pSW,
|
||||
SINK_UNLOAD_NEXT_STOP_RELAY);
|
||||
break;
|
||||
case SINK_WORK_STOP_RELAY:
|
||||
ret = chrg_sink_work_stop_relay(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_STOP_RELAY_WAIT:
|
||||
ret = chrg_sink_work_stop_relay_wait(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_SWITCH:
|
||||
ret = chrg_sink_work_switch(idx,pSW);
|
||||
@@ -867,25 +938,17 @@ int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
ret = chrg_sink_work_protocol_unload(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_UNLOAD_WAIT:
|
||||
ret = chrg_sink_work_current_wait(idx, pSW, RT_FALSE);
|
||||
break;
|
||||
case SINK_WORK_SOFT_RESUME_WAIT:
|
||||
ret = 0;
|
||||
break;
|
||||
case SINK_WORK_SOFT_RESUME:
|
||||
ret = chrg_sink_work_soft_resume(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_SOFT_RUNNING:
|
||||
ret = 0;
|
||||
ret = chrg_sink_work_current_wait(idx, pSW,
|
||||
SINK_UNLOAD_NEXT_RUNNING);
|
||||
break;
|
||||
case SINK_WORK_HANDSHAKE_PREPARE:
|
||||
ret = chrg_sink_work_handshake_prepare(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_HANDSHAKE_WAIT:
|
||||
ret = chrg_sink_work_current_wait(idx, pSW, RT_TRUE);
|
||||
ret = chrg_sink_work_current_wait(idx, pSW,
|
||||
SINK_UNLOAD_NEXT_HANDSHAKE);
|
||||
break;
|
||||
case SINK_WORK_LOAD_STANDBY:
|
||||
case SINK_WORK_LOAD_SOFT_STANDBY:
|
||||
ret = 0;
|
||||
break;
|
||||
case SINK_WORK_LOAD_STOP:
|
||||
@@ -894,9 +957,6 @@ int chrg_sink_work(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
case SINK_WORK_LOAD_START:
|
||||
ret = chrg_sink_work_load_start(idx, pSW);
|
||||
break;
|
||||
case SINK_WORK_LOAD_RESUME:
|
||||
ret = chrg_sink_work_load_resume(idx, pSW);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -208,7 +208,8 @@ enum {
|
||||
*/
|
||||
#define SINK_LOAD_ENABLE_MIN_MA 100U
|
||||
|
||||
extern rt_bool_t chrg_sink_handshake_north_ready(eIDX_SOU_CH idx);
|
||||
/* 主继电器闭合后的0V持续监控:由北向轮询线程每轮调用,掉电立即转掉电保护。 */
|
||||
extern int chrg_sink_volt_low_protect(eIDX_SOU_CH idx, struct chrg_switch_t *pSW);
|
||||
|
||||
enum {
|
||||
SINK_WORK_INIT = 0, // 启动入口:第一条南向命令只打开副继电器
|
||||
@@ -219,23 +220,21 @@ enum {
|
||||
SINK_WORK_LOW, // 运行电压过低,执行掉电安全处理
|
||||
SINK_WORK_LOW_AUX_WAIT, // 等待掉电处理及副继电器恢复批次完成
|
||||
SINK_WORK_LOW_MONITOR, // 副继电器已恢复,等待输入电压重新出现
|
||||
SINK_WORK_STOP, // 用户主动停止负载
|
||||
SINK_WORK_STOP, // 用户主动停止:先停止负载并确认低电流
|
||||
SINK_WORK_SWITCH, // 停止旧电源后进入负载INIT
|
||||
SINK_WORK_PROTOCOL_UNLOAD, // 协议电压或电流变化:掉载但不切换继电器
|
||||
SINK_WORK_UNLOAD_WAIT, // 等待软卸载完成并连续两次确认电流不大于200mA
|
||||
SINK_WORK_SOFT_RESUME_WAIT, // 继电器保持闭合,等待协议电压稳定后恢复负载
|
||||
SINK_WORK_SOFT_RESUME, // 只恢复目标电流/电压和WORK_START,不写继电器
|
||||
SINK_WORK_SOFT_RUNNING, // 软恢复后的稳定运行状态,禁止重复切换继电器
|
||||
SINK_WORK_ON_TEST_DYNA, // 动态负载测试启动状态
|
||||
SINK_WORK_ON_TEST_SHORT, // 短路测试启动状态
|
||||
SINK_WORK_ON_TEST_OCP, // OCP过流保护测试启动状态
|
||||
SINK_WORK_HANDSHAKE_PREPARE, // 完整重握手:停止、清流、全关继电器后打开副继电器
|
||||
SINK_WORK_HANDSHAKE_WAIT, // 南向低电流确认与北向协议/CC并行
|
||||
SINK_WORK_LOAD_STANDBY, // 协议已就绪但主继电器未打开,低设定电流下保持停止
|
||||
SINK_WORK_LOAD_SOFT_STANDBY, // 协议和继电器保持不变,运行中降至低电流后的停止状态
|
||||
SINK_WORK_LOAD_STOP, // 运行中跨到低电流:只发送WORK_STOP关闭电子负载
|
||||
SINK_WORK_LOAD_START, // 主继电器未打开的低电流待机恢复:等待北向电压稳定后进入RUNING
|
||||
SINK_WORK_LOAD_RESUME, // 软待机跨回有效电流:等待北向电压稳定后进入SOFT_RESUME
|
||||
SINK_WORK_STOP_WAIT, // 关机:等待连续5次实际电流达到安全范围
|
||||
SINK_WORK_STOP_RELAY, // 关机:低电流确认后提交关闭南向继电器
|
||||
SINK_WORK_STOP_RELAY_WAIT // 关机:等待关闭南向继电器的回码
|
||||
};
|
||||
|
||||
// sink 参数结构
|
||||
|
||||
Reference in New Issue
Block a user