Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 gaoro-xiao
|
5567c7412d | ||
|
gaoro-xiao
|
fbe76bbdd5 | ||
|
gaoro-xiao
|
b0aa9ffc96 | ||
|
gaoro-xiao
|
6fbe09eec9 | ||
|
gaoro-xiao
|
be80b9dcb1 | ||
|
gaoro-xiao
|
5e9b140db8 |
@@ -49,3 +49,4 @@ WiresharkLog/
|
||||
.embeddedskills/
|
||||
uv4_stdout.txt
|
||||
MDK-ARM/EventRecorderStub.scvd
|
||||
MDK-ARM/build_capture.txt
|
||||
|
||||
+45
-1
@@ -143,6 +143,12 @@ UART 记号约定：
|
||||
- `U0 = USART2`
|
||||
- `U1 = USART3`
|
||||
|
||||
### 7.4 BAUD 默认值
|
||||
|
||||
```text
|
||||
BAUD = U0,115200 / U1,115200
|
||||
```
|
||||
|
||||
## 8. AT 命令定义
|
||||
|
||||
### 8.1 测试设备在线
|
||||
@@ -239,7 +245,45 @@ OK
|
||||
|
||||
当MAC设置为全0时，固件将使用硬件MAC地址，此时通过AT+?查询到的MAC地址即为当前生效的硬件MAC地址。
|
||||
|
||||
### 8.5 LINK 类命令
|
||||
### 8.5 BAUD 类命令
|
||||
|
||||
#### 查询 UART 波特率
|
||||
|
||||
```text
|
||||
AT+BAUD?\r\n
|
||||
```
|
||||
|
||||
返回示例：
|
||||
|
||||
```text
|
||||
+BAUD:U0=115200,U1=115200
|
||||
OK
|
||||
```
|
||||
|
||||
#### 设置 UART 波特率
|
||||
|
||||
```text
|
||||
AT+BAUD=U0,115200\r\n
|
||||
AT+BAUD=U1,38400\r\n
|
||||
```
|
||||
|
||||
字段顺序：
|
||||
|
||||
```text
|
||||
UART,BAUDRATE
|
||||
```
|
||||
|
||||
字段说明：
|
||||
|
||||
- `UART`：`U0/U1`
|
||||
- `BAUDRATE`：范围 `1200~921600`
|
||||
|
||||
说明：
|
||||
|
||||
- 该命令只更新当前运行配置记录，不会立即重初始化 `USART2/USART3`
|
||||
- 执行 `AT+SAVE` 后再执行 `AT+RESET`，重启时按保存值生效
|
||||
|
||||
### 8.6 LINK 类命令
|
||||
|
||||
#### 设置单条 LINK 记录
|
||||
|
||||
|
||||
+44
-2
@@ -365,8 +365,8 @@ static at_result_t handle_summary_query(char *response, uint16_t max_len)
|
||||
g_config.links[2].enabled, g_config.links[2].local_port, rip_str[2], g_config.links[2].remote_port, link_uart_to_str(g_config.links[2].uart),
|
||||
g_config.links[3].enabled, g_config.links[3].local_port, rip_str[3], g_config.links[3].remote_port, link_uart_to_str(g_config.links[3].uart),
|
||||
g_config.mux_mode,
|
||||
g_config.uart_baudrate[0],
|
||||
g_config.uart_baudrate[1]);
|
||||
(unsigned long)g_config.uart_baudrate[0],
|
||||
(unsigned long)g_config.uart_baudrate[1]);
|
||||
|
||||
return AT_OK;
|
||||
}
|
||||
@@ -386,6 +386,16 @@ static at_result_t handle_net_query(char *response, uint16_t max_len)
|
||||
return AT_OK;
|
||||
}
|
||||
|
||||
static at_result_t handle_baud_query(char *response, uint16_t max_len)
|
||||
{
|
||||
snprintf(response,
|
||||
max_len,
|
||||
"+BAUD:U0=%lu,U1=%lu\r\nOK\r\n",
|
||||
(unsigned long)g_config.uart_baudrate[0],
|
||||
(unsigned long)g_config.uart_baudrate[1]);
|
||||
return AT_OK;
|
||||
}
|
||||
|
||||
static at_result_t handle_link_query(uint32_t index, char *response, uint16_t max_len)
|
||||
{
|
||||
char rip_str[16];
|
||||
@@ -556,6 +566,38 @@ at_result_t config_process_at_cmd(const char *cmd, char *response, uint16_t max_
|
||||
snprintf(response, max_len, "OK\r\n");
|
||||
return AT_NEED_REBOOT;
|
||||
}
|
||||
if (equals_ignore_case(p, "BAUD?")) {
|
||||
return handle_baud_query(response, max_len);
|
||||
}
|
||||
if (parse_command_with_value(p, "BAUD", &value)) {
|
||||
char value_copy[32];
|
||||
char *cursor;
|
||||
char *token;
|
||||
uint8_t uart;
|
||||
uint32_t baudrate;
|
||||
|
||||
strncpy(value_copy, value, sizeof(value_copy) - 1u);
|
||||
value_copy[sizeof(value_copy) - 1u] = '\0';
|
||||
cursor = value_copy;
|
||||
|
||||
token = config_next_token(&cursor);
|
||||
if (token == NULL || parse_link_uart(token, &uart) != 0) {
|
||||
snprintf(response, max_len, "ERROR: Invalid route field\r\n");
|
||||
return AT_INVALID_PARAM;
|
||||
}
|
||||
token = config_next_token(&cursor);
|
||||
if (token == NULL || parse_u32_value(token, 1200u, 921600u, &baudrate) != 0) {
|
||||
snprintf(response, max_len, "ERROR: Invalid baudrate\r\n");
|
||||
return AT_INVALID_PARAM;
|
||||
}
|
||||
if (config_next_token(&cursor) != NULL) {
|
||||
snprintf(response, max_len, "ERROR: Invalid value\r\n");
|
||||
return AT_INVALID_PARAM;
|
||||
}
|
||||
|
||||
g_config.uart_baudrate[uart] = baudrate;
|
||||
return handle_baud_query(response, max_len) == AT_OK ? AT_NEED_REBOOT : AT_ERROR;
|
||||
}
|
||||
if (equals_ignore_case(p, "NET?")) {
|
||||
return handle_net_query(response, max_len);
|
||||
}
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ void MX_IWDG_Init(void)
|
||||
|
||||
/* USER CODE END IWDG_Init 1 */
|
||||
hiwdg.Instance = IWDG;
|
||||
hiwdg.Init.Prescaler = IWDG_PRESCALER_4;
|
||||
hiwdg.Init.Prescaler = IWDG_PRESCALER_64;
|
||||
hiwdg.Init.Reload = 4095;
|
||||
if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
|
||||
{
|
||||
|
||||
+4
-3
@@ -117,6 +117,9 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
||||
if (g_led_blink_ticks >= 1000u) {
|
||||
g_led_blink_ticks = 0u;
|
||||
LED_Toggle();
|
||||
if (hiwdg.Instance == IWDG) {
|
||||
HAL_IWDG_Refresh(&hiwdg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -530,9 +533,6 @@ static void App_Poll(void)
|
||||
NVIC_SystemReset();
|
||||
}
|
||||
|
||||
if (hiwdg.Instance == IWDG) {
|
||||
HAL_IWDG_Refresh(&hiwdg);
|
||||
}
|
||||
}
|
||||
/* USER CODE END 0 */
|
||||
|
||||
@@ -547,6 +547,7 @@ int main(void)
|
||||
MX_USART3_UART_Init();
|
||||
MX_SPI1_Init();
|
||||
MX_TIM4_Init();
|
||||
MX_IWDG_Init();
|
||||
|
||||
LED_Init();
|
||||
LED_StartBlink();
|
||||
|
||||
+114
-39
@@ -40,12 +40,42 @@ static uint8_t g_ch390_ready;
|
||||
static ch390_diag_t g_diag;
|
||||
static uint8_t g_tx_consecutive_timeout;
|
||||
static uint8_t g_chip_reset_count;
|
||||
static uint8_t g_link_restart_pending;
|
||||
|
||||
#define TX_TIMEOUT_THRESHOLD 3u
|
||||
#define CHIP_RESET_MAX 3u
|
||||
#define TX_BUSY_WAIT_TIMEOUT_MS 10u
|
||||
#define TX_TIMEOUT_RESET_THRESHOLD 6u
|
||||
#define HEALTH_FAIL_THRESHOLD 3u
|
||||
#define RESTART_PENDING_FLAG 0x01u
|
||||
#define HEALTH_FAIL_SHIFT 4u
|
||||
#define HEALTH_FAIL_MASK 0xF0u
|
||||
|
||||
#define TX_TIMEOUT_THRESHOLD 3u
|
||||
#define CHIP_RESET_MAX 3u
|
||||
static bool ch390_mac_address_valid(const uint8_t *mac);
|
||||
|
||||
static uint8_t ch390_runtime_is_restart_pending(void)
|
||||
{
|
||||
return (uint8_t)(g_link_restart_pending & RESTART_PENDING_FLAG);
|
||||
}
|
||||
|
||||
static void ch390_runtime_set_restart_pending(void)
|
||||
{
|
||||
g_link_restart_pending = (uint8_t)(g_link_restart_pending | RESTART_PENDING_FLAG);
|
||||
}
|
||||
|
||||
static void ch390_runtime_clear_restart_pending(void)
|
||||
{
|
||||
g_link_restart_pending = (uint8_t)(g_link_restart_pending & (uint8_t)(~RESTART_PENDING_FLAG));
|
||||
}
|
||||
|
||||
static uint8_t ch390_runtime_get_health_fail_count(void)
|
||||
{
|
||||
return (uint8_t)((g_link_restart_pending & HEALTH_FAIL_MASK) >> HEALTH_FAIL_SHIFT);
|
||||
}
|
||||
|
||||
static void ch390_runtime_set_health_fail_count(uint8_t count)
|
||||
{
|
||||
g_link_restart_pending = (uint8_t)((g_link_restart_pending & (uint8_t)(~HEALTH_FAIL_MASK)) |
|
||||
(uint8_t)((count << HEALTH_FAIL_SHIFT) & HEALTH_FAIL_MASK));
|
||||
}
|
||||
|
||||
static uint8_t ch390_runtime_probe_identity(void)
|
||||
{
|
||||
@@ -76,6 +106,38 @@ static uint8_t ch390_runtime_probe_identity(void)
|
||||
return g_diag.id_valid;
|
||||
}
|
||||
|
||||
static void ch390_runtime_prepare_netif(struct netif *netif)
|
||||
{
|
||||
struct ethernetif *ethernetif;
|
||||
|
||||
if (netif == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
netif->hwaddr_len = ETHARP_HWADDR_LEN;
|
||||
netif->mtu = 1500;
|
||||
netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET;
|
||||
|
||||
ethernetif = (struct ethernetif *)netif->state;
|
||||
if (ethernetif != NULL) {
|
||||
ethernetif->rx_len = 0u;
|
||||
ethernetif->rx_status = 0u;
|
||||
}
|
||||
}
|
||||
|
||||
static void ch390_runtime_sync_mac(struct netif *netif)
|
||||
{
|
||||
if (netif == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (ch390_mac_address_valid(netif->hwaddr)) {
|
||||
ch390_set_mac_address(netif->hwaddr);
|
||||
}
|
||||
|
||||
ch390_get_mac(netif->hwaddr);
|
||||
}
|
||||
|
||||
static void ch390_runtime_refresh_diag(void)
|
||||
{
|
||||
uint8_t id_valid = ch390_runtime_probe_identity();
|
||||
@@ -165,7 +227,7 @@ struct pbuf *ch390_runtime_input_frame(struct netif *netif)
|
||||
return p;
|
||||
}
|
||||
|
||||
bool ch390_mac_address_valid(const uint8_t *mac)
|
||||
static bool ch390_mac_address_valid(const uint8_t *mac)
|
||||
{
|
||||
if (mac == NULL) {
|
||||
return false;
|
||||
@@ -180,8 +242,6 @@ bool ch390_mac_address_valid(const uint8_t *mac)
|
||||
|
||||
void ch390_runtime_init(struct netif *netif, const uint8_t *mac)
|
||||
{
|
||||
struct ethernetif *ethernetif = (struct ethernetif *)netif->state;
|
||||
|
||||
SEGGER_RTT_WriteString(0, "ETH init: gpio\r\n");
|
||||
ch390_gpio_init();
|
||||
SEGGER_RTT_WriteString(0, "ETH init: spi\r\n");
|
||||
@@ -192,13 +252,7 @@ void ch390_runtime_init(struct netif *netif, const uint8_t *mac)
|
||||
SEGGER_RTT_WriteString(0, "ETH init: probe\r\n");
|
||||
g_ch390_ready = ch390_runtime_probe_identity();
|
||||
if (g_ch390_ready == 0u) {
|
||||
netif->hwaddr_len = ETHARP_HWADDR_LEN;
|
||||
netif->mtu = 1500;
|
||||
netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET;
|
||||
|
||||
ethernetif->rx_len = 0u;
|
||||
ethernetif->rx_status = 0u;
|
||||
|
||||
ch390_runtime_prepare_netif(netif);
|
||||
netif_set_link_down(netif);
|
||||
SEGGER_RTT_WriteString(0, "ETH init: invalid chip id\r\n");
|
||||
return;
|
||||
@@ -221,14 +275,9 @@ void ch390_runtime_init(struct netif *netif, const uint8_t *mac)
|
||||
}
|
||||
}
|
||||
|
||||
netif->hwaddr_len = ETHARP_HWADDR_LEN;
|
||||
SEGGER_RTT_WriteString(0, "ETH init: getmac\r\n");
|
||||
ch390_runtime_prepare_netif(netif);
|
||||
ch390_get_mac(netif->hwaddr);
|
||||
netif->mtu = 1500;
|
||||
netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET;
|
||||
|
||||
ethernetif->rx_len = 0u;
|
||||
ethernetif->rx_status = 0u;
|
||||
|
||||
ch390_runtime_refresh_diag();
|
||||
g_ch390_ready = g_diag.id_valid;
|
||||
@@ -306,6 +355,13 @@ void ch390_runtime_check_link(struct netif *netif)
|
||||
return;
|
||||
}
|
||||
|
||||
if (ch390_runtime_is_restart_pending() != 0u) {
|
||||
netif_set_link_down(netif);
|
||||
ch390_runtime_clear_restart_pending();
|
||||
SEGGER_RTT_WriteString(0, "ETH restart pending: hold link down for app recycle\r\n");
|
||||
return;
|
||||
}
|
||||
|
||||
ch390_runtime_refresh_diag();
|
||||
link_up = (uint8_t)ch390_get_link_status();
|
||||
|
||||
@@ -333,8 +389,6 @@ err_t ch390_runtime_output(struct netif *netif, struct pbuf *p)
|
||||
struct pbuf *q;
|
||||
uint32_t start_tick;
|
||||
|
||||
LWIP_UNUSED_ARG(netif);
|
||||
|
||||
if (!g_ch390_ready) {
|
||||
LINK_STATS_INC(link.drop);
|
||||
return ERR_IF;
|
||||
@@ -346,15 +400,17 @@ err_t ch390_runtime_output(struct netif *netif, struct pbuf *p)
|
||||
|
||||
start_tick = HAL_GetTick();
|
||||
while (ch390_read_reg(CH390_TCR) & TCR_TXREQ) {
|
||||
if ((HAL_GetTick() - start_tick) > 10u) {
|
||||
if ((HAL_GetTick() - start_tick) > TX_BUSY_WAIT_TIMEOUT_MS) {
|
||||
#if ETH_PAD_SIZE
|
||||
pbuf_add_header(p, ETH_PAD_SIZE);
|
||||
#endif
|
||||
LINK_STATS_INC(link.drop);
|
||||
g_diag.tx_packets_timeout++;
|
||||
g_tx_consecutive_timeout++;
|
||||
if (g_tx_consecutive_timeout >= TX_TIMEOUT_THRESHOLD) {
|
||||
ch390_runtime_emergency_reset();
|
||||
if (g_tx_consecutive_timeout < 0xFFu) {
|
||||
g_tx_consecutive_timeout++;
|
||||
}
|
||||
if (g_tx_consecutive_timeout >= TX_TIMEOUT_RESET_THRESHOLD) {
|
||||
(void)ch390_runtime_emergency_reset(netif);
|
||||
}
|
||||
return ERR_TIMEOUT;
|
||||
}
|
||||
@@ -392,23 +448,26 @@ bool ch390_runtime_is_ready(void)
|
||||
return g_ch390_ready != 0u;
|
||||
}
|
||||
|
||||
bool ch390_runtime_emergency_reset(void)
|
||||
bool ch390_runtime_emergency_reset(struct netif *netif)
|
||||
{
|
||||
SEGGER_RTT_printf(0, "ETH emergency reset (tx_timeout=%u resets=%u/%u)\r\n",
|
||||
g_tx_consecutive_timeout, g_chip_reset_count, CHIP_RESET_MAX);
|
||||
SEGGER_RTT_printf(0, "ETH emergency reset (tx_timeout=%u resets=%u)\r\n",
|
||||
g_tx_consecutive_timeout, g_chip_reset_count);
|
||||
|
||||
if (g_chip_reset_count >= CHIP_RESET_MAX) {
|
||||
SEGGER_RTT_WriteString(0, "ETH: max resets reached, giving up\r\n");
|
||||
g_ch390_ready = 0u;
|
||||
return false;
|
||||
if (netif != NULL) {
|
||||
netif_set_link_down(netif);
|
||||
}
|
||||
|
||||
g_chip_reset_count++;
|
||||
if (g_chip_reset_count < 0xFFu) {
|
||||
g_chip_reset_count++;
|
||||
}
|
||||
g_tx_consecutive_timeout = 0u;
|
||||
|
||||
ch390_software_reset();
|
||||
ch390_delay_us(5000u);
|
||||
ch390_default_config();
|
||||
ch390_runtime_prepare_netif(netif);
|
||||
ch390_runtime_sync_mac(netif);
|
||||
g_ch390_irq_pending = 0u;
|
||||
|
||||
ch390_runtime_refresh_diag();
|
||||
g_ch390_ready = g_diag.id_valid;
|
||||
@@ -418,24 +477,40 @@ bool ch390_runtime_emergency_reset(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
ch390_runtime_set_health_fail_count(0u);
|
||||
ch390_runtime_set_restart_pending();
|
||||
SEGGER_RTT_WriteString(0, "ETH emergency reset: OK\r\n");
|
||||
return true;
|
||||
}
|
||||
|
||||
void ch390_runtime_health_check(struct netif *netif)
|
||||
{
|
||||
uint16_t vid;
|
||||
uint8_t fail_count;
|
||||
|
||||
if (!g_ch390_ready) {
|
||||
SEGGER_RTT_WriteString(0, "ETH health: chip not ready, attempting reset\r\n");
|
||||
(void)ch390_runtime_emergency_reset(netif);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Verify chip is still responding by reading vendor ID */
|
||||
uint16_t vid = ch390_get_vendor_id();
|
||||
vid = ch390_get_vendor_id();
|
||||
if (vid == 0x0000u || vid == 0xFFFFu) {
|
||||
SEGGER_RTT_printf(0, "ETH health: invalid VID=0x%04X, attempting reset\r\n", vid);
|
||||
netif_set_link_down(netif);
|
||||
if (ch390_runtime_emergency_reset()) {
|
||||
ch390_runtime_check_link(netif);
|
||||
fail_count = ch390_runtime_get_health_fail_count();
|
||||
if (fail_count < 0x0Fu) {
|
||||
fail_count++;
|
||||
}
|
||||
ch390_runtime_set_health_fail_count(fail_count);
|
||||
if (fail_count >= HEALTH_FAIL_THRESHOLD) {
|
||||
SEGGER_RTT_printf(0, "ETH health: invalid VID=0x%04X streak=%u, attempting reset\r\n",
|
||||
vid,
|
||||
fail_count);
|
||||
ch390_runtime_set_health_fail_count(0u);
|
||||
(void)ch390_runtime_emergency_reset(netif);
|
||||
}
|
||||
} else {
|
||||
ch390_runtime_set_health_fail_count(0u);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ void ch390_runtime_check_link(struct netif *netif);
|
||||
err_t ch390_runtime_output(struct netif *netif, struct pbuf *p);
|
||||
void ch390_runtime_get_diag(ch390_diag_t *diag);
|
||||
bool ch390_runtime_is_ready(void);
|
||||
bool ch390_runtime_emergency_reset(void);
|
||||
bool ch390_runtime_emergency_reset(struct netif *netif);
|
||||
void ch390_runtime_health_check(struct netif *netif);
|
||||
uint8_t ch390_runtime_get_reset_count(void);
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Code (inc. data) RO Data RW Data ZI Data Debug Object Name
|
||||
632 0 0 0 0 0 ch390.o
|
||||
616 0 64 0 0 0 ch390_interface.o
|
||||
1858 0 85 5 88 0 ch390_runtime.o
|
||||
3690 0 591 8 1240 0 config.o
|
||||
2050 0 85 6 88 0 ch390_runtime.o
|
||||
3958 0 591 8 1240 0 config.o
|
||||
8 0 0 0 0 0 def.o
|
||||
124 0 0 0 0 0 dma.o
|
||||
1772 0 0 1 240 0 etharp.o
|
||||
@@ -16,8 +16,8 @@
|
||||
0 0 0 0 24 0 ip.o
|
||||
778 0 0 2 0 0 ip4.o
|
||||
46 0 4 0 0 0 ip4_addr.o
|
||||
0 0 0 0 12 0 iwdg.o
|
||||
2838 0 185 12 272 0 main.o
|
||||
44 0 0 0 12 0 iwdg.o
|
||||
2842 0 185 12 272 0 main.o
|
||||
828 0 0 12 4115 0 mem.o
|
||||
196 0 244 32 6464 0 memp.o
|
||||
582 0 0 12 0 0 netif.o
|
||||
@@ -33,7 +33,7 @@
|
||||
392 0 0 0 32 0 stm32f1xx_hal_flash.o
|
||||
240 0 0 0 0 0 stm32f1xx_hal_flash_ex.o
|
||||
516 0 0 0 0 0 stm32f1xx_hal_gpio.o
|
||||
12 0 0 0 0 0 stm32f1xx_hal_iwdg.o
|
||||
106 0 0 0 0 0 stm32f1xx_hal_iwdg.o
|
||||
60 0 0 0 0 0 stm32f1xx_hal_msp.o
|
||||
1240 0 18 0 0 0 stm32f1xx_hal_rcc.o
|
||||
1510 0 0 0 0 0 stm32f1xx_hal_spi.o
|
||||
@@ -57,7 +57,7 @@ Memory Map of the image
|
||||
|
||||
Load Region LR_IROM1
|
||||
|
||||
Execution Region ER_IROM1 (Exec base: 0x08000000, Size: 0x0000D4D0, Max: 0x00010000, END)
|
||||
Execution Region ER_IROM1 (Exec base: 0x08000000, Size: 0x0000D72C, Max: 0x00010000, END)
|
||||
|
||||
Execution Region RW_IRAM1 (Exec base: 0x20000000, Size: 0x00005000, Max: 0x00005000, END)
|
||||
|
||||
|
||||
@@ -225,11 +225,21 @@
|
||||
5. `AT+MUX?`
|
||||
6. `AT+NET=...`
|
||||
7. `AT+NET?`
|
||||
8. `AT+LINK=...`
|
||||
9. `AT+LINK?`
|
||||
10. `AT+SAVE`
|
||||
11. `AT+RESET`
|
||||
12. `AT+DEFAULT`
|
||||
8. `AT+BAUD=...`
|
||||
9. `AT+BAUD?`
|
||||
10. `AT+LINK=...`
|
||||
11. `AT+LINK?`
|
||||
12. `AT+SAVE`
|
||||
13. `AT+RESET`
|
||||
14. `AT+DEFAULT`
|
||||
|
||||
其中与数据串口相关的固定映射为：
|
||||
|
||||
1. `U0 = USART2`
|
||||
2. `U1 = USART3`
|
||||
3. `AT+BAUD=U0,<baud>` / `AT+BAUD=U1,<baud>` 只更新当前运行配置记录
|
||||
4. 新波特率不会立即重初始化 `USART2/USART3`，必须执行 `AT+SAVE` + `AT+RESET` 后按保存值生效
|
||||
5. 当前代码接受的波特率范围为 `1200 ~ 921600`
|
||||
|
||||
### 6.2 现场关键规则
|
||||
|
||||
@@ -238,6 +248,7 @@
|
||||
1. 当前现场验证时，配置命令必须保证以换行完成帧。
|
||||
2. 若主机侧发送方式不对，现象会很像“配置口完全无响应”。
|
||||
3. 因此，配置口不响应时，第一优先级不是改 parser，而是先验证主机端发送格式与接线。
|
||||
4. `BAUD` 类命令若查询值已变化，但 `USART2/USART3` 现场波特率尚未变化，不应立即归因为命令无效，应先确认是否已经执行 `AT+SAVE` 与 `AT+RESET`。
|
||||
|
||||
### 6.3 最小验证步骤
|
||||
|
||||
@@ -247,13 +258,16 @@
|
||||
2. 先发 `AT`
|
||||
3. 再发 `AT+QUERY`
|
||||
4. 再发 `AT+NET?`
|
||||
5. 再发 `AT+LINK?`
|
||||
6. 修改一个最小参数，例如：
|
||||
- `AT+MUX=1`
|
||||
7. 执行：
|
||||
- `AT+SAVE`
|
||||
- `AT+RESET`
|
||||
8. 复位后再次查询，确认配置是否保留
|
||||
5. 再发 `AT+BAUD?`
|
||||
6. 再发 `AT+LINK?`
|
||||
7. 修改一个最小参数，例如：
|
||||
- `AT+MUX=1`
|
||||
- 或 `AT+BAUD=U1,38400`
|
||||
8. 执行：
|
||||
- `AT+SAVE`
|
||||
- `AT+RESET`
|
||||
9. 复位后再次查询，确认配置是否保留
|
||||
10. 若本轮验证的是 `AT+BAUD`，还应同步用上位机重新按新波特率连接 `USART2/USART3`，确认数据口实际生效
|
||||
|
||||
### 6.4 持久化失败时怎么查
|
||||
|
||||
@@ -482,6 +496,72 @@ Keil MDK-ARM 构建 0 Error(s), 0 Warning(s)。Flash 52.7 KB / 64.0 KB (82.5%)
|
||||
2. 在最新固件下重新进行 MUX 持续发送测试，主机侧发送 `670` 个数据包，接收 `670` 个，`0` 丢包。
|
||||
3. 本轮修复未增加新的常驻队列与缓冲区，保持当前 RAM 占用边界不变。
|
||||
|
||||
### 9.6 2026-04-24 CH390 emergency reset 恢复语义补齐记录
|
||||
|
||||
#### 现象
|
||||
|
||||
在 CH390 发生 TX timeout 并触发 `ch390_runtime_emergency_reset()` 后，芯片寄存器访问恢复正常，`VID` 可读、PHY 链路也可能保持 `up`，但 TCP 业务流量仍可能长时间不恢复，表现为“芯片还活着，但网络像失联一样，通常只能重启恢复”。
|
||||
|
||||
在后续实现收敛中，又确认仅依赖单次 VID 异常或单次 TX busy 即立刻 reset 过于激进，容易把瞬时抖动误判为芯片失活，因此当前代码已经演化为“带阈值的恢复策略”。
|
||||
|
||||
#### 根因
|
||||
|
||||
`ch390_runtime_emergency_reset()` 旧实现仅执行 `ch390_software_reset()`、`ch390_default_config()` 与 `diag` 刷新，缺少 cold init 里已有的两层恢复语义：
|
||||
|
||||
1. **MAC 对齐未恢复**：旧代码没有重新写回 CH390 `PAR`，也没有把硬件 MAC 重新同步到 `netif->hwaddr`。若软件复位后 CH390 的 MAC 过滤状态与 lwIP 侧缓存身份不一致，现象会表现为寄存器可访问、链路仍在，但单播业务流量不通。
|
||||
2. **上层链路回收未触发**：TX-timeout 路径直接调用 `ch390_runtime_emergency_reset()`，没有保证 `App_StopLinksIfNeeded()` / `App_StartLinksIfNeeded()` 观察到一次有效的 link-down 周期，导致旧 TCP client/server 状态可能跨芯片复位残留，业务层没有完成重建。
|
||||
3. **恢复策略缺少抖动抑制**：若仅凭单次 TX busy 或单次 VID 异常立即 reset，容易在瞬时总线/链路抖动下过度恢复，放大业务扰动，因此当前实现增加了连续失败阈值和失败计数清零逻辑。
|
||||
|
||||
#### 修复内容
|
||||
|
||||
| 文件 | 修改 | 说明 |
|
||||
|------|------|------|
|
||||
| `Drivers/CH390/ch390_runtime.h` | `ch390_runtime_emergency_reset()` 改为接收 `struct netif *` | 让 reset 路径能同时修复 CH390 与 lwIP 可见状态 |
|
||||
| `Drivers/CH390/ch390_runtime.c` | 抽取 `ch390_runtime_prepare_netif()` | 在 init / emergency reset 后统一恢复 `hwaddr_len`、`mtu`、`flags` 与 RX 软件状态 |
|
||||
| `Drivers/CH390/ch390_runtime.c` | 新增 `ch390_runtime_sync_mac()` | emergency reset 后按当前 `netif->hwaddr` 重写 CH390 `PAR`，并重新同步硬件 MAC 到 lwIP |
|
||||
| `Drivers/CH390/ch390_runtime.c` | emergency reset 成功后清 `g_ch390_irq_pending` 并置位 `g_link_restart_pending` | 避免复位前遗留中断状态影响恢复 |
|
||||
| `Drivers/CH390/ch390_runtime.c` | `ch390_runtime_check_link()` 增加一次性 hold-down 逻辑 | 保证主循环至少看到一次 link-down，从而触发 app 层 stop/start 回收重建 |
|
||||
| `Drivers/CH390/ch390_runtime.c` | TX-timeout 与 health-check 两条 reset 路径统一传入 `netif` | 让两类恢复路径都走同一套 MAC 重同步与链路重建语义 |
|
||||
| `Drivers/CH390/ch390_runtime.c` | 为 TX timeout 与 health-check 增加连续失败阈值 | 降低瞬时抖动导致的过度 reset 风险 |
|
||||
|
||||
#### 当前实现语义（以源码为准）
|
||||
|
||||
1. **TX timeout 阈值**
|
||||
- 单次判定条件：`CH390_TCR.TXREQ` busy-wait 持续超过 `10 ms`
|
||||
- 连续阈值：累计 `6` 次后才触发 `ch390_runtime_emergency_reset()`
|
||||
- 只要有一次成功发送，`g_tx_consecutive_timeout` 立即清零，因此该阈值针对的是**连续失败**，不是累计历史失败次数。
|
||||
|
||||
2. **health-check 阈值**
|
||||
- `VID` 单次读到 `0x0000` / `0xFFFF` 并不会立即 reset。
|
||||
- 只有连续 `3` 次异常 VID 才触发 emergency reset。
|
||||
- 若 `g_ch390_ready == 0`，则 health-check 会直接尝试 reset，不再等待 VID 连续计数。
|
||||
|
||||
3. **restart-pending 的单次语义**
|
||||
- emergency reset 成功后会置位 restart-pending。
|
||||
- 下一次 `ch390_runtime_check_link()` 先强制执行一次 `netif_set_link_down()`，随后立即清除此标志并提前返回。
|
||||
- 该设计用于保证主循环至少看到一次有效的 logical link-down，从而沿用现有 `App_StopLinksIfNeeded()` / `App_StartLinksIfNeeded()` 路径回收并重建 TCP links。
|
||||
|
||||
4. **内部计数与状态**
|
||||
- `g_chip_reset_count`：记录 emergency reset 尝试次数，饱和递增到 `0xFF`。
|
||||
- `g_tx_consecutive_timeout`：记录连续 TX busy 超时次数；成功发送或进入 reset 路径后清零。
|
||||
- health-check 连续失败计数当前与 `g_link_restart_pending` 共用一个状态字节的高位 nibble 存储；当 VID 恢复正常、达到 reset 阈值或 emergency reset 成功时会清零。
|
||||
|
||||
5. **失败路径差异**
|
||||
- 只有当 emergency reset 完成后 `g_diag.id_valid` 仍然有效，才会置位 restart-pending 并进入后续 app recycle 语义。
|
||||
- 若 reset 后芯片仍不响应，则仅记录失败并返回，不会伪装成可恢复状态。
|
||||
|
||||
#### 预期结果
|
||||
|
||||
1. CH390 发生 emergency reset 后，硬件 MAC、`netif->hwaddr` 与当前业务身份重新对齐。
|
||||
2. 即使物理网线始终保持连接，主循环仍会在后续 poll 中观察到一次有效 link-down，并按既有 `App_StopLinksIfNeeded()` / `App_StartLinksIfNeeded()` 路径回收并重建 TCP links。
|
||||
3. 恢复策略对瞬时异常更保守：只有连续超时或连续 VID 异常达到阈值才会触发 reset，降低误触发恢复的概率。
|
||||
4. 复位后的恢复语义与 cold init 更接近，不再停留在“芯片寄存器恢复正常，但业务流量仍死掉”的半恢复状态。
|
||||
|
||||
#### 构建验证
|
||||
|
||||
1. 已由现场手动执行工程构建，构建通过。
|
||||
2. 本轮修改覆盖 `Drivers/CH390/ch390_runtime.c`、`Drivers/CH390/ch390_runtime.h` 与本手册记录，未改动 TCP client/server 模块对外接口。
|
||||
|
||||
---
|
||||
|
||||
## 10. 常见误区
|
||||
|
||||
Reference in New Issue
Block a user