bthome.py - more binary properties added

Author: DavesCodeMusings

datatypes.csv

@@ -14,6 +14,8 @@ Object id,Property,Data type,Factor,Example,Result,Unit
 0x0D,pm2.5,uint16 (2 bytes),1,0D120C,3090,ug/m3
 0x0E,pm10,uint16 (2 bytes),1,0E021C,7170,ug/m3
 0x0F,generic boolean,uint8 (1 byte),0F01,"0 (False = Off) 1 (True = On)"
+0x10,power,uint8 (1 byte),1001,"0 (False = Off) 1 (True = On)"
+0x11,opening,uint8 (1 byte),1100,"0 (False = Closed) 1 (True = Open)"
 0x12,co2,uint16 (2 bytes),1,12E204,1250,ppm
 0x13,tvoc,uint16 (2 bytes),1,133301,307,ug/m3
 0x14,moisture,uint16 (2 bytes),0.01,14020C,30.74,%
@@ -31,11 +33,9 @@ Object id,Property,Data type,Factor,Example,Result,Unit
 0x20,moisture,uint8 (1 byte),2001,"0 (False = Dry) 1 (True = Wet)"
 0x21,motion,uint8 (1 byte),2100,"0 (False = Clear) 1 (True = Detected)"
 0x22,moving,uint8 (1 byte),2201,"0 (False = Not moving) 1 (True = Moving)"
-
 0x23,occupancy,uint8 (1 byte),2301,"0 (False = Clear) 1 (True = Detected)"
-0x11,opening,uint8 (1 byte),1100,"0 (False = Closed) 1 (True = Open)"
 0x24,plug,uint8 (1 byte),2400,"0 (False = Unplugged) 1 (True = Plugged in)"
-0x10,power,uint8 (1 byte),1001,"0 (False = Off) 1 (True = On)"
+
 0x25,presence,uint8 (1 byte),2500,"0 (False = Away) 1 (True = Home)"
 0x26,problem,uint8 (1 byte),2601,"0 (False = OK) 1 (True = Problem)"
 0x27,running,uint8 (1 byte),2701,"0 (False = Not Running) 1 (True = Running)"

src/bthome.py

@@ -52,6 +52,8 @@ class BTHome:
     PM2_5_UINT16_X1 = const(0x0D)  # ug/m^3
     PM10_UINT16_X1 = const(0x0E)  # ug/m^3
     GENERIC_BOOLEAN = const(0x0F)  # 0 (False = Off) 1 (True = On)
+    POWER_BINARY = const(0x10)  # 0 (False = Off) 1 (True = On)
+    OPENING_BINARY = const(0x11)  # 0 (False = Closed) 1 (True = Open)
     CO2_UINT16_X1 = const(0x12)  # ppm
     TVOC_UINT16_X1 = const(0x13)  # ug/m^3
     MOISTURE_UINT16_X100 = const(0x14)  # %
@@ -69,6 +71,8 @@ class BTHome:
     MOISTURE_BINARY = const(0x20)  # 0 (False = Dry) 1 (True = Wet)
     MOTION_BINARY = const(0x21)  # 0 (False = Clear) 1 (True = Detected)
     MOVING_BINARY = const(0x22)  # 0 (False = Not moving) 1 (True = Moving)
+    OCCUPANCY_BINARY = const(0x23)  # 0 (False = Clear) 1 (True = Detected)
+    PLUG_BINARY = const(0x24)  # 0 (False = Unplugged) 1 (True = Plugged in)
     HUMIDITY_UINT8_X1 = const(0x2E)  # %
     MOISTURE_UINT8_X1 = const(0x2F)  # %
     COUNT_UINT16_X1 = const(0x3D)
@@ -127,6 +131,8 @@ class BTHome:
         PM2_5_UINT16_X1: "pm2.5",  # 0x0D
         PM10_UINT16_X1: "pm10",  # 0x0E
         GENERIC_BOOLEAN: "generic_boolean",  # 0x0F
+        POWER_BINARY: "power_on",  # 0x10
+        OPENING_BINARY: "opening",  # 0x11
         CO2_UINT16_X1: "co2",  # 0x12
         TVOC_UINT16_X1: "tvoc",  # 0x13
         MOISTURE_UINT16_X100: "moisture",  # 0x14
@@ -144,6 +150,8 @@ class BTHome:
         MOISTURE_BINARY: "moisture_detected",  # 0x20
         MOTION_BINARY: "motion",  # 0x21
         MOVING_BINARY: "moving",  # 0x22
+        OCCUPANCY_BINARY: "occupancy",  # 0x23
+        PLUG_BINARY: "plug",  # 0x24
         HUMIDITY_UINT8_X1: "humidity",  # 0x2E
         MOISTURE_UINT8_X1: "moisture",  # 0x2F
         COUNT_UINT16_X1: "count",  # 0x3D
@@ -225,9 +233,12 @@ class BTHome:
     moisture_detected = False
     motion = False
     moving = False
+    opening = False
+    plug = False
     pm10 = 0
     pm2_5 = 0
     power = 0
+    power_on = False
     precipitation = 0
     pressure = 0
     raw = bytes()
@@ -334,6 +345,8 @@ def _pack_raw_text(self, object_id, value):
         PM2_5_UINT16_X1: _pack_int16_x1,  # 0x0D
         PM10_UINT16_X1: _pack_int16_x1,  # 0x0E
         GENERIC_BOOLEAN: _pack_binary,  # 0x0F
+        POWER_BINARY: _pack_binary,  # 0x10
+        OPENING_BINARY: _pack_binary,  # 0x11
         CO2_UINT16_X1: _pack_int16_x1,  # 0x12
         TVOC_UINT16_X1: _pack_int16_x1,
         MOISTURE_UINT16_X100: _pack_int16_x100,
@@ -351,6 +364,8 @@ def _pack_raw_text(self, object_id, value):
         MOISTURE_BINARY: _pack_binary,
         MOTION_BINARY: _pack_binary,
         MOVING_BINARY: _pack_binary,
+        OCCUPANCY_BINARY: _pack_binary,
+        PLUG_BINARY: _pack_binary,
         HUMIDITY_UINT8_X1: _pack_int8_x1,
         MOISTURE_UINT8_X1: _pack_int8_x1,
         COUNT_UINT16_X1: _pack_int16_x1,