* BLE:

 + uart1 & uart2 protocol numbers
 + device_info settings
* RS485:
 + Network Nodes available (text sensor). Automatically detects nodes in the network.
 + status heating binary sensor bug corrected
 + temperature 5
 + more params
 + developing talk pin for rs485 request or settings (not ready yet)

Author: txubelaxu

.vscode/settings.json

@@ -1,5 +1,62 @@
 {
     "files.associations": {
-        "*.yaml": "home-assistant"
-    }
+        "*.yaml": "home-assistant",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "semaphore": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeinfo": "cpp"
+    },
+    "C_Cpp.errorSquiggles": "enabled"
 }

components/jk_bms_ble/jk_bms_ble.cpp

@@ -591,17 +591,17 @@ void JkBmsBle::decode_jk02_cell_info_(const std::vector<uint8_t> &data) {
   // 138   2   0x00 0x00              Balance current      0.001         A
   this->publish_state_(this->balancing_current_sensor_, (float) ((int16_t) jk_get_16bit(138 + offset)) * 0.001f);
 
-  // 140   1   0x00                   Balancing action                   0x00: Off
-  //                                                                     0x01: Charging balancer
-  //                                                                     0x02: Discharging balancer
-  //this->publish_state_(this->balancing_binary_sensor_, (data[140 + offset] != 0x00));
+  // 140 [166=140+26]  1   0x00                   Balancing action                   0x00: Off
+  //                                                                                 0x01: Charging balancer
+  //                                                                                 0x02: Discharging balancer
+  // this->publish_state_(this->balancing_binary_sensor_, (data[140 + offset] != 0x00));
   this->publish_state_(this->balancing_direction_sensor_, (data[140 + offset]));
-  if (data[140+offset]==1 or data[140+offset]==2){
-    this->publish_state_(this->status_balancing_binary_sensor_, (bool) 1);    
+  if (data[140 + offset] == 1 or data[140 + offset] == 2) {
+    this->publish_state_(this->status_balancing_binary_sensor_, (bool) 1);
   } else {
     this->publish_state_(this->status_balancing_binary_sensor_, (bool) 0);
   }
-  ESP_LOGI(TAG, "BALANCER WORKING STATUS 140:  0x%02X", data[140 + offset]);
+  // ESP_LOGI(TAG, "BALANCER WORKING STATUS 140:  0x%02X", data[140 + offset]);
 
   // 141   1   0x54                   State of charge in   1.0           %
   this->publish_state_(this->state_of_charge_sensor_, (float) data[141 + offset]);
@@ -639,11 +639,11 @@ void JkBmsBle::decode_jk02_cell_info_(const std::vector<uint8_t> &data) {
   // 167   1   0x01                   Discharging mosfet enabled                   0x00: off, 0x01: on
   this->publish_state_(this->status_discharging_binary_sensor_, (bool) data[167 + offset]);
   ESP_LOGI(TAG, "DISCHARGE WORKING STATUS: 0x%02X", data[167 + offset]);
-  // 168   1   0x01                   PRE Discharging                              0x00: off, 0x01: on
+  // 168   1   0x01                   PRE Discharging                              0x00: off, 0x01: on  ????????? --> UserAlarm2
   //this->publish_state_(this->status_precharging_binary_sensor_, (bool) data[168 + offset]);
-  //ESP_LOGI(TAG, "PRECHARGE WORKING STATUS: 0x%02X", data[168 + offset]);
 
-  // 169   1   0x01                   Balancer working                             0x00: off, 0x01: on
+  //ESP_LOGI(TAG, "PRECHARGE WORKING STATUS: 0x%02X", data[168 + offset]);
+  // 169   1   0x01                   Balancer working                             0x00: off, 0x01: on  ????????? --> TimeDcOCPR
   //this->publish_state_(this->status_balancing_binary_sensor_, (bool) data[169 + offset]);
   ESP_LOGI(TAG, "BALANCER WORKING STATUS 169:  0x%02X", data[169 + offset]);
 
@@ -676,18 +676,23 @@ void JkBmsBle::decode_jk02_cell_info_(const std::vector<uint8_t> &data) {
     ESP_LOGI(TAG, "BATTempSensor3Absent:          %d", (bool) check_bit_(data[182], 8));
     ESP_LOGI(TAG, "BATTempSensor4Absent:        %d", (bool) check_bit_(data[182], 16));
     ESP_LOGI(TAG, "BATTempSensor5Absent:          %d", (bool) check_bit_(data[182], 32));*/
+    
+    // 183 [209=183+26]   1   0x01                   Status heating          0x00: off, 0x01: on
+    this->publish_state_(this->status_heating_binary_sensor_, (bool) check_bit_(data[183 + offset], 1));
+    ESP_LOGD(TAG, "HEATING BINARY SENSOR STATUS:  0x%02X", data[183 + offset]);
   }         
 
   // 183   2   0x00 0x01              Unknown183 Heating working???
   //this->publish_state_(this->status_heating_binary_sensor_, (bool) data[183 + offset]);
+
+
   // 185   2   0x00 0x00              Unknown185
   // 187   2   0x00 0xD5              Unknown187
   // 189   2   0x02 0x00              Unknown189
   ESP_LOGD(TAG, "Unknown189: 0x%02X 0x%02X", data[189], data[190]);
   // 190   1   0x00                   Unknown190
   // 191   1   0x00                   Balancer status (working: 0x01, idle: 0x00)
-  this->publish_state_(this->status_heating_binary_sensor_, (bool) data[192 + offset]);
-  ESP_LOGI(TAG, "HEATING BINARY SENSOR STATUS:  0x%02X", data[192 + offset]);
+
 
   // 193   2   0x00 0xAE              Unknown193
   ESP_LOGD(TAG, "Unknown193: 0x%02X 0x%02X (0x00 0x8D)", data[193 + offset], data[194 + offset]);
@@ -1312,14 +1317,26 @@ void JkBmsBle::decode_device_info_(const std::vector<uint8_t> &data) {
   ESP_LOGI(TAG, "  User data: %s", std::string(data.begin() + 102, data.begin() + 102 + 16).c_str());
   ESP_LOGI(TAG, "  Setup passcode: %s", std::string(data.begin() + 118, data.begin() + 118 + 16).c_str());
 
+  ESP_LOGI(TAG, "  UART1 Protocol Number:     0x%02X", ((uint8_t) data[178]));
+  ESP_LOGI(TAG, "  CAN   Protocol Number:     0x%02X", ((uint8_t) data[179]));  
+  ESP_LOGI(TAG, "  UART2 Protocol Number:     0x%02X", ((uint8_t) data[212]));
+  ESP_LOGI(TAG, "  UART2 Protocol Enabled[0]: 0x%02X", ((uint8_t) data[213]));
+
   ESP_LOGI(TAG, "  RCV Time: %f h", (float) ((uint8_t) data[266]) * 0.1f);
   ESP_LOGI(TAG, "  RFV Time: %f h", (float) ((uint8_t) data[267]) * 0.1f);
+  ESP_LOGI(TAG, "  CAN Protocol Library Version: %f", (float) ((uint8_t) data[268]));
+  ESP_LOGI(TAG, "  RVD: %f", (float) ((uint8_t) data[269]));
+  ESP_LOGI(TAG, "  ---------------------------------------");
 
   this->publish_state_(this->info_vendorid_text_sensor_, std::string(data.begin() + 6, data.begin() + 6 + 16).c_str());
   this->publish_state_(this->info_hardware_version_text_sensor_, std::string(data.begin() + 22, data.begin() + 22 + 8).c_str());
   this->publish_state_(this->info_software_version_text_sensor_, std::string(data.begin() + 30, data.begin() + 30 + 8).c_str());
   this->publish_state_(this->info_device_name_text_sensor_, std::string(data.begin() + 46, data.begin() + 46 + 16).c_str());
   this->publish_state_(this->info_device_password_text_sensor_, std::string(data.begin() + 62, data.begin() + 62 + 16).c_str());
+
+  this->publish_state_(this->uart1_protocol_number_number_, (uint8_t) data[178]);
+  this->publish_state_(this->uart2_protocol_number_number_, (uint8_t) data[212]);
+
   this->publish_state_(this->cell_request_charge_voltage_time_number_, (float) data[266]*0.1f);
   this->publish_state_(this->cell_request_float_voltage_time_number_, (float) data[267]*0.1f);
 

components/jk_bms_ble/jk_bms_ble.h

@@ -36,6 +36,14 @@ class JkBmsBle : public esphome::ble_client::BLEClientNode, public PollingCompon
   void set_smart_sleep_time_number(number::Number *smart_sleep_time_number) {
     smart_sleep_time_number_ = smart_sleep_time_number;
   }
+
+  void set_uart1_protocol_number_number(number::Number *uart1_protocol_number_number) {
+    uart1_protocol_number_number_ = uart1_protocol_number_number;
+  }
+  void set_uart2_protocol_number_number(number::Number *uart2_protocol_number_number) {
+    uart2_protocol_number_number_ = uart2_protocol_number_number;
+  }
+    
   void set_cell_smart_sleep_voltage_number(number::Number *cell_smart_sleep_voltage_number) {
     cell_smart_sleep_voltage_number_ = cell_smart_sleep_voltage_number;
   }
@@ -411,6 +419,8 @@ void set_alarm_battempsensor5absent_binary_sensor(binary_sensor::BinarySensor *a
   number::Number *max_charge_current_number_;
   number::Number *max_discharge_current_number_;
   number::Number *smart_sleep_time_number_;
+  number::Number *uart1_protocol_number_number_;
+  number::Number *uart2_protocol_number_number_;
 
   sensor::Sensor *balancing_direction_sensor_;
   sensor::Sensor *cell_voltage_min_sensor_;

components/jk_bms_ble/number/__init__.py

@@ -65,6 +65,8 @@
 CONF_CELL_REQUEST_FLOAT_VOLTAGE= "cell_request_float_voltage"
 CONF_CELL_REQUEST_CHARGE_VOLTAGE_TIME= "cell_request_charge_voltage_time"
 CONF_CELL_REQUEST_FLOAT_VOLTAGE_TIME= "cell_request_float_voltage_time"
+CONF_UART1_PROTOCOL_NUMBER = "uart1_protocol_number"
+CONF_UART2_PROTOCOL_NUMBER = "uart2_protocol_number"
 
 CONF_CELL_COUNT = "cell_count"
 CONF_TOTAL_BATTERY_CAPACITY = "total_battery_capacity"
@@ -162,7 +164,8 @@
     CONF_SMART_SLEEP_TIME : [0x00, 0x00, 0x00, 1.0],                 # What register number for address 0x0118?
     CONF_CELL_REQUEST_CHARGE_VOLTAGE_TIME: [0x00, 0x00, 0x00, 1.0],  # What register number for address 0x0104?  (0x1400 TYPE REGISTER)
     CONF_CELL_REQUEST_FLOAT_VOLTAGE_TIME: [0x00, 0x0a, 0x00, 1.0],   # What register number for address 0x0105?  (0x1400 TYPE REGISTER)
-
+    CONF_UART1_PROTOCOL_NUMBER: [0x00, 0x0a, 0x00, 1.0],             # What register number for address ???????  (0x1400 TYPE REGISTER)
+    CONF_UART2_PROTOCOL_NUMBER: [0x00, 0x0a, 0x00, 1.0],             # What register number for address ???????  (0x1400 TYPE REGISTER)    
 }
 
 JkNumber = jk_bms_ble_ns.class_("JkNumber", number.Number, cg.Component)
@@ -364,12 +367,33 @@
                 cv.Optional(CONF_MIN_VALUE, default=0.0): cv.int_,
                 cv.Optional(CONF_MAX_VALUE, default=255.0): cv.int_,
                 cv.Optional(CONF_STEP, default=1.0): cv.int_,
-                cv.Optional(CONF_ICON, default=ICON_CLOCK): cv.icon,
                 cv.Optional(
                     CONF_UNIT_OF_MEASUREMENT, default=UNIT_HOURS
                 ): cv.string_strict,
             }
-        ),                 
+        ),  
+        cv.Optional(CONF_UART1_PROTOCOL_NUMBER): JK_NUMBER_SCHEMA.extend(
+            {
+                cv.Optional(CONF_MIN_VALUE, default=0.0): cv.int_,
+                cv.Optional(CONF_MAX_VALUE, default=255.0): cv.int_,
+                cv.Optional(CONF_STEP, default=1.0): cv.int_,
+                cv.Optional(CONF_ICON, default=ICON_CLOCK): cv.icon,
+                cv.Optional(
+                    CONF_UNIT_OF_MEASUREMENT, default=UNIT_EMPTY
+                ): cv.string_strict,
+            }
+        ),
+        cv.Optional(CONF_UART2_PROTOCOL_NUMBER): JK_NUMBER_SCHEMA.extend(
+            {
+                cv.Optional(CONF_MIN_VALUE, default=0.0): cv.int_,
+                cv.Optional(CONF_MAX_VALUE, default=255.0): cv.int_,
+                cv.Optional(CONF_STEP, default=1.0): cv.int_,
+                cv.Optional(CONF_ICON, default=ICON_CLOCK): cv.icon,
+                cv.Optional(
+                    CONF_UNIT_OF_MEASUREMENT, default=UNIT_EMPTY
+                ): cv.string_strict,
+            }
+        ),                                 
     }
 )