Merge pull request #86 from raetha/devel

Various updates for v3.1

Author: raetha

readme.md

@@ -226,21 +226,21 @@ Once run it will present a menu of its functions:
 Home Assistant simply needs to be configured with the MQTT broker that the gateway publishes topics to. Once configured, the MQTT integration will automatically add devices for each sensor along with entites for the state, battery_level, and signal_strength. By default these entities will have a device_class of "opening" for contact sensors, "motion" for motion sensors, and "moisture" for leak sensors. They will be named for the sensor type and MAC, e.g. Wyze Sense Contact Sensor AABBCCDD. To adjust the device_class to "door" or "window", and set a custom name, update the sensors.yaml configuration file and replace the defaults, then restart WyzeSense2MQTT. For a comprehensive list of device classes that Home Assistant recognizes, see the [binary_sensor documentation](https://www.home-assistant.io/integrations/binary_sensor/).
 
 ## Compatible Hardware
-### Bridge Devices
+### Wyze Branded
 * Wyze Sense Bridge (WHSB1)
-* Neos Smart Bridge (N-LSP-US1) - Untested, but theoretically compatible
-
-### Sensors
 * Wyze Sense Bridge Sensors
     * Contact Sensor v1
     * Motion Sensor v1
-* Neos Smart Sensors - Untested, but theoretically compatible
-    * Contact Sensor
-    * Leak Sensor
-    * Motion Sensor
-* Wyze Sense Hub Sensors - Requires installing the Wyze Sense Hub firmware onto a Wyze Sense Bridge (unsupported and untested)
+* Wyze Sense Hub Sensors - Requires installing the Wyze Sense Hub firmware onto a Wyze Sense Bridge (unsupported)
     * Entry Sensor v2 (WSES2)
     * Motion Sensor v2 (WSMS2)
-    * Climate Sensor (WSCS1) - Coming Soon Hopefully
-    * Keypad (WSKP1) - Coming Soon Hopefully
-    * Leak Sensor (WSLS1) - Coming Soon Hopefully
+    * Climate Sensor (WSCS1)
+    * Leak Sensor (WSLS1)
+    * Keypad (WSKP1) - Future Possibility (need help)
+
+### Neos Smart Branded
+* Neos Smart Bridge (N-LSP-US1)
+* Neos Smart Sensors - Not tested, but theoretically compatible
+    * Contact Sensor
+    * Motion Sensor
+    * Leak Sensor

wyzesense2mqtt/bridge_tool_cli.py

@@ -26,19 +26,12 @@
 import logging
 import binascii
 import wyzesense
-
+from datetime import datetime
 
 def on_event(ws, e):
-    s = f"[{e.Timestamp.strftime('%Y-%m-%d %H:%M:%S')}][{e.MAC}]"
-    if e.Type == 'state':
-        (s_type, s_state, s_battery, s_signal) = e.Data
-        s += f"StateEvent: sensor_type={s_type}, state={s_state}, " \
-             f"battery={s_battery}, signal={s_signal}"
-    else:
-        s += f"RawEvent: type={e.Type}, data={e.Data}"
+    s = f"[{datetime.fromtimestamp(e.timestamp).strftime('%Y-%m-%d %H:%M:%S')}][{e.mac}]: {e}"
     print(s)
 
-
 def main(args):
     if args['--debug']:
         loglevel = logging.DEBUG - (1 if args['--verbose'] else 0)
@@ -109,13 +102,34 @@ def Fix(unused_args):
         print("Bad sensors removed")
         logging.debug("Bad sensors removed")
 
+    def Chime(args):
+        if len(args) < 4:
+            print("Need 4 parameters")
+            return
+
+        mac, ring, repeat, volume = args
+        ws.PlayChime(mac, int(ring), int(repeat), int(volume))
+
+    def Raw(args):
+        if len(args) <= 0:
+            print("Missing argument!")
+            return
+
+        data = args[0]
+        data = bytes([int(x, 16) for x in data.strip().split(',')])
+        str_data = ','.join([f"{x:02X}" for x in data])
+        print(f"Sending raw bytes: {str_data}")
+        ws.SendRaw(data)
+
     def HandleCmd():
         cmd_handlers = {
-            'L': ('L - List paired sensors', List),
-            'P': ('P - Pair new sensors', Pair),
-            'U': ('U <mac> - Unpair sensor', Unpair),
-            'F': ('F - Fix invalid sensors', Fix),
-            'X': ('X - Exit tool', None),
+            'L': ('L - [L]ist paired sensors', List),
+            'P': ('P - [P]air new sensors', Pair),
+            'U': ('U - [U]npair sensor, args: <mac>', Unpair),
+            'F': ('F - [F]ix invalid sensors', Fix),
+            'C': ('C - Play [C]hime, args: <mac> <ring> <repeat> <volume>', Chime),
+            'R': ('R - Sending [R]aw packet, args: <hex bytes, separated by comma', Raw),
+            'X': ('X - E[X]it tool', None),
         }
 
         for v in list(cmd_handlers.values()):