feat: 更新南向升级协议,修改升级流程逻辑
改为南向主动发送C,不再向南向发送进入和退出 1 升级进入/退出命令不再向南向发送控制帧,本地会话建立后立即响应成功 2 功率板Boot主动每500ms发送'C',协议板收到后转发给上位机 3 更新协议板版本寄存器为0x0143,版本号升级至V1.1.51 4 调整升级状态机,删除等待南向ACK的相关逻辑 5 更新相关文档,同步升级协议和状态机的修改内容
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
#define HOLD_REG_FIRMWARE_VERSION 0x0300U /* 协议板固件版本,只读 */
|
||||
#define CHRG_FIRMWARE_VERSION 0x0141U /* 当前协议板版本:V1.1.49 */
|
||||
#define CHRG_FIRMWARE_VERSION 0x0143U /* 当前协议板版本:V1.1.51 */
|
||||
|
||||
|
||||
rt_uint8_t ucDiscInBuf[(TOTAL_DISC_REGS+BITS_UCHAR-1)/BITS_UCHAR];
|
||||
@@ -1403,10 +1403,9 @@ eMBException funYmodemUpadata (rt_uint8_t *reqFrame, rt_uint16_t reqLen,
|
||||
return MB_EX_ILLEGAL_DATA_VALUE;
|
||||
}
|
||||
|
||||
/* 保留原0x20响应内容,外层统一补设备地址和Modbus CRC。 */
|
||||
resFrame[0] = reqFrame[0];
|
||||
resFrame[1] = ACK;
|
||||
*resLen = 2;
|
||||
/* 成功时回显地址、功能码、保留字节、通道和操作,外层统一补CRC。 */
|
||||
rt_memcpy(resFrame, reqFrame, 6);
|
||||
*resLen = 6;
|
||||
return MB_EX_NONE;
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
#define SOUTH_FRAME_DEBUG 0x00 // 南向UART原始收发帧
|
||||
#define SOUTH_COMMAND_DEBUG 0x01 // 南向寄存器写命令
|
||||
#define SOUTH_YMODEM_DEBUG 0x01 // 南向YMODEM回码
|
||||
#define SOUTH_YMODEM_EXIT_APP 0x01 // 升级退出时发送南向跳转App帧
|
||||
#define COMM_FRAME_DEBUG 0x00 // COM UART原始收发帧
|
||||
#define COMM_DEBUG 0x00 // COM寄存器读写过程
|
||||
#define COMM_TRIM_DEBUG 0x00 // COM校准参数解析
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
/* CHRG application version. Keep this value synchronized with the changelog. */
|
||||
#define CHRG_VERSION_MAJOR 1U
|
||||
#define CHRG_VERSION_MINOR 1U
|
||||
#define CHRG_VERSION_PATCH 49U
|
||||
#define CHRG_VERSION_STRING "V1.1.49"
|
||||
#define CHRG_VERSION_PATCH 51U
|
||||
#define CHRG_VERSION_STRING "V1.1.51"
|
||||
|
||||
/*
|
||||
* Channel polling mode:
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#include "chrg_def.h"
|
||||
#include "chrg_thread.h"
|
||||
#include "chrg_north.h"
|
||||
#include "chrg_south.h"
|
||||
#include "chrg_roll_sou.h"
|
||||
#include "chrg_eload.h"
|
||||
@@ -19,9 +18,7 @@
|
||||
|
||||
#define YMODEM_RX_FRAME_TIMEOUT_MS 1000U // PC分段数据拼帧超时
|
||||
#define YMODEM_SESSION_IDLE_MS 15000U // 整个升级会话无有效数据超时
|
||||
#define YMODEM_ENTER_TIMEOUT_MS 15000U // 功率板进入Boot及擦除等待时间
|
||||
#define YMODEM_RESPONSE_TIMEOUT_MS 10000U // 南向单帧应答等待时间
|
||||
#define YMODEM_PREPARE_DELAY_MS 200U // 切换升级模式后等待功率板重启稳定
|
||||
|
||||
typedef struct {
|
||||
chrg_ymodem_proxy_state_t state; // 当前升级阶段
|
||||
@@ -30,7 +27,6 @@ typedef struct {
|
||||
rt_uint8_t current_packet; // 当前已转发帧的包号,仅用于日志
|
||||
rt_uint8_t meta_ack_seen; // 元数据ACK已收到,后续才接受'C'
|
||||
rt_uint8_t eot2_ack_seen; // 第二个EOT的ACK已收到
|
||||
rt_uint8_t deferred_c; // 进入Boot时与ACK同批到达的'C'延后转发
|
||||
rt_uint16_t rx_len; // 北向当前已拼接字节数
|
||||
rt_uint16_t expected_len; // 根据SOH/STX计算的完整帧长度
|
||||
rt_tick_t rx_tick; // 当前半帧起始时间
|
||||
@@ -46,13 +42,6 @@ static chrg_ymodem_proxy_t g_proxy = {
|
||||
.ch = 0xFFU
|
||||
};
|
||||
|
||||
/* 功率板进入Boot和跳转App的固定Modbus控制帧。 */
|
||||
static const rt_uint8_t g_enter_frame[8] =
|
||||
{ID_ELOAD, 0x06, 0x00, 0x0F, 0x00, 0xFF, 0xF8, 0x6B};
|
||||
#if SOUTH_YMODEM_EXIT_APP
|
||||
static const rt_uint8_t g_exit_frame[8] =
|
||||
{ID_ELOAD, 0x06, 0x00, 0x0F, 0x00, 0x0F, 0xF8, 0x2F};
|
||||
#endif
|
||||
static const rt_uint8_t g_cancel_frame[2] = {YM_CAN, YM_CAN};
|
||||
|
||||
static const char *chrg_ymodem_proxy_state_name(chrg_ymodem_proxy_state_t state)
|
||||
@@ -245,7 +234,10 @@ static int chrg_ymodem_proxy_prepare_channel(rt_uint8_t ch)
|
||||
roll->leng = 0U;
|
||||
roll->updata_result = 0;
|
||||
rt_mutex_release(thread->mutex);
|
||||
rt_thread_mdelay(YMODEM_PREPARE_DELAY_MS);
|
||||
if (chrg_south_switch((eIDX_SOU_CH)ch) != 0) {
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return -3;
|
||||
}
|
||||
chrg_eload_clear_ymodem_resp();
|
||||
if (chrgsouth.rb != RT_NULL) rt_ringbuffer_reset(chrgsouth.rb);
|
||||
return 0;
|
||||
@@ -253,88 +245,38 @@ static int chrg_ymodem_proxy_prepare_channel(rt_uint8_t ch)
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_ymodem_proxy_enter
|
||||
函数描述: 进入指定功率板的Boot升级模式
|
||||
函数描述: 锁定指定功率板通道并等待Boot周期发送'C'
|
||||
输入参数: ch:南向通道编号
|
||||
返回说明: 0:收到功率板ACK <0:进入失败
|
||||
其它说明: 仅在真实ACK到达后允许COM回复PC成功
|
||||
返回说明: 0:本地升级会话已建立 <0:进入失败
|
||||
其它说明: 不向南向发送进入指令,建立会话后立即允许COM回复PC成功
|
||||
*****************************************************************/
|
||||
int chrg_ymodem_proxy_enter(rt_uint8_t ch)
|
||||
{
|
||||
rt_tick_t start;
|
||||
rt_uint8_t response;
|
||||
|
||||
if (g_proxy.state != YMODEM_PROXY_IDLE) return -1;
|
||||
if (chrg_ymodem_proxy_prepare_channel(ch) != 0) return -2;
|
||||
chrg_ymodem_proxy_reset();
|
||||
g_proxy.ch = ch;
|
||||
g_proxy.state = YMODEM_PROXY_ENTERING;
|
||||
g_proxy.state = YMODEM_PROXY_WAIT_C;
|
||||
g_proxy.activity_tick = rt_tick_get();
|
||||
if (chrg_send_sou_upadata_data(g_enter_frame, sizeof(g_enter_frame)) != 0) {
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return -3;
|
||||
}
|
||||
start = rt_tick_get();
|
||||
while ((rt_tick_t)(rt_tick_get() - start) <
|
||||
rt_tick_from_millisecond(YMODEM_ENTER_TIMEOUT_MS)) {
|
||||
response = chrg_eload_get_ymodem_resp();
|
||||
if (response == ACK) {
|
||||
g_proxy.state = YMODEM_PROXY_WAIT_C;
|
||||
g_proxy.activity_tick = rt_tick_get();
|
||||
return 0;
|
||||
}
|
||||
if (response == ACK_C) g_proxy.deferred_c = 1U;
|
||||
if ((response == NAK) || (response == YM_CAN)) break;
|
||||
rt_thread_mdelay(1U);
|
||||
}
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return -4;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
函数名称: chrg_ymodem_proxy_exit
|
||||
函数描述: 跳转功率板App并恢复普通南向轮询
|
||||
函数描述: 立即结束本地升级会话并恢复普通南向轮询
|
||||
输入参数: ch:当前升级通道
|
||||
返回说明: 0:收到跳转ACK <0:状态或通信失败
|
||||
其它说明: 升级会话任意阶段均可退出,退出后强制刷新版本
|
||||
返回说明: 0:退出成功 <0:通道错误
|
||||
其它说明: 不向南向发送退出指令,也不等待南向回码
|
||||
*****************************************************************/
|
||||
int chrg_ymodem_proxy_exit(rt_uint8_t ch)
|
||||
{
|
||||
#if SOUTH_YMODEM_EXIT_APP
|
||||
rt_tick_t start;
|
||||
rt_uint8_t response;
|
||||
#endif
|
||||
|
||||
if (ch >= TOTAL_SOU_CHS) return -1;
|
||||
if (g_proxy.state == YMODEM_PROXY_IDLE) {
|
||||
if (chrg_ymodem_proxy_prepare_channel(ch) != 0) return -2;
|
||||
g_proxy.ch = ch;
|
||||
} else if (ch != g_proxy.ch) {
|
||||
if ((g_proxy.state != YMODEM_PROXY_IDLE) && (ch != g_proxy.ch)) {
|
||||
return -1;
|
||||
}
|
||||
#if SOUTH_YMODEM_EXIT_APP
|
||||
g_proxy.state = YMODEM_PROXY_EXITING;
|
||||
chrg_eload_clear_ymodem_resp();
|
||||
if (chrg_send_sou_upadata_data(g_exit_frame, sizeof(g_exit_frame)) != 0)
|
||||
return -3;
|
||||
start = rt_tick_get();
|
||||
while ((rt_tick_t)(rt_tick_get() - start) <
|
||||
rt_tick_from_millisecond(YMODEM_RESPONSE_TIMEOUT_MS)) {
|
||||
response = chrg_eload_get_ymodem_resp();
|
||||
if (response == ACK) {
|
||||
chrg_roll_sou_version_invalidate(ch);
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return 0;
|
||||
}
|
||||
if ((response == NAK) || (response == YM_CAN)) break;
|
||||
rt_thread_mdelay(1U);
|
||||
}
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return -4;
|
||||
#else
|
||||
chrg_roll_sou_version_invalidate(ch);
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* 根据当前阶段校验完整帧,校验成功才允许提交南向。 */
|
||||
@@ -542,10 +484,6 @@ rt_uint16_t chrg_ymodem_proxy_poll(rt_uint8_t *output,
|
||||
chrg_ymodem_proxy_session_stop();
|
||||
return 0U;
|
||||
}
|
||||
if (g_proxy.deferred_c && (g_proxy.state == YMODEM_PROXY_WAIT_C)) {
|
||||
g_proxy.deferred_c = 0U;
|
||||
chrg_ymodem_proxy_handle_south(ACK_C);
|
||||
}
|
||||
response = chrg_eload_get_ymodem_resp();
|
||||
if (response != 0U) chrg_ymodem_proxy_handle_south(response);
|
||||
if ((g_proxy.expected_len != 0U) && (g_proxy.rx_tick != 0U) &&
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
typedef enum {
|
||||
YMODEM_PROXY_IDLE = 0, // 未进入升级模式
|
||||
YMODEM_PROXY_ENTERING, // 已发送进入Boot控制帧,等待ACK
|
||||
YMODEM_PROXY_ENTERING, // 保留状态
|
||||
YMODEM_PROXY_WAIT_C, // 进入Boot成功,等待功率板'C'
|
||||
YMODEM_PROXY_WAIT_META, // 等待PC发送包号0元数据SOH
|
||||
YMODEM_PROXY_WAIT_META_RESP, // 元数据已转发,等待南向ACK和'C'
|
||||
@@ -21,13 +21,13 @@ typedef enum {
|
||||
YMODEM_PROXY_WAIT_END_SOH, // 等待包号0且数据全零的结束SOH
|
||||
YMODEM_PROXY_WAIT_END_ACK, // 结束SOH已转发,等待南向ACK
|
||||
YMODEM_PROXY_TRANSFER_DONE, // YMODEM传输完成,等待0x20退出命令
|
||||
YMODEM_PROXY_EXITING, // 已发送跳转App控制帧,等待ACK
|
||||
YMODEM_PROXY_EXITING, // 保留状态
|
||||
YMODEM_PROXY_ABORT // 异常取消,等待CAN发送完成
|
||||
} chrg_ymodem_proxy_state_t;
|
||||
|
||||
/* 锁定目标通道并进入功率板Boot,收到真实ACK后才返回成功。 */
|
||||
/* 锁定目标通道并等待功率板Boot周期发送'C'。 */
|
||||
extern int chrg_ymodem_proxy_enter(rt_uint8_t ch);
|
||||
/* 仅传输完成后允许跳转App,收到ACK后恢复普通轮询。 */
|
||||
/* 立即结束本地升级会话并恢复普通轮询。 */
|
||||
extern int chrg_ymodem_proxy_exit(rt_uint8_t ch);
|
||||
/* 累计PC分段数据,形成完整YMODEM帧后校验并提交南向。 */
|
||||
extern int chrg_ymodem_proxy_feed_north(const rt_uint8_t *data,
|
||||
|
||||
Reference in New Issue
Block a user