diff --git a/packages/bms/bms_errors_bitmask_JK-PB_RS485.yaml b/packages/bms/bms_errors_bitmask_JK-PB_RS485.yaml index 1bf9675..e5cda09 100644 --- a/packages/bms/bms_errors_bitmask_JK-PB_RS485.yaml +++ b/packages/bms/bms_errors_bitmask_JK-PB_RS485.yaml @@ -1,5 +1,5 @@ -# Updated : 2025.01.17 -# Version : 1.1.1 +# Updated : 2025.01.22 +# Version : 1.1.2 # GitHub : https://github.com/syssi/esphome-jk-bms # YamBMS ( Yet another multi-BMS Merging Solution ) @@ -31,20 +31,20 @@ # Bit 7 Charge SCP 0000 0000 1000 0000 0x0080 # Bit 8 Charge OTP 0000 0001 0000 0000 0x0100 # Bit 9 Charge UTP 0000 0010 0000 0000 0x0200 - # Bit 10 CPU Aux comm error 0000 0100 0000 0000 0x0400 + # Bit 10 CPU aux comm error 0000 0100 0000 0000 0x0400 # Bit 11 Cell UVP 0000 1000 0000 0000 0x0800 # Bit 12 Batt UVP 0001 0000 0000 0000 0x1000 # Bit 13 Discharge OCP 0010 0000 0000 0000 0x2000 # Bit 14 Discharge SCP 0100 0000 0000 0000 0x4000 - # Bit 15 Charge MOS 1000 0000 0000 0000 0x8000 - # Bit 16 Discharge MOS 0001 0000 0000 0000 0000 0x10000 - # Bit 17 GPS Disconneted 0010 0000 0000 0000 0000 0x20000 - # Bit 18 Modify PWD. in time 0100 0000 0000 0000 0000 0x40000 - # Bit 19 Discharge On Failed 1000 0000 0000 0000 0000 0x80000 - # Bit 20 Battery Over Temp Alarm 0001 0000 0000 0000 0000 0000 0x100000 - # Bit 21 Temperature sensor anomaly 0010 0000 0000 0000 0000 0000 0x200000 - # Bit 22 PLCModule anomaly 0100 0000 0000 0000 0000 0000 0x400000 - # Bit 23 Reserved 1000 0000 0000 0000 0000 0000 0x800000 + # Bit 15 Discharge OTP 1000 0000 0000 0000 0x8000 + # Bit 16 Charge MOS 0001 0000 0000 0000 0000 0x10000 + # Bit 17 Discharge MOS 0010 0000 0000 0000 0000 0x20000 + # Bit 18 GPS disconneted 0100 0000 0000 0000 0000 0x40000 + # Bit 19 Modify PWD. in time 1000 0000 0000 0000 0000 0x80000 + # Bit 20 Discharge On Failed 0001 0000 0000 0000 0000 0000 0x100000 + # Bit 21 Battery Over Temp Alarm 0010 0000 0000 0000 0000 0000 0x200000 + # Bit 22 Temperature sensor anomaly 0100 0000 0000 0000 0000 0000 0x400000 + # Bit 23 PLCModule anomaly 1000 0000 0000 0000 0000 0000 0x800000 # +--------------------------------------+ # | YamBMS Errors Bitmask (16bit) | @@ -82,21 +82,21 @@ sensor: uint16_t bms_errors_bitmask = id(bms${bms_id}_errors_bitmask).state; uint16_t yambms_errors_bitmask = 0; - if (bms_errors_bitmask & 0x0001) yambms_errors_bitmask |= 0x0800; - if (bms_errors_bitmask & 0x0002) yambms_errors_bitmask |= 0x0008; - if (bms_errors_bitmask & 0x0004) yambms_errors_bitmask |= 0x0800; - if (bms_errors_bitmask & 0x0008) yambms_errors_bitmask |= 0x0800; - if (bms_errors_bitmask & 0x0010) yambms_errors_bitmask |= 0x0002; - if (bms_errors_bitmask & 0x0020) yambms_errors_bitmask |= 0x0002; - if (bms_errors_bitmask & 0x0040) yambms_errors_bitmask |= 0x0100; - if (bms_errors_bitmask & 0x0080) yambms_errors_bitmask |= 0x0400; - if (bms_errors_bitmask & 0x0100) yambms_errors_bitmask |= 0x0020; - if (bms_errors_bitmask & 0x0200) yambms_errors_bitmask |= 0x0010; - if (bms_errors_bitmask & 0x0400) yambms_errors_bitmask |= 0x0800; - if (bms_errors_bitmask & 0x0800) yambms_errors_bitmask |= 0x0004; - if (bms_errors_bitmask & 0x1000) yambms_errors_bitmask |= 0x0004; - if (bms_errors_bitmask & 0x2000) yambms_errors_bitmask |= 0x0080; - if (bms_errors_bitmask & 0x4000) yambms_errors_bitmask |= 0x0400; - if (bms_errors_bitmask & 0x8000) yambms_errors_bitmask |= 0x0800; +# if (bms_errors_bitmask & 0x0001) yambms_errors_bitmask |= 0x0800; +# if (bms_errors_bitmask & 0x0002) yambms_errors_bitmask |= 0x0008; +# if (bms_errors_bitmask & 0x0004) yambms_errors_bitmask |= 0x0800; +# if (bms_errors_bitmask & 0x0008) yambms_errors_bitmask |= 0x0800; +# if (bms_errors_bitmask & 0x0010) yambms_errors_bitmask |= 0x0002; +# if (bms_errors_bitmask & 0x0020) yambms_errors_bitmask |= 0x0002; +# if (bms_errors_bitmask & 0x0040) yambms_errors_bitmask |= 0x0100; +# if (bms_errors_bitmask & 0x0080) yambms_errors_bitmask |= 0x0400; +# if (bms_errors_bitmask & 0x0100) yambms_errors_bitmask |= 0x0020; +# if (bms_errors_bitmask & 0x0200) yambms_errors_bitmask |= 0x0010; +# if (bms_errors_bitmask & 0x0400) yambms_errors_bitmask |= 0x0800; +# if (bms_errors_bitmask & 0x0800) yambms_errors_bitmask |= 0x0004; +# if (bms_errors_bitmask & 0x1000) yambms_errors_bitmask |= 0x0004; +# if (bms_errors_bitmask & 0x2000) yambms_errors_bitmask |= 0x0080; +# if (bms_errors_bitmask & 0x4000) yambms_errors_bitmask |= 0x0400; +# if (bms_errors_bitmask & 0x8000) yambms_errors_bitmask |= 0x0800; return yambms_errors_bitmask;