From a0f164d17672829e48f4163e2a5e310dd93b641e Mon Sep 17 00:00:00 2001
From: Valentin Ochs <a@0au.de>
Date: Mon, 14 Nov 2022 19:16:02 +0100
Subject: [PATCH] Control bell through socket

---
 door_pi_control/__init__.py |  8 ++++----
 door_pi_control/bell.py     | 14 +++++++-------
 door_pi_control/socket.py   | 20 +++++++++++++++++++-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/door_pi_control/__init__.py b/door_pi_control/__init__.py
index 9eeaf43..7aa1645 100644
--- a/door_pi_control/__init__.py
+++ b/door_pi_control/__init__.py
@@ -48,15 +48,15 @@ def main():
     nfc = DoorControlNfc(config, control, mqttc)
     nfc.start()
     
-    logger().info("Starting socket")
-    socket = DoorControlSocket(config, control, nfc)
-    socket.start()
-
     logger().info("Starting bell")
     def door_is_open():
         return control.state() == control.target() == door.constants.state.OPEN
     bell_control = bell.Control(config.bell_port, door_is_open)
     bell_control.start()
+    
+    logger().info("Starting socket")
+    socket = DoorControlSocket(config, control, bell_control, nfc)
+    socket.start()
 
     while True:
         time.sleep(60)
diff --git a/door_pi_control/bell.py b/door_pi_control/bell.py
index 7627343..c78239f 100644
--- a/door_pi_control/bell.py
+++ b/door_pi_control/bell.py
@@ -163,19 +163,19 @@ class Control(util.Loggable):
             self._task.start()
     def run(self):
         port = None
-        protocol = None
+        self._protocol = None
         while True:
-            if port is None or protocol.closed:
+            if port is None or self._protocol.closed:
                 try:
                     port = serial.Serial(self._port, 9600)
-                    protocol = serial.threaded.ReaderThread(port, lambda: Reader(self._cb))
-                    protocol.start()
-                    protocol = protocol.protocol
+                    self._protocol = serial.threaded.ReaderThread(port, lambda: Reader(self._cb))
+                    self._protocol.start()
+                    self._protocol = protocol.protocol
                 except Exception as e:
                     self._logger().exception("Port opening error")
                     time.sleep(10)
                     continue
 
-            if protocol.doing_light:
-                protocol.send_light_msg()
+            if self._protocol.doing_light:
+                self._protocol.send_light_msg()
             time.sleep(1)
diff --git a/door_pi_control/socket.py b/door_pi_control/socket.py
index 8f93c4f..0d2d52d 100644
--- a/door_pi_control/socket.py
+++ b/door_pi_control/socket.py
@@ -34,10 +34,11 @@ class DoorControlSocket(util.Loggable):
                     self._logger().exception("Error while handling command")
             return True
     
-    def __init__(self, config, control, nfc):
+    def __init__(self, config, control, bell, nfc):
         super().__init__("socket")
         self._config = config
         self._control = control
+        self._bell = bell
         self._nfc = nfc
         self._fifo = self._open_control_socket()
         self._stop = True
@@ -114,6 +115,23 @@ class DoorControlSocket(util.Loggable):
                 self._control.close()
             else:
                 send("Missing login")
+        elif cmd == 'bell_open':
+            send("Opening front door")
+            self._bell._protocol.open_door()
+        elif cmd == 'bell_light':
+            send("Turning the light on")
+            self._bell._protocol.send_light_msg()
+        elif cmd == 'bell_perma_light':
+            self._bell._protocol.doing_light ^= True
+            send("Turning the light on permanently: {self._bell._protocol.doing_light}")
+        elif cmd == 'bell_raw':
+            if (len(args) % 4) != 0:
+                send(f"Invalid number of bytes: {len(args)}")
+                return
+            data = bytes.fromhex(" ".join(args))
+            data = [ data[i:i+4] for i in range(0, len(data), 4) ]
+            send(f"Sending {repr(data)}")
+            self._bell._protocol.alternate_msgs(data)
         elif cmd == 'rld':
             self._logger().debug("Reloading tokens")
             send("Reloading tokens")