From fa9f101d1b52dde3d25aaa65ca41733ff1efd19b Mon Sep 17 00:00:00 2001 From: Sleeper85 Date: Fri, 14 Aug 2026 01:42:24 +0200 Subject: [PATCH] Move vars bms_model & bms_protocol --- packages/bms/bms_combine.yaml | 12 ++- .../bms_combine_BASEN_RS485_controller.yaml | 8 +- ...mbine_BASEN_RS485_controller_talk_pin.yaml | 6 +- .../bms/bms_combine_BASEN_RS485_full.yaml | 10 ++- packages/bms/bms_combine_DEMO.yaml | 14 +-- .../bms/bms_combine_DEYE_CAN_module_full.yaml | 14 +-- .../bms_combine_DEYE_CAN_module_minimal.yaml | 14 +-- .../bms_combine_EG4_LLV2_RS485_bms_full.yaml | 14 +-- .../bms/bms_combine_EG4_RS485_modbus.yaml | 7 +- packages/bms/bms_combine_Ecoworthy_RS485.yaml | 14 +-- ...bms_combine_Ecoworthy_RS485_secondary.yaml | 14 +-- packages/bms/bms_combine_FAKE.yaml | 14 +-- packages/bms/bms_combine_FAKE_extended.yaml | 14 +-- packages/bms/bms_combine_JBD_BLE_full.yaml | 14 +-- packages/bms/bms_combine_JBD_UART_full.yaml | 14 +-- packages/bms/bms_combine_JK_BLE_full.yaml | 38 ++++---- packages/bms/bms_combine_JK_BLE_minimal.yaml | 38 ++++---- packages/bms/bms_combine_JK_BLE_standard.yaml | 14 +-- .../bms_combine_JK_RS485_DISPLAY_full.yaml | 14 +-- ...combine_JK_RS485_Modbus_JK-B_standard.yaml | 10 ++- .../bms_combine_JK_RS485_Modbus_bms_full.yaml | 10 ++- ...s_combine_JK_RS485_Modbus_bms_minimal.yaml | 10 ++- ..._combine_JK_RS485_Modbus_bms_standard.yaml | 10 ++- .../bms_combine_JK_RS485_Modbus_sniffer.yaml | 6 +- ...bine_JK_RS485_Modbus_sniffer_talk_pin.yaml | 6 +- .../bms/bms_combine_JK_UART_4G-GPS_full.yaml | 14 +-- .../bms/bms_combine_PACE_RS485_bms_full.yaml | 10 ++- .../bms/bms_combine_PACE_RS485_modbus.yaml | 77 ++++++++-------- ...s_combine_SEPLOS_V1_V2_RS485_bms_full.yaml | 10 ++- ...bms_combine_SEPLOS_V1_V2_RS485_modbus.yaml | 6 +- .../bms_combine_SEPLOS_V3_RS485_bms_full.yaml | 10 ++- ...ombine_SEPLOS_V3_RS485_modbus_sniffer.yaml | 87 +++++++++---------- packages/bms/bms_combine_modbus_client.yaml | 14 +-- .../bms/bms_modbus_BASEN_RS485_bms_full.yaml | 8 +- .../bms/bms_modbus_DEYE_CAN_module_full.yaml | 8 +- .../bms_modbus_EG4_LLV2_RS485_bms_full.yaml | 8 +- .../bms/bms_modbus_Ecoworthy_RS485_full.yaml | 8 +- .../bms_modbus_Ecoworthy_RS485_secondary.yaml | 8 +- packages/bms/bms_modbus_FAKE.yaml | 8 +- packages/bms/bms_modbus_JBD_BLE_full.yaml | 8 +- packages/bms/bms_modbus_JBD_UART_full.yaml | 8 +- packages/bms/bms_modbus_JK_BLE_standard.yaml | 8 +- ...s_modbus_JK_RS485_Modbus_bms_standard.yaml | 8 +- .../bms/bms_modbus_JK_UART_4G-GPS_full.yaml | 8 +- .../bms/bms_modbus_PACE_RS485_bms_full.yaml | 8 +- ...ms_modbus_SEPLOS_V1_V2_RS485_bms_full.yaml | 8 +- .../bms_modbus_SEPLOS_V3_RS485_bms_full.yaml | 8 +- packages/bms/bms_sensors_JK_BLE_standard.yaml | 28 +++--- packages/yambms/yambms_core.yaml | 10 ++- packages/yambms/yambms_service.yaml | 8 +- 50 files changed, 347 insertions(+), 378 deletions(-) diff --git a/packages/bms/bms_combine.yaml b/packages/bms/bms_combine.yaml index eb234c2..c54ec72 100644 --- a/packages/bms/bms_combine.yaml +++ b/packages/bms/bms_combine.yaml @@ -1,4 +1,4 @@ -# Updated : 2026.08.11 +# Updated : 2026.08.14 # Version : 1.8.0 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -15,6 +15,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +substitutions: + bms_model: "Unknown" + bms_protocol: "Unknown" + globals: - id: bms${bms_id}_combined_once type: bool @@ -30,8 +34,10 @@ esphome: on_boot: - priority: 600 then: - # Shunt counter (total) - - lambda: id(yambms${yambms_id}_var_bms_counter) += 1; + - lambda: |- + id(yambms${yambms_id}_var_bms_counter) += 1; + id(yambms${yambms_id}_var_bms_models) += "${bms_model},"; + id(yambms${yambms_id}_var_bms_protocols) += "${bms_protocol},"; binary_sensor: # Indicates whether the BMS can be combined diff --git a/packages/bms/bms_combine_BASEN_RS485_controller.yaml b/packages/bms/bms_combine_BASEN_RS485_controller.yaml index d9e64c5..981d858 100644 --- a/packages/bms/bms_combine_BASEN_RS485_controller.yaml +++ b/packages/bms/bms_combine_BASEN_RS485_controller.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.06.17 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/GHswitt/esphome-basen # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "BASEN" - bms_protocol: "RS485" - # +--------------------------------------+ # | Component settings | # +--------------------------------------+ diff --git a/packages/bms/bms_combine_BASEN_RS485_controller_talk_pin.yaml b/packages/bms/bms_combine_BASEN_RS485_controller_talk_pin.yaml index 2a72133..e002ca7 100644 --- a/packages/bms/bms_combine_BASEN_RS485_controller_talk_pin.yaml +++ b/packages/bms/bms_combine_BASEN_RS485_controller_talk_pin.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.10.6 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/GHswitt/esphome-basen # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,8 +18,6 @@ # along with this program. If not, see . substitutions: - bms_model: "BASEN" - bms_protocol: "RS485" basen_controller_flow_control_pin: null # +--------------------------------------+ diff --git a/packages/bms/bms_combine_BASEN_RS485_full.yaml b/packages/bms/bms_combine_BASEN_RS485_full.yaml index 42e8995..fcc1efc 100644 --- a/packages/bms/bms_combine_BASEN_RS485_full.yaml +++ b/packages/bms/bms_combine_BASEN_RS485_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.06.01 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/GHswitt/esphome-basen # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,4 +19,8 @@ packages: bms_sensors: !include bms_sensors_BASEN_RS485_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "BASEN" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_DEMO.yaml b/packages/bms/bms_combine_DEMO.yaml index 9421b9a..1cb4eae 100644 --- a/packages/bms/bms_combine_DEMO.yaml +++ b/packages/bms/bms_combine_DEMO.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.15 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,12 +17,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "Fake BMS" - bms_protocol: "DEMO" - packages: bms_sensors: !include bms_sensors_FAKE.yaml bms_numbers: !include bms_sensors_FAKE_extended.yaml bms_demo_cs: !include bms_demo_charge_simulation.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Fake BMS" + bms_protocol: "DEMO" diff --git a/packages/bms/bms_combine_DEYE_CAN_module_full.yaml b/packages/bms/bms_combine_DEYE_CAN_module_full.yaml index 21dff1b..66f8dec 100644 --- a/packages/bms/bms_combine_DEYE_CAN_module_full.yaml +++ b/packages/bms/bms_combine_DEYE_CAN_module_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.06.11 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/GHswitt/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "DEYE" - bms_protocol: "CAN" - packages: bms_module: !include bms_sensors_DEYE_CAN_module_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "DEYE" + bms_protocol: "CAN" diff --git a/packages/bms/bms_combine_DEYE_CAN_module_minimal.yaml b/packages/bms/bms_combine_DEYE_CAN_module_minimal.yaml index eac71a4..9ecda05 100644 --- a/packages/bms/bms_combine_DEYE_CAN_module_minimal.yaml +++ b/packages/bms/bms_combine_DEYE_CAN_module_minimal.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.06.11 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/GHswitt/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "DEYE" - bms_protocol: "CAN" - packages: bms_module: !include bms_sensors_DEYE_CAN_module_minimal.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "DEYE" + bms_protocol: "CAN" diff --git a/packages/bms/bms_combine_EG4_LLV2_RS485_bms_full.yaml b/packages/bms/bms_combine_EG4_LLV2_RS485_bms_full.yaml index d318bc1..fb46268 100644 --- a/packages/bms/bms_combine_EG4_LLV2_RS485_bms_full.yaml +++ b/packages/bms/bms_combine_EG4_LLV2_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.23 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,10 +19,10 @@ # RAR PR (https://github.com/RAR) -substitutions: - bms_model: "EG4 LLV2" - bms_protocol: "RS485" - packages: - bms_combine: !include bms_combine.yaml bms_sensors: !include bms_sensors_EG4_LLV2_RS485_bms_full.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "EG4 LLV2" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_EG4_RS485_modbus.yaml b/packages/bms/bms_combine_EG4_RS485_modbus.yaml index 6e763de..8e8988d 100644 --- a/packages/bms/bms_combine_EG4_RS485_modbus.yaml +++ b/packages/bms/bms_combine_EG4_RS485_modbus.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.12.08 -# Version : 2.0.0 +# Updated : 2026.08.14 +# Version : 2.0.1 # GitHub : https://github.com/RAR/esphome-eg4-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,9 +18,6 @@ # along with this program. If not, see . substitutions: - # BMS - bms_model: "EG4 LLV2" - bms_protocol: "RS485" # Modbus eg4_modbus_id: modbus_eg4 diff --git a/packages/bms/bms_combine_Ecoworthy_RS485.yaml b/packages/bms/bms_combine_Ecoworthy_RS485.yaml index b3a2ad1..c82164e 100644 --- a/packages/bms/bms_combine_Ecoworthy_RS485.yaml +++ b/packages/bms/bms_combine_Ecoworthy_RS485.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.15 -# Version : 1.0.1 +# Updated : 2026.08.14 +# Version : 1.0.2 # GitHub : https://github.com/RAR/esphome-ecoworthy-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -31,10 +31,10 @@ # Optional substitutions (have defaults): # ecoworthy_modbus_id: The ecoworthy_modbus component ID (default: modbus_ecoworthy) -substitutions: - bms_model: "Ecoworthy" - bms_protocol: "RS485" - packages: - bms_combine: !include bms_combine.yaml bms_sensors: !include bms_sensors_Ecoworthy_RS485_full.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Ecoworthy" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_Ecoworthy_RS485_secondary.yaml b/packages/bms/bms_combine_Ecoworthy_RS485_secondary.yaml index 84565d0..3f85394 100644 --- a/packages/bms/bms_combine_Ecoworthy_RS485_secondary.yaml +++ b/packages/bms/bms_combine_Ecoworthy_RS485_secondary.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.08 -# Version : 1.0.0 +# Updated : 2026.08.14 +# Version : 1.0.1 # GitHub : https://github.com/RAR/esphome-ecoworthy-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -38,10 +38,10 @@ # bms_cell_uvp: Cell under-voltage protection in V (default: 2.500) # bms_balance_trigger_voltage: Balance trigger voltage in V (default: 0.030) -substitutions: - bms_model: "Ecoworthy Secondary" - bms_protocol: "RS485" - packages: - bms_combine: !include bms_combine.yaml bms_sensors: !include bms_sensors_Ecoworthy_RS485_secondary.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Ecoworthy" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_FAKE.yaml b/packages/bms/bms_combine_FAKE.yaml index 1e14c0d..b0f1eee 100644 --- a/packages/bms/bms_combine_FAKE.yaml +++ b/packages/bms/bms_combine_FAKE.yaml @@ -1,5 +1,5 @@ -# Updated : 2024.12.23 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "Fake BMS" - bms_protocol: "DEMO" - packages: bms_sensors: !include bms_sensors_FAKE.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Fake BMS" + bms_protocol: "DEMO" diff --git a/packages/bms/bms_combine_FAKE_extended.yaml b/packages/bms/bms_combine_FAKE_extended.yaml index c4d14de..ae9db17 100644 --- a/packages/bms/bms_combine_FAKE_extended.yaml +++ b/packages/bms/bms_combine_FAKE_extended.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.11 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,11 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "Fake BMS" - bms_protocol: "DEMO" - packages: bms_sensors: !include bms_sensors_FAKE.yaml bms_numbers: !include bms_sensors_FAKE_extended.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Fake BMS" + bms_protocol: "DEMO" diff --git a/packages/bms/bms_combine_JBD_BLE_full.yaml b/packages/bms/bms_combine_JBD_BLE_full.yaml index 7dfcfc5..8a491bc 100644 --- a/packages/bms/bms_combine_JBD_BLE_full.yaml +++ b/packages/bms/bms_combine_JBD_BLE_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.01.28 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JBD" - bms_protocol: "BLE" - packages: bms_sensors: !include bms_sensors_JBD_BLE_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JBD" + bms_protocol: "BLE" diff --git a/packages/bms/bms_combine_JBD_UART_full.yaml b/packages/bms/bms_combine_JBD_UART_full.yaml index bcd3cca..3af6a97 100644 --- a/packages/bms/bms_combine_JBD_UART_full.yaml +++ b/packages/bms/bms_combine_JBD_UART_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2024.12.23 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JBD" - bms_protocol: "UART" - packages: bms_sensors: !include bms_sensors_JBD_UART_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JBD" + bms_protocol: "UART" diff --git a/packages/bms/bms_combine_JK_BLE_full.yaml b/packages/bms/bms_combine_JK_BLE_full.yaml index 8f85913..c8267da 100644 --- a/packages/bms/bms_combine_JK_BLE_full.yaml +++ b/packages/bms/bms_combine_JK_BLE_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.06.22 -# Version : 1.3.7 +# Updated : 2026.08.14 +# Version : 1.3.8 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,13 +17,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK" - bms_protocol: "BLE" - packages: bms_base: !include bms_base.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "BLE" bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml bms_battery_soh: !include bms_base_battery_soh.yaml @@ -45,18 +45,18 @@ external_components: esp32_ble_tracker: scan_parameters: active: false - on_ble_advertise: - then: - - lambda: |- - if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { - ESP_LOGI("ble_adv", "New JK-BMS found"); - ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); - ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); - ESP_LOGD("ble_adv", " Advertised service UUIDs:"); - for (auto uuid : x.get_service_uuids()) { - ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); - } - } + # on_ble_advertise: + # then: + # - lambda: |- + # if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { + # ESP_LOGI("ble_adv", "New JK-BMS found"); + # ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); + # ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); + # ESP_LOGD("ble_adv", " Advertised service UUIDs:"); + # for (auto uuid : x.get_service_uuids()) { + # ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); + # } + # } ble_client: - id: ble_client${bms_id} diff --git a/packages/bms/bms_combine_JK_BLE_minimal.yaml b/packages/bms/bms_combine_JK_BLE_minimal.yaml index 8ef71fe..885c089 100644 --- a/packages/bms/bms_combine_JK_BLE_minimal.yaml +++ b/packages/bms/bms_combine_JK_BLE_minimal.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.06.22 -# Version : 1.3.7 +# Updated : 2026.08.14 +# Version : 1.3.8 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,13 +17,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK" - bms_protocol: "BLE" - packages: bms_base: !include bms_base.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "BLE" bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_BLE.yaml bms_battery_soh: !include bms_base_battery_soh.yaml @@ -45,18 +45,18 @@ external_components: esp32_ble_tracker: scan_parameters: active: false - on_ble_advertise: - then: - - lambda: |- - if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { - ESP_LOGI("ble_adv", "New JK-BMS found"); - ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); - ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); - ESP_LOGD("ble_adv", " Advertised service UUIDs:"); - for (auto uuid : x.get_service_uuids()) { - ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); - } - } + # on_ble_advertise: + # then: + # - lambda: |- + # if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { + # ESP_LOGI("ble_adv", "New JK-BMS found"); + # ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); + # ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); + # ESP_LOGD("ble_adv", " Advertised service UUIDs:"); + # for (auto uuid : x.get_service_uuids()) { + # ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); + # } + # } ble_client: - id: ble_client${bms_id} diff --git a/packages/bms/bms_combine_JK_BLE_standard.yaml b/packages/bms/bms_combine_JK_BLE_standard.yaml index d9944c7..50d04f1 100644 --- a/packages/bms/bms_combine_JK_BLE_standard.yaml +++ b/packages/bms/bms_combine_JK_BLE_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2024.04.01 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK" - bms_protocol: "BLE" - packages: bms_sensors: !include bms_sensors_JK_BLE_standard.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "BLE" diff --git a/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml b/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml index d3ba715..90fe836 100644 --- a/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml +++ b/packages/bms/bms_combine_JK_RS485_DISPLAY_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.05 -# Version : 1.1.9 +# Updated : 2026.08.14 +# Version : 1.2.0 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,13 +17,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK" - bms_protocol: "DISPLAY" - packages: bms_base: !include bms_base.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "DISPLAY" bms_temperature_sensor: !include bms_temperature_sensor_2.yaml bms_battery_soh: !include bms_base_battery_soh.yaml diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_JK-B_standard.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_JK-B_standard.yaml index 26ed901..acc6468 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_JK-B_standard.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_JK-B_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.04.21 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,4 +19,8 @@ packages: bms_sensors: !include bms_sensors_JK_RS485_Modbus_JK-B_standard.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_bms_full.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_bms_full.yaml index 561f593..73e93fd 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_bms_full.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.04.01 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,4 +19,8 @@ packages: bms_sensors: !include bms_sensors_JK_RS485_Modbus_bms_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml index cfbd743..b68916d 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_bms_minimal.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.05 -# Version : 1.3.4 +# Updated : 2026.08.14 +# Version : 1.3.5 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,7 +19,11 @@ packages: bms_base: !include bms_base.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "RS485" bms_temperature_sensor: !include bms_temperature_sensor_5.yaml bms_errors_bitmask: !include bms_errors_bitmask_JK_RS485_Modbus.yaml diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_bms_standard.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_bms_standard.yaml index cf33b19..2f406ef 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_bms_standard.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_bms_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.04.01 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,4 +19,8 @@ packages: bms_sensors: !include bms_sensors_JK_RS485_Modbus_bms_standard.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml index bd1aef3..7baf46e 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.12.22 -# Version : 1.3.2 +# Updated : 2026.08.14 +# Version : 1.3.3 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,8 +18,6 @@ # along with this program. If not, see . substitutions: - bms_model: "JK" - bms_protocol: "RS485" sniffer_id: "jk_sniffer_1" sniffer_name: "JK sniffer" diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_talk_pin.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_talk_pin.yaml index 5b70e59..cc67a56 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_talk_pin.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_talk_pin.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.12.22 -# Version : 1.3.2 +# Updated : 2026.08.14 +# Version : 1.3.3 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,8 +18,6 @@ # along with this program. If not, see . substitutions: - bms_model: "JK" - bms_protocol: "RS485" sniffer_id: "jk_sniffer_1" sniffer_name: "JK sniffer" diff --git a/packages/bms/bms_combine_JK_UART_4G-GPS_full.yaml b/packages/bms/bms_combine_JK_UART_4G-GPS_full.yaml index a48ba45..8d016d1 100644 --- a/packages/bms/bms_combine_JK_UART_4G-GPS_full.yaml +++ b/packages/bms/bms_combine_JK_UART_4G-GPS_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.04.01 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK" - bms_protocol: "UART 4G-GPS" - packages: bms_sensors: !include bms_sensors_JK_UART_4G-GPS_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "JK" + bms_protocol: "UART" diff --git a/packages/bms/bms_combine_PACE_RS485_bms_full.yaml b/packages/bms/bms_combine_PACE_RS485_bms_full.yaml index 6603a0c..8396054 100644 --- a/packages/bms/bms_combine_PACE_RS485_bms_full.yaml +++ b/packages/bms/bms_combine_PACE_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.08.13 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,5 +18,9 @@ # along with this program. If not, see . packages: - bms_combine: !include bms_combine.yaml bms_sensors: !include bms_sensors_PACE_RS485_bms_full.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "PACE" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_PACE_RS485_modbus.yaml b/packages/bms/bms_combine_PACE_RS485_modbus.yaml index 69c19cc..8da491a 100644 --- a/packages/bms/bms_combine_PACE_RS485_modbus.yaml +++ b/packages/bms/bms_combine_PACE_RS485_modbus.yaml @@ -1,40 +1,37 @@ -# Updated : 2026.08.04 -# Version : 1.1.2 -# 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 . - -substitutions: - # BMS - bms_model: "PACE" - bms_protocol: "RS485" - # Modbus - pace_modbus_id: modbus_pace - pace_modbus_send_wait_time: 250ms # Timeout: max time to wait for the FIRST byte of a response - pace_modbus_turnaround_time: '0ms' # Pause after a completed response before the next command. - # Modbus Controller - pace_modbus_update_interval: '5s' # Frequency with which BMS modbus servers are queried - -uart: - - id: !extend ${pace_modbus_uart_id} - baud_rate: ${pace_modbus_baud_rate} - -modbus: - - uart_id: ${pace_modbus_uart_id} - id: ${pace_modbus_id} - role: client - send_wait_time: ${pace_modbus_send_wait_time} - turnaround_time: ${pace_modbus_turnaround_time} +# Updated : 2026.08.14 +# Version : 1.1.3 +# 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 . + +substitutions: + # Modbus + pace_modbus_id: modbus_pace + pace_modbus_send_wait_time: 250ms # Timeout: max time to wait for the FIRST byte of a response + pace_modbus_turnaround_time: '0ms' # Pause after a completed response before the next command. + # Modbus Controller + pace_modbus_update_interval: '5s' # Frequency with which BMS modbus servers are queried + +uart: + - id: !extend ${pace_modbus_uart_id} + baud_rate: ${pace_modbus_baud_rate} + +modbus: + - uart_id: ${pace_modbus_uart_id} + id: ${pace_modbus_id} + role: client + send_wait_time: ${pace_modbus_send_wait_time} + turnaround_time: ${pace_modbus_turnaround_time} diff --git a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml index b53332d..7451793 100644 --- a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml +++ b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.06.16 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-seplos-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -19,4 +19,8 @@ packages: bms_sensors: !include bms_sensors_SEPLOS_V1_V2_RS485_bms_full.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Seplos V1 V2" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_modbus.yaml b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_modbus.yaml index d975a89..bcb6405 100644 --- a/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_modbus.yaml +++ b/packages/bms/bms_combine_SEPLOS_V1_V2_RS485_modbus.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.15 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-seplos-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,8 +18,6 @@ # along with this program. If not, see . substitutions: - bms_model: "Seplos V1 V2" - bms_protocol: "RS485" # Modbus seplos_modbus_id: modbus_seplos_v2 seplos_modbus_rx_timeout: '150ms' diff --git a/packages/bms/bms_combine_SEPLOS_V3_RS485_bms_full.yaml b/packages/bms/bms_combine_SEPLOS_V3_RS485_bms_full.yaml index 0277817..37e374f 100644 --- a/packages/bms/bms_combine_SEPLOS_V3_RS485_bms_full.yaml +++ b/packages/bms/bms_combine_SEPLOS_V3_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.13 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-seplos-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -18,5 +18,9 @@ # along with this program. If not, see . packages: - bms_combine: !include bms_combine.yaml bms_sensors: !include bms_sensors_SEPLOS_V3_RS485_bms_full.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "Seplos V3" + bms_protocol: "RS485" diff --git a/packages/bms/bms_combine_SEPLOS_V3_RS485_modbus_sniffer.yaml b/packages/bms/bms_combine_SEPLOS_V3_RS485_modbus_sniffer.yaml index 32dedb0..829ce8f 100644 --- a/packages/bms/bms_combine_SEPLOS_V3_RS485_modbus_sniffer.yaml +++ b/packages/bms/bms_combine_SEPLOS_V3_RS485_modbus_sniffer.yaml @@ -1,45 +1,42 @@ -# Updated : 2025.11.14 -# Version : 1.1.1 -# GitHub : https://github.com/DpunktS/seplos_v3_sniffer - -# 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 . - -substitutions: - # BMS - bms_model: "Seplos V3" - bms_protocol: "RS485" - # Seplos Parser - seplos_parser_id: seplos_parser_1 - -# +--------------------------------------+ -# | Component settings | -# +--------------------------------------+ - -external_components: - - source: - type: git - url: https://github.com/DpunktS/seplos_v3_sniffer - -uart: - - id: !extend ${seplos_uart_id} - baud_rate: ${seplos_baud_rate} - rx_buffer_size: 2048 - -seplos_parser: - id: ${seplos_parser_id} - uart_id: ${seplos_uart_id} - bms_count: ${seplos_bms_count} - update_interval: ${seplos_update_interval} +# Updated : 2026.08.14 +# Version : 1.1.2 +# GitHub : https://github.com/DpunktS/seplos_v3_sniffer + +# 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 . + +substitutions: + # Seplos Parser + seplos_parser_id: seplos_parser_1 + +# +--------------------------------------+ +# | Component settings | +# +--------------------------------------+ + +external_components: + - source: + type: git + url: https://github.com/DpunktS/seplos_v3_sniffer + +uart: + - id: !extend ${seplos_uart_id} + baud_rate: ${seplos_baud_rate} + rx_buffer_size: 2048 + +seplos_parser: + id: ${seplos_parser_id} + uart_id: ${seplos_uart_id} + bms_count: ${seplos_bms_count} + update_interval: ${seplos_update_interval} diff --git a/packages/bms/bms_combine_modbus_client.yaml b/packages/bms/bms_combine_modbus_client.yaml index c5cc761..a506f5f 100644 --- a/packages/bms/bms_combine_modbus_client.yaml +++ b/packages/bms/bms_combine_modbus_client.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.07.31 -# Version : 1.3.1 +# Updated : 2026.08.14 +# Version : 1.3.2 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,14 +17,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "YamBMS" - bms_protocol: "Modbus" - packages: sub_device: !include bms_base_sub_device.yaml bms_balancer: !include bms_base_balancer.yaml - bms_combine: !include bms_combine.yaml + bms_combine: !include + file: bms_combine.yaml + vars: + bms_model: "YamBMS" + bms_protocol: "Modbus" # +--------------------------------------+ # | Component settings | diff --git a/packages/bms/bms_modbus_BASEN_RS485_bms_full.yaml b/packages/bms/bms_modbus_BASEN_RS485_bms_full.yaml index 999a304..2aba31b 100644 --- a/packages/bms/bms_modbus_BASEN_RS485_bms_full.yaml +++ b/packages/bms/bms_modbus_BASEN_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/GHswitt/esphome-basen # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "BASEN RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_BASEN_RS485_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_DEYE_CAN_module_full.yaml b/packages/bms/bms_modbus_DEYE_CAN_module_full.yaml index 4b8f4f7..64404f1 100644 --- a/packages/bms/bms_modbus_DEYE_CAN_module_full.yaml +++ b/packages/bms/bms_modbus_DEYE_CAN_module_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.3 +# Updated : 2026.08.14 +# Version : 1.1.4 # GitHub : https://github.com/GHswitt/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "DEYE CAN" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_DEYE_CAN_module_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_EG4_LLV2_RS485_bms_full.yaml b/packages/bms/bms_modbus_EG4_LLV2_RS485_bms_full.yaml index 9a63e74..9e12bd1 100644 --- a/packages/bms/bms_modbus_EG4_LLV2_RS485_bms_full.yaml +++ b/packages/bms/bms_modbus_EG4_LLV2_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.3 +# Updated : 2026.08.14 +# Version : 1.1.4 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "EG4 LLV2 RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_EG4_LLV2_RS485_bms_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_Ecoworthy_RS485_full.yaml b/packages/bms/bms_modbus_Ecoworthy_RS485_full.yaml index fadb6d5..7ddc41d 100644 --- a/packages/bms/bms_modbus_Ecoworthy_RS485_full.yaml +++ b/packages/bms/bms_modbus_Ecoworthy_RS485_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.15 -# Version : 1.0.0 +# Updated : 2026.08.14 +# Version : 1.0.1 # GitHub : https://github.com/RAR/esphome-ecoworthy-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "Ecoworthy RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_Ecoworthy_RS485_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_Ecoworthy_RS485_secondary.yaml b/packages/bms/bms_modbus_Ecoworthy_RS485_secondary.yaml index d86641b..8b8516a 100644 --- a/packages/bms/bms_modbus_Ecoworthy_RS485_secondary.yaml +++ b/packages/bms/bms_modbus_Ecoworthy_RS485_secondary.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.15 -# Version : 1.0.0 +# Updated : 2026.08.14 +# Version : 1.0.1 # GitHub : https://github.com/RAR/esphome-ecoworthy-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "Ecoworthy Secondary" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_Ecoworthy_RS485_secondary.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_FAKE.yaml b/packages/bms/bms_modbus_FAKE.yaml index 25b82f9..6f4b219 100644 --- a/packages/bms/bms_modbus_FAKE.yaml +++ b/packages/bms/bms_modbus_FAKE.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "YamBMS Demo" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_FAKE.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_JBD_BLE_full.yaml b/packages/bms/bms_modbus_JBD_BLE_full.yaml index 78e7c4c..5ea19e6 100644 --- a/packages/bms/bms_modbus_JBD_BLE_full.yaml +++ b/packages/bms/bms_modbus_JBD_BLE_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JBD BLE" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_JBD_BLE_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_JBD_UART_full.yaml b/packages/bms/bms_modbus_JBD_UART_full.yaml index 20565be..9b85c62 100644 --- a/packages/bms/bms_modbus_JBD_UART_full.yaml +++ b/packages/bms/bms_modbus_JBD_UART_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JBD UART" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_JBD_UART_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_JK_BLE_standard.yaml b/packages/bms/bms_modbus_JK_BLE_standard.yaml index 8924834..18b08d7 100644 --- a/packages/bms/bms_modbus_JK_BLE_standard.yaml +++ b/packages/bms/bms_modbus_JK_BLE_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.3 +# Updated : 2026.08.14 +# Version : 1.1.4 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK BLE" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_JK_BLE_standard.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_JK_RS485_Modbus_bms_standard.yaml b/packages/bms/bms_modbus_JK_RS485_Modbus_bms_standard.yaml index af4b9aa..0c1864e 100644 --- a/packages/bms/bms_modbus_JK_RS485_Modbus_bms_standard.yaml +++ b/packages/bms/bms_modbus_JK_RS485_Modbus_bms_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_JK_RS485_Modbus_bms_standard.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_JK_UART_4G-GPS_full.yaml b/packages/bms/bms_modbus_JK_UART_4G-GPS_full.yaml index 7412d79..d149c31 100644 --- a/packages/bms/bms_modbus_JK_UART_4G-GPS_full.yaml +++ b/packages/bms/bms_modbus_JK_UART_4G-GPS_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.3 +# Updated : 2026.08.14 +# Version : 1.1.4 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "JK UART" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_JK_UART_4G-GPS_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_PACE_RS485_bms_full.yaml b/packages/bms/bms_modbus_PACE_RS485_bms_full.yaml index 9b516ff..e5f75f9 100644 --- a/packages/bms/bms_modbus_PACE_RS485_bms_full.yaml +++ b/packages/bms/bms_modbus_PACE_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.2 +# Updated : 2026.08.14 +# Version : 1.1.3 # GitHub : https://github.com/syssi/esphome-pace-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "PACE RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_PACE_RS485_bms_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_SEPLOS_V1_V2_RS485_bms_full.yaml b/packages/bms/bms_modbus_SEPLOS_V1_V2_RS485_bms_full.yaml index 365548e..5a82e6f 100644 --- a/packages/bms/bms_modbus_SEPLOS_V1_V2_RS485_bms_full.yaml +++ b/packages/bms/bms_modbus_SEPLOS_V1_V2_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.11.25 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-pace-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "SEPLOS V1 V2 RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_SEPLOS_V1_V2_RS485_bms_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_modbus_SEPLOS_V3_RS485_bms_full.yaml b/packages/bms/bms_modbus_SEPLOS_V3_RS485_bms_full.yaml index c2cc09b..d4eed66 100644 --- a/packages/bms/bms_modbus_SEPLOS_V3_RS485_bms_full.yaml +++ b/packages/bms/bms_modbus_SEPLOS_V3_RS485_bms_full.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.13 -# Version : 1.1.1 +# Updated : 2026.08.14 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-pace-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -17,10 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -substitutions: - bms_model: "SEPLOS V3 RS485" - bms_protocol: "Multi-node" - packages: bms_sensors: !include bms_sensors_SEPLOS_V3_RS485_bms_full.yaml bms_combine: !include bms_modbus_server.yaml diff --git a/packages/bms/bms_sensors_JK_BLE_standard.yaml b/packages/bms/bms_sensors_JK_BLE_standard.yaml index 1fdd138..c9e7c76 100644 --- a/packages/bms/bms_sensors_JK_BLE_standard.yaml +++ b/packages/bms/bms_sensors_JK_BLE_standard.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.06.22 -# Version : 1.3.7 +# Updated : 2026.08.14 +# Version : 1.3.8 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -40,18 +40,18 @@ external_components: esp32_ble_tracker: scan_parameters: active: false - on_ble_advertise: - then: - - lambda: |- - if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { - ESP_LOGI("ble_adv", "New JK-BMS found"); - ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); - ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); - ESP_LOGD("ble_adv", " Advertised service UUIDs:"); - for (auto uuid : x.get_service_uuids()) { - ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); - } - } + # on_ble_advertise: + # then: + # - lambda: |- + # if (x.get_name().rfind("JK-", 0) == 0 || x.get_name().rfind("JK_", 0) == 0) { + # ESP_LOGI("ble_adv", "New JK-BMS found"); + # ESP_LOGI("ble_adv", " Name: %s", x.get_name().c_str()); + # ESP_LOGI("ble_adv", " MAC address: %s", x.address_str().c_str()); + # ESP_LOGD("ble_adv", " Advertised service UUIDs:"); + # for (auto uuid : x.get_service_uuids()) { + # ESP_LOGD("ble_adv", " - %s", uuid.to_string().c_str()); + # } + # } ble_client: - id: ble_client${bms_id} diff --git a/packages/yambms/yambms_core.yaml b/packages/yambms/yambms_core.yaml index a91aed1..44ed5cf 100644 --- a/packages/yambms/yambms_core.yaml +++ b/packages/yambms/yambms_core.yaml @@ -1,4 +1,4 @@ -# Updated : 2026.08.13 +# Updated : 2026.08.14 # Version : 1.8.0 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -30,6 +30,14 @@ substitutions: globals: # BMS + - id: yambms${yambms_id}_var_bms_models + type: std::string + restore_value: no + initial_value: '""' + - id: yambms${yambms_id}_var_bms_protocols + type: std::string + restore_value: no + initial_value: '""' - id: yambms${yambms_id}_var_bms_counter type: int restore_value: no diff --git a/packages/yambms/yambms_service.yaml b/packages/yambms/yambms_service.yaml index 13271c9..233a6b4 100644 --- a/packages/yambms/yambms_service.yaml +++ b/packages/yambms/yambms_service.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.08.13 -# Version : 1.2.8 +# Updated : 2026.08.14 +# Version : 1.2.9 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -77,8 +77,8 @@ interval: root["version"] = "${yambms_version}"; root["board_chip"] = "${board_chip}"; root["board_name"] = "${board_name}"; - root["bms_model"] = "${bms_model}"; - root["bms_protocol"] = "${bms_protocol}"; + root["bms_model"] = id(yambms${yambms_id}_var_bms_models); + root["bms_protocol"] = id(yambms${yambms_id}_var_bms_protocols); root["bms_count"] = id(yambms${yambms_id}_var_bms_counter); root["comm_bus"] = id(yambms${yambms_id}_var_communication_bus); root["comm_protocol"] = id(yambms${yambms_id}_var_communication_protocol);