Merge pull request #50 from AK5nowman/main_battery

Initial Support for Sensor Battery Alarms
raetha · Nov 28, 2020 · 584288c · 584288c
2 parents 0f710f1 + 723d7fa
commit 584288c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/wyzesense2mqtt/wyzesense.py b/wyzesense2mqtt/wyzesense.py
@@ -234,8 +234,10 @@ def __init__(self, mac, timestamp, event_type, event_data):
 
     def __str__(self):
         s = "[%s][%s]" % (self.Timestamp.strftime("%Y-%m-%d %H:%M:%S"), self.MAC)
-        if self.Type == 'state':
-            s += "StateEvent: sensor_type=%s, state=%s, battery=%d, signal=%d" % self.Data
+        if self.Type == 'alarm':
+            s += "AlarmEvent: sensor_type=%s, state=%s, battery=%d, signal=%d" % self.Data
+        elif self.Type == 'status':
+            s += "StatusEvent: sensor_type=%s, state=%s, battery=%d, signal=%d" % self.Data
         else:
             s += "RawEvent: type=%s, data=%s" % (self.Type, bytes_to_hex(self.Data))
         return s
@@ -258,7 +260,7 @@ def _OnSensorAlarm(self, pkt):
         timestamp = datetime.datetime.fromtimestamp(timestamp / 1000.0)
         sensor_mac = sensor_mac.decode('ascii')
         alarm_data = pkt.Payload[17:]
-        if event_type == 0xA2:
+        if event_type == 0xA2 or event_type == 0xA1:
             if alarm_data[0] == 0x01:
                 sensor_type = "switch"
                 sensor_state = "open" if alarm_data[5] == 1 else "close"
@@ -271,7 +273,7 @@ def _OnSensorAlarm(self, pkt):
             else:
                 sensor_type = "unknown"
                 sensor_state = "unknown"
-            e = SensorEvent(sensor_mac, timestamp, "state", (sensor_type, sensor_state, alarm_data[2], alarm_data[8]))
+            e = SensorEvent(sensor_mac, timestamp, ("alarm" if event_type == 0xA2 else "status"), (sensor_type, sensor_state, alarm_data[2], alarm_data[8]))
         elif event_type == 0xE8:
             if alarm_data[0] == 0x03:
                 # alarm_data[7] might be humidity in some form, but as an integer

diff --git a/wyzesense2mqtt/wyzesense2mqtt.py b/wyzesense2mqtt/wyzesense2mqtt.py
@@ -433,7 +433,7 @@ def on_event(WYZESENSE_DONGLE, event):
     STATES_ON = ['active', 'open', 'wet']
 
     if (valid_sensor_mac(event.MAC)):
-        if (event.Type == "state"):
+        if (event.Type == "alarm") or (event.Type == "status"):
             LOGGER.info(f"State event data: {event}")
             (sensor_type, sensor_state, sensor_battery, sensor_signal) = event.Data
 
@@ -445,6 +445,7 @@ def on_event(WYZESENSE_DONGLE, event):
 
             # Build event payload
             event_payload = {
+                'event' : event.Type,
                 'available': True,
                 'mac': event.MAC,
                 'device_class': DEVICE_CLASSES.get(sensor_type),