From e429a0874d1a80945d10e8d6d3e84a71f02b0808 Mon Sep 17 00:00:00 2001 From: Eduard Iten Date: Thu, 3 Jul 2025 13:34:01 +0200 Subject: [PATCH] Revert "feat(slave_node): Refine Modbus UART and add CDC-ACM support" This reverts commit 3a05c80b25b89b9473a58132faf5d4d319487d61. --- .../slave_node/boards/bluepill_f103rb.overlay | 18 +-- .../boards/weact_stm32g431_core.overlay | 13 +- .../modules/modbus_server/src/modbus_server.c | 123 +++++------------- 3 files changed, 44 insertions(+), 110 deletions(-) diff --git a/software/apps/slave_node/boards/bluepill_f103rb.overlay b/software/apps/slave_node/boards/bluepill_f103rb.overlay index 8b3ec9a..614e991 100644 --- a/software/apps/slave_node/boards/bluepill_f103rb.overlay +++ b/software/apps/slave_node/boards/bluepill_f103rb.overlay @@ -12,7 +12,6 @@ label = "RTT"; status = "okay"; }; - }; &flash0 { @@ -35,13 +34,10 @@ }; }; - &usart1: { - pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>; - pinctrl-names = "default"; - - modbus0 { - compatible = "zephyr,modbus-serial"; - status = "okay"; - }; - status = "okay"; -}; \ No newline at end of file +&usart1 { + modbus0 { + compatible = "zephyr,modbus-serial"; + status = "okay"; + }; + status = "okay"; +}; diff --git a/software/apps/slave_node/boards/weact_stm32g431_core.overlay b/software/apps/slave_node/boards/weact_stm32g431_core.overlay index 5a8f41a..897a9c1 100644 --- a/software/apps/slave_node/boards/weact_stm32g431_core.overlay +++ b/software/apps/slave_node/boards/weact_stm32g431_core.overlay @@ -1,10 +1,9 @@ &usart1 { + modbus0 { + compatible = "zephyr,modbus-serial"; + status = "okay"; + }; + status = "okay"; pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>; pinctrl-names = "default"; - - modbus0 { - compatible = "zephyr,modbus-serial"; - status = "okay"; - }; - status = "okay"; -}; \ No newline at end of file +}; diff --git a/software/modules/modbus_server/src/modbus_server.c b/software/modules/modbus_server/src/modbus_server.c index a579601..fc5356f 100644 --- a/software/modules/modbus_server/src/modbus_server.c +++ b/software/modules/modbus_server/src/modbus_server.c @@ -7,16 +7,13 @@ #include "valve.h" #include "fwu.h" - -#include - LOG_MODULE_REGISTER(modbus_server, LOG_LEVEL_INF); static int modbus_iface; static struct modbus_iface_param server_param = { .mode = MODBUS_MODE_RTU, - .server = {.user_cb = NULL, .unit_id = 1}, - .serial = {.baud = 19200, .parity = UART_CFG_PARITY_NONE}, + .server = { .user_cb = NULL, .unit_id = 1 }, + .serial = { .baud = 19200, .parity = UART_CFG_PARITY_NONE }, }; static uint16_t watchdog_timeout_s = 0; @@ -30,8 +27,7 @@ static void watchdog_timer_handler(struct k_timer *timer_id) static inline void reset_watchdog(void) { - if (watchdog_timeout_s > 0) - { + if (watchdog_timeout_s > 0) { k_timer_start(&watchdog_timer, K_SECONDS(watchdog_timeout_s), K_NO_WAIT); } } @@ -39,20 +35,11 @@ static inline void reset_watchdog(void) static int holding_reg_rd(uint16_t addr, uint16_t *reg) { reset_watchdog(); - switch (addr) - { - case REG_HOLDING_MAX_OPENING_TIME_S: - *reg = valve_get_max_open_time(); - break; - case REG_HOLDING_MAX_CLOSING_TIME_S: - *reg = valve_get_max_close_time(); - break; - case REG_HOLDING_WATCHDOG_TIMEOUT_S: - *reg = watchdog_timeout_s; - break; - default: - *reg = 0; - break; + switch (addr) { + case REG_HOLDING_MAX_OPENING_TIME_S: *reg = valve_get_max_open_time(); break; + case REG_HOLDING_MAX_CLOSING_TIME_S: *reg = valve_get_max_close_time(); break; + case REG_HOLDING_WATCHDOG_TIMEOUT_S: *reg = watchdog_timeout_s; break; + default: *reg = 0; break; } return 0; } @@ -60,21 +47,11 @@ static int holding_reg_rd(uint16_t addr, uint16_t *reg) static int holding_reg_wr(uint16_t addr, uint16_t reg) { reset_watchdog(); - switch (addr) - { + switch (addr) { case REG_HOLDING_VALVE_COMMAND: - if (reg == 1) - { - valve_open(); - } - else if (reg == 2) - { - valve_close(); - } - else if (reg == 0) - { - valve_stop(); - } + if (reg == 1) { valve_open(); } + else if (reg == 2) { valve_close(); } + else if (reg == 0) { valve_stop(); } break; case REG_HOLDING_MAX_OPENING_TIME_S: valve_set_max_open_time(reg); @@ -84,27 +61,23 @@ static int holding_reg_wr(uint16_t addr, uint16_t reg) break; case REG_HOLDING_WATCHDOG_TIMEOUT_S: watchdog_timeout_s = reg; - if (watchdog_timeout_s > 0) - { + if (watchdog_timeout_s > 0) { LOG_INF("Watchdog enabled with %u s timeout.", watchdog_timeout_s); reset_watchdog(); - } - else - { + } else { LOG_INF("Watchdog disabled."); k_timer_stop(&watchdog_timer); } break; case REG_HOLDING_DEVICE_RESET: - if (reg == 1) - { + if (reg == 1) { LOG_WRN("Modbus reset command received. Rebooting..."); sys_reboot(SYS_REBOOT_WARM); } break; - default: - fwu_handler(addr, reg); - break; + default: + fwu_handler(addr, reg); + break; } return 0; } @@ -113,26 +86,13 @@ static int input_reg_rd(uint16_t addr, uint16_t *reg) { reset_watchdog(); uint32_t uptime_s = k_uptime_get_32() / 1000; - switch (addr) - { - case REG_INPUT_VALVE_STATE_MOVEMENT: - *reg = (valve_get_movement() << 8) | (valve_get_state() & 0xFF); - break; - case REG_INPUT_MOTOR_CURRENT_MA: - *reg = valve_get_motor_current(); - break; - case REG_INPUT_UPTIME_SECONDS_LOW: - *reg = (uint16_t)(uptime_s & 0xFFFF); - break; - case REG_INPUT_UPTIME_SECONDS_HIGH: - *reg = (uint16_t)(uptime_s >> 16); - break; - case REG_INPUT_FWU_LAST_CHUNK_CRC: - *reg = fwu_get_last_chunk_crc(); - break; - default: - *reg = 0; - break; + switch (addr) { + case REG_INPUT_VALVE_STATE_MOVEMENT: *reg = (valve_get_movement() << 8) | (valve_get_state() & 0xFF); break; + case REG_INPUT_MOTOR_CURRENT_MA: *reg = valve_get_motor_current(); break; + case REG_INPUT_UPTIME_SECONDS_LOW: *reg = (uint16_t)(uptime_s & 0xFFFF); break; + case REG_INPUT_UPTIME_SECONDS_HIGH: *reg = (uint16_t)(uptime_s >> 16); break; + case REG_INPUT_FWU_LAST_CHUNK_CRC: *reg = fwu_get_last_chunk_crc(); break; + default: *reg = 0; break; } return 0; } @@ -149,28 +109,8 @@ int modbus_server_init(void) { k_timer_init(&watchdog_timer, watchdog_timer_handler, NULL); const char iface_name[] = {DEVICE_DT_NAME(MODBUS_NODE)}; -#if DT_NODE_HAS_COMPAT(DT_PARENT(MODBUS_NODE), zephyr_cdc_acm_uart) - const struct device *const dev = DEVICE_DT_GET(DT_PARENT(MODBUS_NODE)); - uint32_t dtr = 0; - - if (!device_is_ready(dev) || usb_enable(NULL)) - { - return 0; - } - - while (!dtr) - { - uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr); - k_sleep(K_MSEC(100)); - } - - LOG_INF("Client connected to server on %s", dev->name); -#endif modbus_iface = modbus_iface_get_by_name(iface_name); - if (modbus_iface < 0) - { - return modbus_iface; - } + if (modbus_iface < 0) { return modbus_iface; } server_param.server.user_cb = &mbs_cbs; return modbus_init_server(modbus_iface, server_param); } @@ -182,13 +122,12 @@ int modbus_reconfigure(uint32_t baudrate, uint8_t unit_id) int ret = modbus_init_server(modbus_iface, server_param); - if (ret == 0) - { - settings_save_one("modbus/baudrate", &baudrate, sizeof(baudrate)); - settings_save_one("modbus/unit_id", &unit_id, sizeof(unit_id)); - } + if (ret == 0) { + settings_save_one("modbus/baudrate", &baudrate, sizeof(baudrate)); + settings_save_one("modbus/unit_id", &unit_id, sizeof(unit_id)); + } - return ret; + return ret; } uint32_t modbus_get_baudrate(void) { return server_param.serial.baud; }