V1.16.3

Sleeper85 · Jan 21, 2024 · f73dae5 · f73dae5
1 parent e28f691
commit f73dae5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/esp32_ble_jk-bms-can.yaml b/esp32_ble_jk-bms-can.yaml
@@ -1,9 +1,9 @@
-# JK-BMS-CAN ( Pylontech, GoodWe, SMA, Victron CAN bus protocol )
+# JK-BMS-CAN ( PYLON, Seplos, GoodWe, SMA and Victron CAN bus protocol )
 
-# esp32-jk-bms-can.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.
+# esp32_ble_jk-bms-can.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
@@ -13,7 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.
 
-# V1.16.2 Sleeper85 : Split the "Charge/Discharge values" section and added instructions for "Stop Discharging" + Change framework to "esp-idf" (BLE version)
+# V1.16.3 Sleeper85 : ID 0x379 will be sent when choosing protocol 2 or 4 (Battery Capacity for Victron, Sol-Ark and Luxpower)
+# V1.16.2 Sleeper85 : Split the "Charge/Discharge values" section and added instructions for "Stop Discharging" + Set "esp-idf" framework by default
 # V1.16.1 Sleeper85 : Slider charging_current max value = ${charge_a}, Improved Alarm/Charging/Discharging Logic, Improved CAN protocol and Victron support
 # V1.15.5 Sleeper85 : Improved code and set api "reboot_timout" to "0s" by default (no reboot without HA)
 # V1.15.4 Sleeper85 : Improved documentation for API, Web Server and WiFi settings
@@ -86,7 +87,7 @@ substitutions:
   can_bms_name: "1"
 # CAN Protocol
 # 1 : PYLON 1.2 (Deye)
-# 2 : SEPLOS 1.0, PYLON 1.3, GOODWE 1.5
+# 2 : SEPLOS 1.0, PYLON 1.3, GOODWE 1.5 (GoodWe, Sol-Ark, Luxpower)
 # 3 : SMA (Sunny Island)
 # 4 : VICTRON
   can_protocol: "1"
@@ -1235,7 +1236,7 @@ interval:
 
             - if:
                 condition:
-                  lambda: return ((id(can_msg_counter) == 9) & (${can_protocol} == 4));
+                  lambda: return ((id(can_msg_counter) == 9) & ((${can_protocol} == 2) | (${can_protocol} == 4)));
                 then:
                   - canbus.send: # Battery Installed Capacity Ah ( Victron, Sol-Ark, Luxpower )
                       can_id: 0x379

diff --git a/esp32_wire_jk-bms-can.yaml b/esp32_wire_jk-bms-can.yaml
@@ -1,9 +1,9 @@
-# JK-BMS-CAN ( Pylontech, GoodWe, SMA, Victron CAN bus protocol )
+# JK-BMS-CAN ( PYLON, Seplos, GoodWe, SMA and Victron CAN bus protocol )
 
-# esp32-jk-bms-can.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.
+# esp32_wire_jk-bms-can.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
@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.
 
+# V1.16.3 Sleeper85 : ID 0x379 will be sent when choosing protocol 2 or 4 (Battery Capacity for Victron, Sol-Ark and Luxpower)
 # V1.16.2 Sleeper85 : Split the "Charge/Discharge values" section and added instructions for "Stop Discharging" + Set "esp-idf" framework by default
 # V1.16.1 Sleeper85 : Slider charging_current max value = ${charge_a}, Improved Alarm/Charging/Discharging Logic, Improved CAN protocol and Victron support
 # V1.15.5 Sleeper85 : Improved code and set api "reboot_timout" to "0s" by default (no reboot without HA)
@@ -78,7 +79,7 @@ substitutions:
   can_bms_name: "1"
 # CAN Protocol
 # 1 : PYLON 1.2 (Deye)
-# 2 : SEPLOS 1.0, PYLON 1.3, GOODWE 1.5
+# 2 : SEPLOS 1.0, PYLON 1.3, GOODWE 1.5 (GoodWe, Sol-Ark, Luxpower)
 # 3 : SMA (Sunny Island)
 # 4 : VICTRON
   can_protocol: "1"
@@ -1210,7 +1211,7 @@ interval:
 
             - if:
                 condition:
-                  lambda: return ((id(can_msg_counter) == 9) & (${can_protocol} == 4));
+                  lambda: return ((id(can_msg_counter) == 9) & ((${can_protocol} == 2) | (${can_protocol} == 4)));
                 then:
                   - canbus.send: # Battery Installed Capacity Ah ( Victron, Sol-Ark, Luxpower )
                       can_id: 0x379