From bb071e65651b242eae5ddc49d37b27c9c0e0bfcd Mon Sep 17 00:00:00 2001 From: Sleeper85 Date: Thu, 12 Nov 2026 17:52:57 +0100 Subject: [PATCH] JK RS485 - Load the components 1.2 from @dev and remove protocol_version The sniffer packages load the JK RS485 components from the dev branch of Sleeper85/esphome-components (JK RS485 1.2) until it is tested and merged into main ; they will then go back to @main. JK RS485 1.2 removes the protocol_version key of jk_rs485_sniffer (the JK-PB RS485 protocol has only one version) and refuses it, while 1.1 requires it : both changes have to be made together. The sniffer packages no longer pass it, and the sniffer_protocol var is removed from the JK-B and JK-PB RS485 YAML and examples. A user YAML that still defines sniffer_protocol keeps working, the var is simply unused. --- YamBMS_RP_BMS_JK-B_RS485_Modbus.yaml | 3 +-- YamBMS_RP_BMS_JK-PB_RS485_Modbus.yaml | 3 +-- .../LP_BMS_example_JK-B_RS485_Modbus_mode2.yaml | 5 ++--- .../LP_BMS_example_JK-PB_RS485_Modbus_mode1.yaml | 5 ++--- .../LP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml | 5 ++--- .../RP_BMS_example_JK-B_RS485_Modbus_mode2.yaml | 5 ++--- .../RP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml | 5 ++--- packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml | 9 ++++----- .../bms/bms_combine_JK_RS485_Modbus_sniffer_dev.yaml | 7 +++---- .../bms_combine_JK_RS485_Modbus_sniffer_talk_pin.yaml | 9 ++++----- 10 files changed, 23 insertions(+), 33 deletions(-) diff --git a/YamBMS_RP_BMS_JK-B_RS485_Modbus.yaml b/YamBMS_RP_BMS_JK-B_RS485_Modbus.yaml index a894181..3d89bb2 100644 --- a/YamBMS_RP_BMS_JK-B_RS485_Modbus.yaml +++ b/YamBMS_RP_BMS_JK-B_RS485_Modbus.yaml @@ -1,4 +1,4 @@ -# Updated : 2026.11.08 +# Updated : 2026.11.11 # Version : 1.8.2 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -260,7 +260,6 @@ packages: # RS485 Sniffer - path: 'packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml' vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin # BMS 1 diff --git a/YamBMS_RP_BMS_JK-PB_RS485_Modbus.yaml b/YamBMS_RP_BMS_JK-PB_RS485_Modbus.yaml index bbca4b5..afafef0 100644 --- a/YamBMS_RP_BMS_JK-PB_RS485_Modbus.yaml +++ b/YamBMS_RP_BMS_JK-PB_RS485_Modbus.yaml @@ -1,4 +1,4 @@ -# Updated : 2026.11.08 +# Updated : 2026.11.11 # Version : 1.8.2 # GitHub : https://github.com/Sleeper85/esphome-yambms @@ -260,7 +260,6 @@ packages: # RS485 Sniffer - path: 'packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml' vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin # BMS 1 diff --git a/examples/single-node/LP_BMS_example_JK-B_RS485_Modbus_mode2.yaml b/examples/single-node/LP_BMS_example_JK-B_RS485_Modbus_mode2.yaml index 069ab22..a104c1b 100644 --- a/examples/single-node/LP_BMS_example_JK-B_RS485_Modbus_mode2.yaml +++ b/examples/single-node/LP_BMS_example_JK-B_RS485_Modbus_mode2.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.16 -# Version : 1.1.5 +# Updated : 2026.11.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -32,7 +32,6 @@ packages: sniffer1: !include file: packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin diff --git a/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode1.yaml b/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode1.yaml index b39d2d4..587880c 100644 --- a/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode1.yaml +++ b/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode1.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.16 -# Version : 1.1.5 +# Updated : 2026.11.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -32,7 +32,6 @@ packages: sniffer1: !include file: packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin diff --git a/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml b/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml index 498e244..ddbc867 100644 --- a/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml +++ b/examples/single-node/LP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.16 -# Version : 1.1.5 +# Updated : 2026.11.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -32,7 +32,6 @@ packages: sniffer1: !include file: packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin diff --git a/examples/single-node/RP_BMS_example_JK-B_RS485_Modbus_mode2.yaml b/examples/single-node/RP_BMS_example_JK-B_RS485_Modbus_mode2.yaml index fc91e78..065a99c 100644 --- a/examples/single-node/RP_BMS_example_JK-B_RS485_Modbus_mode2.yaml +++ b/examples/single-node/RP_BMS_example_JK-B_RS485_Modbus_mode2.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.16 -# Version : 1.1.5 +# Updated : 2026.11.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -34,7 +34,6 @@ # RS485 Sniffer - path: 'packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml' vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin # BMS 1 diff --git a/examples/single-node/RP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml b/examples/single-node/RP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml index b67063b..30df1f9 100644 --- a/examples/single-node/RP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml +++ b/examples/single-node/RP_BMS_example_JK-PB_RS485_Modbus_mode2.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.02.16 -# Version : 1.1.5 +# Updated : 2026.11.11 +# Version : 1.1.6 # GitHub : https://github.com/Sleeper85/esphome-yambms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -34,7 +34,6 @@ # RS485 Sniffer - path: 'packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml' vars: - sniffer_protocol: 'JK02_32S' sniffer_uart_id: 'uart_esp_1' # uart_flow_control_pin: ${talk_pin} # WS-RS485-CAN and other RS485 boards with a flow_control_pin # BMS 1 diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer.yaml index 7f86ee3..f951edd 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 : 2026.11.05 -# Version : 1.3.5 +# Updated : 2026.11.11 +# Version : 1.3.6 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -36,7 +36,7 @@ logger: # +--------------------------------------+ external_components: - - source: github://Sleeper85/esphome-components@main + - source: github://Sleeper85/esphome-components@dev refresh: 60min components: [ jk_rs485_sniffer , jk_rs485_bms ] # - source: @@ -45,7 +45,6 @@ external_components: jk_rs485_sniffer: - id: ${sniffer_id} - protocol_version: ${sniffer_protocol} rx_timeout: 500ms uart_id: ${sniffer_uart_id} @@ -58,7 +57,7 @@ switch: device_id: sniffer_${sniffer_uart_id} name: "Broadcasting BMS settings to all BMS" icon: "mdi:cast" - restore_mode: RESTORE_DEFAULT_OFF + restore_mode: RESTORE_DEFAULT_ON optimistic: true entity_category: config turn_on_action: diff --git a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_dev.yaml b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_dev.yaml index 32f6d90..30b7378 100644 --- a/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_dev.yaml +++ b/packages/bms/bms_combine_JK_RS485_Modbus_sniffer_dev.yaml @@ -1,5 +1,5 @@ -# Updated : 2026.09.02 -# Version : 1.3.4 +# Updated : 2026.11.11 +# Version : 1.3.5 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -45,7 +45,6 @@ external_components: jk_rs485_sniffer: - id: ${sniffer_id} - protocol_version: ${sniffer_protocol} rx_timeout: 500ms uart_id: ${sniffer_uart_id} @@ -58,7 +57,7 @@ switch: device_id: sniffer_${sniffer_uart_id} name: "Broadcasting BMS settings to all BMS" icon: "mdi:cast" - restore_mode: RESTORE_DEFAULT_OFF + restore_mode: RESTORE_DEFAULT_ON optimistic: true entity_category: config turn_on_action: 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 7af5437..e0507cc 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 : 2026.11.05 -# Version : 1.3.4 +# Updated : 2026.11.11 +# Version : 1.3.5 # GitHub : https://github.com/txubelaxu/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -36,7 +36,7 @@ logger: # +--------------------------------------+ external_components: - - source: github://Sleeper85/esphome-components@main + - source: github://Sleeper85/esphome-components@dev refresh: 0s components: [ jk_rs485_sniffer , jk_rs485_bms ] # - source: @@ -45,7 +45,6 @@ external_components: jk_rs485_sniffer: - id: ${sniffer_id} - protocol_version: ${sniffer_protocol} rx_timeout: 500ms uart_id: ${sniffer_uart_id} talk_pin: ${sniffer_talk_pin} @@ -59,7 +58,7 @@ switch: device_id: sniffer_${sniffer_uart_id} name: "Broadcasting BMS settings to all BMS" icon: "mdi:cast" - restore_mode: RESTORE_DEFAULT_OFF + restore_mode: RESTORE_DEFAULT_ON optimistic: true entity_category: config turn_on_action: