新增其他协议切换PD时先进行一次完整的断开线处理,包含D+D-,CC线,GND,VBUS,然后再发送复位,待复位后再重新设置
1. apps/chrg/applications/thread/chrg_north.h:调整北向调试宏默认配置 2. apps/chrg/applications/utils/chrg_source.h:新增Source全复位与初始化等待状态枚举 3. apps/chrg/applications/bsp/chrg_gpio.h:补充北向继电器引脚注释,明确功能对应关系 4. apps/chrg/applications/thread/chrg_comm.c:优化Source复位触发条件,仅非PD转PD执行全复位 5. apps/chrg/applications/utils/chrg_eload.c/h:新增南向板版本读取与解析接口,新增版本就绪校验逻辑 6. apps/boot/application/main.c:完善boot跳转APP逻辑,注释原循环运行代码 7. apps/chrg/applications/thread/chrg_roll_nor.c:新增INIT_WAIT状态处理,调整复位后流程与sub推进逻辑 8. apps/chrg/applications/thread/chrg_roll_sou.c:新增南向版本就绪标记,上电先读取版本再启动常规采集 9. apps/chrg/applications/utils/chrg_source.c:实现全复位流程与初始化等待状态处理函数
This commit is contained in:
@@ -179,6 +179,14 @@ int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len)
|
||||
return chrg_south_send(buf, 8);
|
||||
}
|
||||
|
||||
/* Read the version first so a newly powered south board is not queried with
|
||||
* the long measurement frame before its Modbus interface is ready. */
|
||||
int chrg_eload_read_version (rt_uint8_t addr)
|
||||
{
|
||||
return chrg_eload_read_regs(addr, MODBUSRTU_SW_VERSION_REG,
|
||||
MODBUSRTU_SW_VERSION_LEN);
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_eload_send_ymodem_data
|
||||
函数描述: 向南向发送ymodem协议升级数据
|
||||
@@ -292,6 +300,24 @@ int chrg_eload_refresh (rt_uint8_t addr, rt_uint8_t part)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int chrg_eload_parse_version (rt_uint8_t idx, rt_uint8_t *data, rt_uint16_t len)
|
||||
{
|
||||
rt_uint16_t version;
|
||||
|
||||
/* A one-register Modbus 0x03 response is 7 bytes including CRC16. */
|
||||
if ((idx >= TOTAL_SOU_CHS) || (data == RT_NULL) ||
|
||||
(len != (MODBUSRTU_SW_VERSION_LEN * 2U + 5U)) ||
|
||||
(data[0] != ID_ELOAD) || (data[1] != MB_REGISTER_RD) ||
|
||||
(data[2] != 2U) || (mb_crc16(data, len) != 0U)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
version = u8v_to_u16(&data[3]);
|
||||
/* HOLD_REG_CH0_VERSION is the per-channel south board version register. */
|
||||
usRegHoldBuf[HOLD_REG_CH0_VERSION + idx * TOTAL_HOLD_CH_REGS] = version;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_eload_parse
|
||||
函数描述: 解析源载返回数据
|
||||
|
||||
@@ -164,6 +164,10 @@ typedef enum {
|
||||
TOTAL_MB_R
|
||||
} eIDX_MB_PART;
|
||||
|
||||
/* South board firmware version register: one 16-bit register at 0x0301. */
|
||||
#define MODBUSRTU_SW_VERSION_REG 0x0301U
|
||||
#define MODBUSRTU_SW_VERSION_LEN 1U
|
||||
|
||||
#define SIZE_P1_RD 19 // 读19个寄存器
|
||||
#define SIZE_P2_RD 28 // 读28个寄存器
|
||||
|
||||
@@ -239,6 +243,15 @@ struct chrg_eload_t {
|
||||
*****************************************************************/
|
||||
extern int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len);
|
||||
|
||||
/*****************************************************************
|
||||
Function: chrg_eload_read_version
|
||||
Description: Request the south board firmware version register.
|
||||
Input: addr: south board address
|
||||
Output: -
|
||||
Return: <0: error, >0: sent length
|
||||
*****************************************************************/
|
||||
extern int chrg_eload_read_version (rt_uint8_t addr);
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_eload_write_reg
|
||||
函数描述: 向南向发送写单个寄存器
|
||||
@@ -268,6 +281,15 @@ extern int chrg_eload_refresh (rt_uint8_t addr, rt_uint8_t part);
|
||||
其它说明: -
|
||||
*****************************************************************/
|
||||
extern int chrg_eload_parse (rt_uint8_t idx, rt_uint8_t pt, rt_uint8_t *data, rt_uint16_t len);
|
||||
|
||||
/*****************************************************************
|
||||
Function: chrg_eload_parse_version
|
||||
Description: Parse and store a valid south board firmware version.
|
||||
Input: idx: channel, data: Modbus response, len: response length
|
||||
Output: firmware version is stored at the channel version register
|
||||
Return: 0: valid, <0: invalid response
|
||||
*****************************************************************/
|
||||
extern int chrg_eload_parse_version (rt_uint8_t idx, rt_uint8_t *data, rt_uint16_t len);
|
||||
/*****************************************************************
|
||||
函数名称: chrg_eload_get_sample_seq
|
||||
函数描述: 获取指定南向通道P1量测数据的更新序号
|
||||
|
||||
@@ -21,6 +21,16 @@
|
||||
|
||||
static int chrg_source_work_running(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
static int chrg_source_work_full_reset(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
static int chrg_source_work_full_reset_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
static int chrg_source_work_full_reset_relay(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
static int chrg_source_work_full_reset_relay_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
static int chrg_source_work_init_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW);
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_init_submit
|
||||
@@ -39,7 +49,7 @@ int chrg_source_init_submit(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
rt_uint16_t regs[5] = {
|
||||
REG_ELOAD,
|
||||
REG_MODE,
|
||||
0x01,
|
||||
REG_REL_ON,
|
||||
REG_CURRENT_OUT + 1,
|
||||
REG_WORK
|
||||
};
|
||||
@@ -88,8 +98,38 @@ static int chrg_source_work_init(eIDX_SOU_CH idx, struct chrg_switch_t *pSW)
|
||||
pNOR->enable[idx] = 1;
|
||||
pSOU->online[idx] = 1;
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, ID_SOURCE);
|
||||
/* 初始化批次必须全部收到南向回码后,才能继续协议设置或输出控制。 */
|
||||
pSW->source.work_mode = SOURCE_WORK_INIT_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_source_work_init_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
int result;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_is_pending(idx)) {
|
||||
return 1;
|
||||
}
|
||||
result = chrg_sou_com_batch_get_result(idx);
|
||||
if (result <= 0) {
|
||||
/* 南向初始化失败时,保持北向协议不变并重发完整初始化批次。 */
|
||||
pSW->source.work_mode = SOURCE_WORK_INIT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pSW->sub == IDX_SET_SOURCE_RESET) {
|
||||
/* 复位后的初始化完成,才允许进入PD协议设置。 */
|
||||
pSW->sub = IDX_SET_SOURCE_PD;
|
||||
pSW->source.work_mode = SOURCE_WORK_WAIT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (pSW->source.protocol == PRO_NONE) {
|
||||
/* 标准协议没有协商回码,INIT成功后立即由RUNING统一写入电压。 */
|
||||
/* 标准协议不等待协商,初始化完成后直接写入目标电压。 */
|
||||
pSW->source.work_mode = SOURCE_WORK_RUNING;
|
||||
return chrg_source_work_running(idx, pSW);
|
||||
}
|
||||
@@ -173,6 +213,87 @@ static int chrg_source_work_protocol_switch(eIDX_SOU_CH idx,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int chrg_source_work_full_reset(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
rt_uint16_t reg = REG_WORK;
|
||||
rt_uint16_t value = WORK_STOP;
|
||||
|
||||
/* Cancel stale south commands so the reset sequence starts from a known state. */
|
||||
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, 1) != 0) {
|
||||
return -1;
|
||||
}
|
||||
pSW->source.set_volt = 0;
|
||||
pSW->source.work_mode = SOURCE_WORK_FULL_RESET_WAIT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int chrg_source_work_full_reset_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
int result;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_is_pending(idx)) {
|
||||
return 1;
|
||||
}
|
||||
result = chrg_sou_com_batch_get_result(idx);
|
||||
if (result <= 0) {
|
||||
pSW->source.work_mode = SOURCE_WORK_FULL_RESET;
|
||||
return 1;
|
||||
}
|
||||
pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int chrg_source_work_full_reset_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, 1) != 0) {
|
||||
return -1;
|
||||
}
|
||||
pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY_WAIT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int chrg_source_work_full_reset_relay_wait(eIDX_SOU_CH idx,
|
||||
struct chrg_switch_t *pSW)
|
||||
{
|
||||
int result;
|
||||
|
||||
if ((idx >= TOTAL_SOU_CHS) || (pSW == RT_NULL)) {
|
||||
return -1;
|
||||
}
|
||||
if (chrg_sou_com_batch_is_pending(idx)) {
|
||||
return 1;
|
||||
}
|
||||
result = chrg_sou_com_batch_get_result(idx);
|
||||
if (result <= 0) {
|
||||
pSW->source.work_mode = SOURCE_WORK_FULL_RESET_RELAY;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* South relays are off; now disconnect D+/D- and CC before SOURCE_RESET. */
|
||||
chrg_nor_sw_rel((eIDX_NOR_CH)idx, 0);
|
||||
pSW->sub = IDX_SET_SOURCE_RESET;
|
||||
pSW->source.work_mode = SOURCE_WORK_WAIT;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_source_work_stop
|
||||
函数描述: 执行电源主动关机流程
|
||||
@@ -266,6 +387,16 @@ int chrg_source_work_state(rt_uint8_t idx, struct chrg_switch_t *pSW)
|
||||
return chrg_source_work_switch(idx, pSW);
|
||||
case SOURCE_WORK_PROTOCOL_SWITCH:
|
||||
return chrg_source_work_protocol_switch(idx, pSW);
|
||||
case SOURCE_WORK_FULL_RESET:
|
||||
return chrg_source_work_full_reset(idx, pSW);
|
||||
case SOURCE_WORK_FULL_RESET_WAIT:
|
||||
return chrg_source_work_full_reset_wait(idx, pSW);
|
||||
case SOURCE_WORK_FULL_RESET_RELAY:
|
||||
return chrg_source_work_full_reset_relay(idx, pSW);
|
||||
case SOURCE_WORK_FULL_RESET_RELAY_WAIT:
|
||||
return chrg_source_work_full_reset_relay_wait(idx, pSW);
|
||||
case SOURCE_WORK_INIT_WAIT:
|
||||
return chrg_source_work_init_wait(idx, pSW);
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -169,6 +169,11 @@ enum {
|
||||
SOURCE_WORK_STOP, // 主动停止并关闭通道
|
||||
SOURCE_WORK_SWITCH, // 停止旧负载后进入电源INIT
|
||||
SOURCE_WORK_PROTOCOL_SWITCH, // 协议/CC切换前清零功率板输出
|
||||
SOURCE_WORK_FULL_RESET, // Submit output clear and stop commands
|
||||
SOURCE_WORK_FULL_RESET_WAIT, // Wait for output clear and stop
|
||||
SOURCE_WORK_FULL_RESET_RELAY, // Submit south relay-off command
|
||||
SOURCE_WORK_FULL_RESET_RELAY_WAIT,// Wait before disconnecting north relay
|
||||
SOURCE_WORK_INIT_WAIT, // Wait for Source init batch completion
|
||||
SOURCE_WORK_ON_TEST_DYNA,
|
||||
SOURCE_WORK_ON_TEST_SHORT,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user