Add JK-PB bms compatibility. Target: 1 ESP in a "listening mode" connected to RS485 network.

components/jk_bms_ble/jk_bms_ble.cpp

@@ -748,7 +748,11 @@ void JkBmsBle::decode_jk04_cell_info_(const std::vector<uint8_t> &data) {
   this->publish_state_(this->total_runtime_sensor_, (float) jk_get_32bit(286));
   this->publish_state_(this->total_runtime_formatted_text_sensor_, format_total_runtime_(jk_get_32bit(286)));
 
-  // 290   4   0x00 0x00 0x00 0x00    Unknown290
+  // 290   1   0x00    Unknown290
+  // 291   1   0x00    ** [JK-PB2A16S-20P v14] CHARGE IS WORKING 
+  // 292   1   0x00    ** [JK-PB2A16S-20P v14] DISCHARGE IS WORKING
+  // 293   1   0x00    ** [JK-PB2A16S-20P v14] PREDISCHARGE IS WORKING (?)
+  // 294   1   0x00    ** [JK-PB2A16S-20P v14] BALANCE IS WORKING (?)     
   ESP_LOGD(TAG, "Unknown290: 0x%02X 0x%02X 0x%02X 0x%02X (always 0x00 0x00 0x00 0x00?)", data[290], data[291],
            data[292], data[293]);
 
@@ -794,13 +798,13 @@ void JkBmsBle::decode_jk02_settings_(const std::vector<uint8_t> &data) {
   // 0     4   0x55 0xAA 0xEB 0x90    Header
   // 4     1   0x01                   Frame type
   // 5     1   0x4F                   Frame counter
-  // 6     4   0x58 0x02 0x00 0x00    Unknown6
+  // 6     4   0x58 0x02 0x00 0x00    ** [JK-PB2A16S-20P v14] VOLTAGE SMART SLEEP
   ESP_LOGD(TAG, "  Unknown6: %f", (float) jk_get_32bit(6) * 0.001f);
   // 10    4   0x54 0x0B 0x00 0x00    Cell UVP
   ESP_LOGI(TAG, "  Cell UVP: %f V", (float) jk_get_32bit(10) * 0.001f);
   this->publish_state_(this->cell_voltage_undervoltage_protection_number_, (float) jk_get_32bit(10) * 0.001f);
 
-  // 14    4   0x80 0x0C 0x00 0x00    Cell OVP Recovery
+  // 14    4   0x80 0x0C 0x00 0x00    Cell UVP Recovery
   ESP_LOGI(TAG, "  Cell UVPR: %f V", (float) jk_get_32bit(14) * 0.001f);
   this->publish_state_(this->cell_voltage_undervoltage_recovery_number_, (float) jk_get_32bit(14) * 0.001f);
 
@@ -816,10 +820,10 @@ void JkBmsBle::decode_jk02_settings_(const std::vector<uint8_t> &data) {
   ESP_LOGI(TAG, "  Balance trigger voltage: %f V", (float) jk_get_32bit(26) * 0.001f);
   this->publish_state_(this->balance_trigger_voltage_number_, (float) jk_get_32bit(26) * 0.001f);
 
-  // 30    4   0x00 0x00 0x00 0x00    Unknown30
-  // 34    4   0x00 0x00 0x00 0x00    Unknown34
-  // 38    4   0x00 0x00 0x00 0x00    Unknown38
-  // 42    4   0x00 0x00 0x00 0x00    Unknown42
+  // 30    4   0x00 0x00 0x00 0x00    ** [JK-PB2A16S-20P v14] SOC-100% VOLTAGE
+  // 34    4   0x00 0x00 0x00 0x00    ** [JK-PB2A16S-20P v14] SOC-0% VOLTAGE
+  // 38    4   0x00 0x00 0x00 0x00    ** [JK-PB2A16S-20P v14] VOLTAGE CELL REQUEST CHARGE VOLTAGE
+  // 42    4   0x00 0x00 0x00 0x00    ** [JK-PB2A16S-20P v14] VOLTAGE CELL REQUEST FLOAT VOLTAGE
   // 46    4   0xF0 0x0A 0x00 0x00    Power off voltage
   ESP_LOGI(TAG, "  Power off voltage: %f V", (float) jk_get_32bit(46) * 0.001f);
   this->publish_state_(this->power_off_voltage_number_, (float) jk_get_32bit(46) * 0.001f);
@@ -830,15 +834,15 @@ void JkBmsBle::decode_jk02_settings_(const std::vector<uint8_t> &data) {
 
   // 54    4   0x1E 0x00 0x00 0x00    Charge OCP delay
   ESP_LOGI(TAG, "  Charge OCP delay: %f s", (float) jk_get_32bit(54));
-  // 58    4   0x3C 0x00 0x00 0x00    Charge OCP recovery delay
+  // 58    4   0x3C 0x00 0x00 0x00    Charge OCP recovery time
   ESP_LOGI(TAG, "  Charge OCP recovery delay: %f s", (float) jk_get_32bit(58));
   // 62    4   0xF0 0x49 0x02 0x00    Max. discharge current
   ESP_LOGI(TAG, "  Max. discharge current: %f A", (float) jk_get_32bit(62) * 0.001f);
   this->publish_state_(this->max_discharge_current_number_, (float) jk_get_32bit(62) * 0.001f);
 
   // 66    4   0x2C 0x01 0x00 0x00    Discharge OCP delay
   ESP_LOGI(TAG, "  Discharge OCP recovery delay: %f s", (float) jk_get_32bit(66));
-  // 70    4   0x3C 0x00 0x00 0x00    Discharge OCP recovery delay
+  // 70    4   0x3C 0x00 0x00 0x00    Discharge OCP recovery time
   ESP_LOGI(TAG, "  Discharge OCP recovery delay: %f s", (float) jk_get_32bit(70));
   // 74    4   0x3C 0x00 0x00 0x00    SCPR time
   ESP_LOGI(TAG, "  SCP recovery time: %f s", (float) jk_get_32bit(74));
@@ -929,13 +933,26 @@ void JkBmsBle::decode_jk02_settings_(const std::vector<uint8_t> &data) {
   // 274   4   0x00 0x00 0x00 0x00
   // 278   4   0x00 0x00 0x00 0x00
   // 282   1   0x00                   New controls bitmask
+  // ** [JK-PB2A16S-20P v14] 
+  //    bit0: HEATING_SWITCH_ENABLED
+  //    bit1: DISABLE_TEMP_SENSOR_SWITCH_ENABLED
+  //    bit2: ?
+  //    bit3: ?
+  //    bit4: DISPLAY_ALWAYS_ON_SWITCH_ENABLED
+  //    bit5: ?
+  //    bit6: SMART_SLEEP_ON_SWITCH_ENABLED
+  //    bit7: DISABLE_PCL_MODULE_SWITCH_ENABLED
   this->publish_state_(this->heating_switch_, check_bit_(data[282], 1));
   ESP_LOGI(TAG, "  heating switch: %s", ((bool) check_bit_(data[282], 1)) ? "on" : "off");
   this->publish_state_(this->disable_temperature_sensors_switch_, check_bit_(data[282], 2));
   this->publish_state_(this->display_always_on_switch_, check_bit_(data[282], 16));
   ESP_LOGI(TAG, "  Port switch: %s", check_bit_(data[282], 8) ? "RS485" : "CAN");
 
-  // 283   3   0x00 0x00 0x00
+  // 283   1   0x00
+  // ** [JK-PB2A16S-20P v14] 
+  //    bit0: TIME_STORED_DATA_SWITCH_ENABLED
+  //    bit1: CHARGING_FLOAT_MODE_SWITCH_ENABLED
+  // 284   2   0X00 0X00
   // 286   4   0x00 0x00 0x00 0x00
   // 290   4   0x00 0x00 0x00 0x00
   // 294   4   0x00 0x00 0x00 0x00

components/jk_rs485/__init__.py

@@ -0,0 +1,75 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ADDRESS, CONF_ID
+
+CODEOWNERS = ["@syssi"]
+AUTO_LOAD = ["binary_sensor", "button", "number", "sensor", "switch", "text_sensor"]
+
+DEPENDENCIES = ["uart"]
+MULTI_CONF = True
+
+CONF_PROTOCOL_VERSION = "protocol_version"
+CONF_JK_RS485_ID = "jk_rs485_id"
+CONF_RX_TIMEOUT = "rx_timeout"
+CONF_ADDRESS = "address"
+
+jk_rs485_ns = cg.esphome_ns.namespace("jk_rs485")
+JkRS485 = jk_rs485_ns.class_("JkRS485", cg.Component, uart.UARTDevice)
+JkRS485Device = jk_rs485_ns.class_("JkRS485Device")
+
+ProtocolVersion = jk_rs485_ns.enum("ProtocolVersion")
+PROTOCOL_VERSION_OPTIONS = {
+    "JK04": ProtocolVersion.PROTOCOL_VERSION_JK04,
+    "JK02_24S": ProtocolVersion.PROTOCOL_VERSION_JK02_24S,
+    "JK02_32S": ProtocolVersion.PROTOCOL_VERSION_JK02_32S,
+}
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(JkRS485),
+            cv.Optional(
+                CONF_RX_TIMEOUT, default="50ms"
+            ): cv.positive_time_period_milliseconds,
+            cv.Required(CONF_PROTOCOL_VERSION): cv.enum(
+                PROTOCOL_VERSION_OPTIONS, upper=True
+            ),           
+            cv.Required(CONF_ADDRESS): cv.All(cv.uint8_t, cv.Range(min=0,max=15)),        
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(uart.UART_DEVICE_SCHEMA)
+)
+
+
+async def to_code(config):
+    cg.add_global(jk_rs485_ns.using)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    await uart.register_uart_device(var, config)
+
+    cg.add(var.set_rx_timeout(config[CONF_RX_TIMEOUT]))
+#    cg.add(var.set.address(config[CONF_ADDRESS]))
+#    cg.add(var.set.protocol_version(config[CONF_PROTOCOL_VERSION]))
+
+
+def jk_rs485_device_schema(default_address):
+    schema = {
+        cv.GenerateID(CONF_JK_RS485_ID): cv.use_id(JkRS485),
+    }
+    if default_address is None:
+        schema[cv.Required(CONF_ADDRESS)] = cv.hex_uint8_t
+    else:
+        schema[cv.Optional(CONF_ADDRESS, default=default_address)] = cv.hex_uint8_t
+    return cv.Schema(schema)
+
+
+async def register_jk_rs485_device(var, config):
+    parent = await cg.get_variable(config[CONF_JK_RS485_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_address(config[CONF_ADDRESS]))
+    cg.add(var.set_protocol_version(config[CONF_PROTOCOL_VERSION]))    
+    cg.add(var.set_rx_timeout(config[CONF_RX_TIMEOUT]))    
+    cg.add(parent.register_device(var))

components/jk_rs485/binary_sensor.py

@@ -0,0 +1,60 @@
+import esphome.codegen as cg
+from esphome.components import binary_sensor
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, DEVICE_CLASS_CONNECTIVITY, ENTITY_CATEGORY_DIAGNOSTIC
+
+from . import CONF_JK_RS485_ID, JkRS485
+from .const import CONF_CHARGING, CONF_DISCHARGING, CONF_HEATING
+
+#DEPENDENCIES = ["jk_bms_modbus"]
+DEPENDENCIES = ["jk_rs485"]
+
+CODEOWNERS = ["@syssi"]
+
+CONF_BALANCING = "balancing"
+CONF_ONLINE_STATUS = "online_status"
+
+ICON_CHARGING = "mdi:battery-charging"
+ICON_DISCHARGING = "mdi:power-plug"
+ICON_BALANCING = "mdi:battery-heart-variant"
+ICON_HEATING = "mdi:radiator"
+
+BINARY_SENSORS = [
+    CONF_CHARGING,
+    CONF_DISCHARGING,
+    CONF_BALANCING,
+    CONF_ONLINE_STATUS,
+    CONF_HEATING,
+]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_JK_RS485_ID): cv.use_id(JkRS485),
+        cv.Optional(CONF_CHARGING): binary_sensor.binary_sensor_schema(
+            icon=ICON_CHARGING
+        ),
+        cv.Optional(CONF_DISCHARGING): binary_sensor.binary_sensor_schema(
+            icon=ICON_DISCHARGING
+        ),
+        cv.Optional(CONF_BALANCING): binary_sensor.binary_sensor_schema(
+            icon=ICON_BALANCING
+        ),
+        cv.Optional(CONF_HEATING): binary_sensor.binary_sensor_schema(
+            icon=ICON_HEATING
+        ),
+        cv.Optional(CONF_ONLINE_STATUS): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_CONNECTIVITY,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    hub = await cg.get_variable(config[CONF_JK_RS485_ID])
+    for key in BINARY_SENSORS:
+        if key in config:
+            conf = config[key]
+            sens = cg.new_Pvariable(conf[CONF_ID])
+            await binary_sensor.register_binary_sensor(sens, conf)
+            cg.add(getattr(hub, f"set_{key}_binary_sensor")(sens))

components/jk_rs485/const.py

@@ -0,0 +1,6 @@
+"""Constants for the jk bms ble component."""
+
+CONF_BALANCER = "balancer"
+CONF_CHARGING = "charging"
+CONF_DISCHARGING = "discharging"
+CONF_HEATING = "heating"