From 8439fd6ffcc907f76f148564eaeb0eee952b8d8b Mon Sep 17 00:00:00 2001 From: Sleeper85 Date: Fri, 10 Jul 2026 22:56:53 +0200 Subject: [PATCH] Compliance with esphome PR_11969 (modbus send_wait_time) --- .../board/board_options_itf_dev_modbus.yaml | 27 ------------ .../board_options_itf_dev_modbus_client.yaml | 22 ---------- packages/board/board_options_itf_modbus.yaml | 6 +-- .../board/board_options_itf_modbus_dev.yaml | 42 ------------------- .../board_options_itf_modbus_expander.yaml | 17 ++++---- 5 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 packages/board/board_options_itf_dev_modbus.yaml delete mode 100644 packages/board/board_options_itf_dev_modbus_client.yaml delete mode 100644 packages/board/board_options_itf_modbus_dev.yaml diff --git a/packages/board/board_options_itf_dev_modbus.yaml b/packages/board/board_options_itf_dev_modbus.yaml deleted file mode 100644 index 93b64c2..0000000 --- a/packages/board/board_options_itf_dev_modbus.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# Updated : 2026.02.06 -# Version : 1.1.1 -# GitHub : https://github.com/Sleeper85/esphome-yambms - -# YamBMS ( Yet another multi-BMS Merging Solution ) - -# This YAML is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -external_components: - - source: github://pr#12614 - components: [uart, modbus, modbus_controller, modbus_server] - refresh: 1h - -modbus: - - id: !extend ${modbus_id} - send_wait_time: !remove # this option remains valid but with a new default time diff --git a/packages/board/board_options_itf_dev_modbus_client.yaml b/packages/board/board_options_itf_dev_modbus_client.yaml deleted file mode 100644 index 6e57e36..0000000 --- a/packages/board/board_options_itf_dev_modbus_client.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Updated : 2026.02.06 -# Version : 1.1.1 -# GitHub : https://github.com/Sleeper85/esphome-yambms - -# YamBMS ( Yet another multi-BMS Merging Solution ) - -# This YAML is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -modbus_controller: - - id: !extend modbus_controller_${device_type}${device_id} - command_throttle: !remove diff --git a/packages/board/board_options_itf_modbus.yaml b/packages/board/board_options_itf_modbus.yaml index 5bf226d..844e274 100644 --- a/packages/board/board_options_itf_modbus.yaml +++ b/packages/board/board_options_itf_modbus.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.06 -# Version : 1.1.2 +# Updated : 2026.07.10 +# Version : 1.1.3 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -24,7 +24,7 @@ substitutions: modbus_baud_rate: '19200' # 9600 / 19200 / 115200 # Modbus modbus_id: '1' - modbus_send_wait_time: '250ms' # time in milliseconds before the next ModBUS command is sent if an answer from a previous command is pending + modbus_send_wait_time: '2000ms' # time in milliseconds before the next ModBUS command is sent if an answer from a previous command is pending (default value from ESPHome PR #11969) # Modbus Controller modbus_update_interval: '5s' # frequency with which BMS/Shunt modbus servers are queried modbus_command_throttle: '0ms' # minimum time in between 2 requests to the device diff --git a/packages/board/board_options_itf_modbus_dev.yaml b/packages/board/board_options_itf_modbus_dev.yaml deleted file mode 100644 index 02612d0..0000000 --- a/packages/board/board_options_itf_modbus_dev.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# Updated : 2026.01.15 -# Version : 1.1.4 -# GitHub : https://github.com/Sleeper85/esphome-yambms - -# YamBMS ( Yet another multi-BMS Merging Solution ) - -# This YAML is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -external_components: - - source: github://pr#12614 - components: [uart, modbus, modbus_controller, modbus_server] - refresh: 1h - -# The settings below can be changed via `vars` when importing the package -# or by declaring new `substitutions` in the main YAML. -substitutions: - # UART - modbus_baud_rate: '19200' # 9600 / 19200 / 115200 - # Modbus - modbus_id: 'modbus_1' - # Modbus Controller - modbus_update_interval: '5s' # frequency with which BMS/Shunt modbus servers are queried - -uart: - - id: !extend ${modbus_uart_id} - baud_rate: ${modbus_baud_rate} - -modbus: - - uart_id: ${modbus_uart_id} - id: ${modbus_id} - role: ${modbus_role} diff --git a/packages/board/board_options_itf_modbus_expander.yaml b/packages/board/board_options_itf_modbus_expander.yaml index 4ba8593..d839222 100644 --- a/packages/board/board_options_itf_modbus_expander.yaml +++ b/packages/board/board_options_itf_modbus_expander.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.08.02 -# Version : 1.1.1 +# Updated : 2026.07.10 +# Version : 1.1.3 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -21,16 +21,15 @@ # or by declaring new `substitutions` in the main YAML. substitutions: # UART - modbus_baud_rate: '19200' # 9600 / 19200 / 115200 + modbus_baud_rate: '19200' # 9600 / 19200 / 115200 # Modbus - modbus_id: 'modbus_1' - modbus_send_wait_time: '250ms' # time in milliseconds before the next ModBUS command is sent if an answer from a previous command is pending - # Modbus Controller - modbus_update_interval: '5s' # frequency with which BMS/Shunt modbus servers are queried - modbus_command_throttle: '0ms' # minimum time in between 2 requests to the device + modbus_id: '1' + modbus_send_wait_time: '2000ms' # time in milliseconds before the next ModBUS command is sent if an answer from a previous command is pending (default value from ESPHome PR #11969) # Modbus Controller + modbus_update_interval: '5s' # frequency with which BMS/Shunt modbus servers are queried + modbus_command_throttle: '0ms' # minimum time in between 2 requests to the device modbus: - uart_id: ${modbus_uart_id} - id: ${modbus_id} + id: modbus_${modbus_role}_${modbus_id} role: ${modbus_role} send_wait_time: ${modbus_send_wait_time}