feat: 更新版本至V1.1.54并优化南向写寄存器日志

1 更新协议板版本寄存器值为0x0146
2 调整短路测试启动间隔为100ms
3 修改电压源选择默认值为6
4 移除南向写寄存器调试打印宏
5 新增基于实际通道号的南向写寄存器调试日志
6 同步版本号与日志文档内容
This commit is contained in:
wrh
2026-10-09 09:22:41 +08:00
parent 0ed8c98e48
commit d932c98dc8
7 changed files with 22 additions and 9 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
#include "stm32f4xx_hal.h" #include "stm32f4xx_hal.h"
#define HOLD_REG_FIRMWARE_VERSION 0x0300U /* 协议板固件版本,只读 */ #define HOLD_REG_FIRMWARE_VERSION 0x0300U /* 协议板固件版本,只读 */
#define CHRG_FIRMWARE_VERSION 0x0145U /* 当前协议板版本:V1.1.53 */ #define CHRG_FIRMWARE_VERSION 0x0146U /* 当前协议板版本:V1.1.54 */
rt_uint8_t ucDiscInBuf[(TOTAL_DISC_REGS+BITS_UCHAR-1)/BITS_UCHAR]; rt_uint8_t ucDiscInBuf[(TOTAL_DISC_REGS+BITS_UCHAR-1)/BITS_UCHAR];
+1 -1
View File
@@ -16,7 +16,7 @@
#include "chrg_def.h" #include "chrg_def.h"
/* V_On启停判定电压源:切换后需重新编译固件。 */ /* V_On启停判定电压源:切换后需重新编译固件。 */
#define SINK_VON_VOLTAGE_FROM_PROTOCOL 1U #define SINK_VON_VOLTAGE_FROM_PROTOCOL 6U
#define SINK_VON_VOLTAGE_FROM_POWER 2U #define SINK_VON_VOLTAGE_FROM_POWER 2U
#ifndef SINK_VON_VOLTAGE_SOURCE #ifndef SINK_VON_VOLTAGE_SOURCE
#define SINK_VON_VOLTAGE_SOURCE SINK_VON_VOLTAGE_FROM_POWER #define SINK_VON_VOLTAGE_SOURCE SINK_VON_VOLTAGE_FROM_POWER
@@ -963,6 +963,11 @@ void chrg_roll_sou_thread_entry (void *data)
continue; continue;
} }
pROLL->idx = (eIDX_SOU_CH)single_ch; pROLL->idx = (eIDX_SOU_CH)single_ch;
#if SOUTH_COMMAND_DEBUG
/* 此处已完成物理通道选通,打印通道号比固定的Modbus从机地址更便于排查。 */
rt_kprintf("south write: ch=%d reg=0x%04x value=0x%04x\n",
single_ch + 1U, single_reg, single_value);
#endif
chrg_eload_write_reg(ID_ELOAD, single_reg, single_value); chrg_eload_write_reg(ID_ELOAD, single_reg, single_value);
} }
break; break;
@@ -983,6 +988,11 @@ void chrg_roll_sou_thread_entry (void *data)
continue; continue;
} }
pROLL->idx = (eIDX_SOU_CH)command_ch; pROLL->idx = (eIDX_SOU_CH)command_ch;
#if SOUTH_COMMAND_DEBUG
/* COM批次按选通后的实际通道打印南向写寄存器指令。 */
rt_kprintf("south write: ch=%d reg=0x%04x value=0x%04x\n",
command_ch + 1U, command_reg, command_value);
#endif
chrg_eload_write_reg(ID_ELOAD, command_reg, command_value); chrg_eload_write_reg(ID_ELOAD, command_reg, command_value);
} }
break; break;
+2 -2
View File
@@ -14,8 +14,8 @@
/* CHRG application version. Keep this value synchronized with the changelog. */ /* CHRG application version. Keep this value synchronized with the changelog. */
#define CHRG_VERSION_MAJOR 1U #define CHRG_VERSION_MAJOR 1U
#define CHRG_VERSION_MINOR 1U #define CHRG_VERSION_MINOR 1U
#define CHRG_VERSION_PATCH 53U #define CHRG_VERSION_PATCH 54U
#define CHRG_VERSION_STRING "V1.1.53" #define CHRG_VERSION_STRING "V1.1.54"
/* /*
* Channel polling mode: * Channel polling mode:
@@ -276,10 +276,6 @@ int chrg_eload_read_regs (rt_uint8_t addr, rt_uint16_t reg, rt_uint16_t len)
u16_to_u8v(value, &buf[4]); u16_to_u8v(value, &buf[4]);
crc = mb_crc16(buf, 6); crc = mb_crc16(buf, 6);
u16_to_u8v(swap_u16(crc), &buf[6]); u16_to_u8v(swap_u16(crc), &buf[6]);
#if SOUTH_COMMAND_DEBUG
rt_kprintf("south write: addr=%d reg=0x%04x value=0x%04x\n",
addr, reg, value);
#endif
return chrg_south_send(buf, 8); return chrg_south_send(buf, 8);
} }
+1 -1
View File
@@ -21,7 +21,7 @@ struct chrg_switch_t;
#define SINK_TEST_OCP 2 #define SINK_TEST_OCP 2
#define SINK_TEST_DYNA 3 #define SINK_TEST_DYNA 3
/* 短路测试期间按该周期补发WORK_START,防止功率板因超时停止。 */ /* 短路测试期间按该周期补发WORK_START,防止功率板因超时停止。 */
#define SINK_SHORT_START_INTERVAL_MS 50U #define SINK_SHORT_START_INTERVAL_MS 100U
/* 短路测试不受普通V_ON门槛限制,功率板使用最低启动电压。 */ /* 短路测试不受普通V_ON门槛限制,功率板使用最低启动电压。 */
#define SINK_SHORT_TEST_VON_MV 500U #define SINK_SHORT_TEST_VON_MV 500U
//短路测试结构体 //短路测试结构体
+7
View File
@@ -1,5 +1,12 @@
# 修改日志 # 修改日志
## V1.1.54 - 2026-10-05
### 南向写寄存器打印通道号
- 南向写寄存器日志改为打印实际选通通道号,不再打印固定的Modbus从机地址。
- 协议板版本寄存器 `0x0300` 更新为 `0x0146`。
## V1.1.53 - 2026-09-30 ## V1.1.53 - 2026-09-30
### 负载协议切换后CC恢复 ### 负载协议切换后CC恢复