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

scripts/20240225_122638.log

@@ -0,0 +1,95 @@
+0f10162000010200009a91
+55aaeb900200130d120d120d110d110d110d110d110d110d110d110d110d110d110d110d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000110d02000005530050004f004a004d004b004d004d0053004e004d004a004c004d00520051000000000000000000000000000000000000000000000000000000000000000000dd000000000017d100000000000000000000c400cb000000000000000062fd8d040080a3040000000000601d0000640000008505490001010000000000000000000000000000ff00010000009a030000000060543f4000000000e81400000001010100060000554d960100000000dd00c500cc009a031ba228007f0000008051010000000000000000000000000000feff7fdd2f0101b00700000016001016200001059a
+55aaeb900100ac0d0000280a00005a0a0000240e0000780d000005000000790d0000500a00007a0d0000160d0000c409000050c30000030000003c000000102700002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000060e3160010023c3218feffffffbfe9010200000000f50010161e00016456
+011016200001020000d6f1
+021016200001020000c201
+031016200001020000cf91
+041016200001020000e9a1
+051016200001020000e431
+061016200001020000f0c1
+071016200001020000fd51
+55aaeb900205150d120d120d120d110d120d120d120d120d120d120d120d120d120d120d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000120d030000094d004b004d004b004d004a004c0049004c004b004e004c0050004e0050004e000000000000000000000000000000000000000000000000000000000000000000ce000000000022d100000000000000000000bd00c5000000000000000062fd8d040080a30400000000008c1500006400000086812b0001010000000000000000000000000000ff00010000009303000000000bc23f4000000000e914000000010101000600002d44960100000000ce00bd00bf008d032ba12800340000008051010000000000000000000000000000feff7fdd2f0101b007000000fc
+071016200001042d
+0710161e0001020000f98f
+55aaeb900105ac0d0000280a00005a0a00001a0e0000780d000005000000790d0000500a00007a0d0000160d0000c4090000a8610000030000003c000000400d03002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070000000500000060e3160010023c3218feffffffbfe901020000000006
+0710161e000165e1
+081016200001020000bca1
+091016200001020000b131
+0a1016200001020000a5c1
+0b1016200001020000a851
+0c10162000010200008e61
+0d101620000102000083f1
+0e10162000010200009701
+0f10162000010200009a91
+55aaeb900200130d120d120d120d120d110d110d110d110d110d110d110d110d110d110d100d0000000000000000000000000000000000000000000000000000000000000000ffff0000110d04000003530050004f004a004d004b004d004d0053004e004d004a004c004d00520051000000000000000000000000000000000000000000000000000000000000000000dd000000000015d100000000000000000000c400cb000000000000000062fc8d040080a3040000000000601d0000640000008c05490001010000000000000000000000000000ff00010000009a030000000060543f4000000000e814000000010101000600009d4d960100000000dd00c500cc009a0322a228007f0000008051010000000000000000000000000000feff7fdd2f0101b0070000006a001016200001059a
+55aaeb900100ac0d0000280a00005a0a0000240e0000780d000005000000790d0000500a00007a0d0000160d0000c409000050c30000030000003c000000102700002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000060e3160010023c3218feffffffbfe9010200000000f50010161e00016456
+011016200001020000d6f1
+021016200001020000c201
+031016200001020000cf91
+041016200001020000e9a1
+051016200001020000e431
+061016200001020000f0c1
+071016200001020000fd51
+55aaeb900205150d120d120d120d120d120d120d120d120d120d120d120d120d110d120d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000120d0400000d4d004b004d004b004d004a004c0049004c004b004e004c0050004e0050004e000000000000000000000000000000000000000000000000000000000000000000ce000000000023d100000000000000000000bd00c5000000000000000062fd8d040080a30400000000008c150000640000008e812b0001010000000000000000000000000000ff00010000009303000000000bc23f4000000000e914000000010101000600007544960100000000ce00bd00bf008d0333a12800340000008051010000000000000000000000000000feff7fdd2f0101b0070000005a
+071016200001042d
+0710161e0001020000f98f
+55aaeb900105ac0d0000280a00005a0a00001a0e0000780d000005000000790d0000500a00007a0d0000160d0000c4090000a8610000030000003c000000400d03002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070000000500000060e3160010023c3218feffffffbfe901020000000006
+0710161e000165e1
+081016200001020000bca1
+091016200001020000b131
+0a1016200001020000a5c1
+0b1016200001020000a851
+0c10162000010200008e61
+0d101620000102000083f1
+0e10162000010200009701
+0f10162000010200009a91
+55aaeb900200150d120d120d120d110d120d110d110d110d110d120d110d110d110d110d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000110d0500000b530050004f004a004d004b004d004d0053004e004d004a004c004d00520051000000000000000000000000000000000000000000000000000000000000000000dd000000000016d100000000000000000000c400cb000000000000000062fc8d040080a3040000000000601d0000640000009305490001010000000000000000000000000000ff00010000009a030000000060543f4000000000e81400000001010100060000e54d960100000000dd00c500cc009a0329a228007f0000008051010000000000000000000000000000feff7fdd2f0101b007000000ce001016200001059a
+55aaeb900100ac0d0000280a00005a0a0000240e0000780d000005000000790d0000500a00007a0d0000160d0000c409000050c30000030000003c000000102700002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000060e3160010023c3218feffffffbfe9010200000000f50010161e00016456
+011016200001020000d6f1
+021016200001020000c201
+031016200001020000cf91
+041016200001020000e9a1
+051016200001020000e431
+061016200001020000f0c1
+071016200001020000fd51
+55aaeb900205140d120d120d120d120d120d120d120d120d120d110d120d120d110d120d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000120d040000044d004b004d004b004d004a004c0049004c004b004e004c0050004e0050004e000000000000000000000000000000000000000000000000000000000000000000ce000000000024d100000000000000000000bd00c6000000000000000062fd8d040080a30400000000008c1500006400000095812b0001010000000000000000000000000000ff00010000009303000000000bc23f4000000000ea1400000001010100060000bd44960100000000ce00bd00bf008d033aa12800340000008051010000000000000000000000000000feff7fdd2f0101b007000000a8
+071016200001042d
+0710161e0001020000f98f
+55aaeb900105ac0d0000280a00005a0a00001a0e0000780d000005000000790d0000500a00007a0d0000160d0000c4090000a8610000030000003c000000400d03002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070000000500000060e3160010023c3218feffffffbfe901020000000006
+0710161e000165e1
+081016200001020000bca1
+091016200001020000b131
+0a1016200001020000a5c1
+0b1016200001020000a851
+0c10162000010200008e61
+0d101620000102000083f1
+0e10162000010200009701
+0f10162000010200009a91
+55aaeb900200130d120d120d110d120d110d110d110d110d110d110d110d110d110d110d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000110d0300000f530050004f004a004d004b004d004d0053004e004d004a004c004d00520051000000000000000000000000000000000000000000000000000000000000000000dd000000000016d100000000000000000000c400cb000000000000000062fc8d040080a3040000000000601d0000640000009a05490001010000000000000000000000000000ff00010000009a030000000060543f4000000000e814000000010101000600002d4e960100000000dd00c500cc009a0330a228007f0000008051010000000000000000000000000000feff7fdd2f0101b00700000023001016200001059a
+55aaeb900100ac0d0000280a00005a0a0000240e0000780d000005000000790d0000500a00007a0d0000160d0000c409000050c30000030000003c000000102700002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000060e3160010023c3218feffffffbfe9010200000000f50010161e00016456
+011016200001020000d6f1
+021016200001020000c201
+031016200001020000cf91
+041016200001020000e9a1
+051016200001020000e431
+061016200001020000f0c1
+071016200001020000fd51
+55aaeb900205150d120d110d120d120d120d120d110d120d120d120d120d120d120d120d110d0000000000000000000000000000000000000000000000000000000000000000ffff0000120d0400000e4d004b004d004b004d004a004c0049004c004b004e004c0050004e0050004e000000000000000000000000000000000000000000000000000000000000000000ce000000000022d100000000000000000000bd00c5000000000000000062fd8d040080a30400000000008c150000640000009c812b0001010000000000000000000000000000ff00010000009303000000000bc23f4000000000e914000000010101000600000545960100000000ce00bd00bf008d0341a12800340000008051010000000000000000000000000000feff7fdd2f0101b00700000006
+071016200001042d
+0710161e0001020000f98f
+55aaeb900105ac0d0000280a00005a0a00001a0e0000780d000005000000790d0000500a00007a0d0000160d0000c4090000a8610000030000003c000000400d03002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070000000500000060e3160010023c3218feffffffbfe901020000000006
+0710161e000165e1
+081016200001020000bca1
+091016200001020000b131
+0a1016200001020000a5c1
+0b1016200001020000a851
+0c10162000010200008e61
+0d101620000102000083f1
+0e10162000010200009701
+0f10162000010200009a91
+55aaeb900200130d120d120d110d120d110d110d110d110d110d110d110d110d120d110d100d0000000000000000000000000000000000000000000000000000000000000000ffff0000110d04000004530050004f004a004d004b004d004d0053004e004d004a004c004d00520051000000000000000000000000000000000000000000000000000000000000000000dd000000000016d100000000000000000000c400cb000000000000000062fc8d040080a3040000000000601d000064000000a205490001010000000000000000000000000000ff00010000009a030000000060543f4000000000e81400000001010100060000754e960100000000dd00c500cc009a0338a228007f0000008051010000000000000000000000000000feff7fdd2f0101b00700000071001016200001059a
+55aaeb900100ac0d0000280a00005a0a0000240e0000780d000005000000790d0000500a00007a0d0000160d0000c409000050c30000030000003c000000102700002c0100003c00000005000000d0070000bc02000058020000bc0200005802000038ffffff9cffffffe8030000200300001000000001000000010000000100000080a30400dc0500007a0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000060e3160010023c3218feffffffbfe9010200000000f50010161e00016456
+011016200001020000d6f1
+021016200001020000c201
+031016200001020000cf91
+041016200001020000e9a1