From 1fc554ae2503481e1a7aab143587d3ca977046d1 Mon Sep 17 00:00:00 2001
From: jpunkt <johannes@arg-art.org>
Date: Tue, 11 Jan 2022 20:21:44 +0100
Subject: [PATCH] Implemented debugging commands

---
 README.md               |  7 +++++++
 pizzactrl/hal_serial.py | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 49fb1bb..918166a 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
 # pizzabox-mc
 Python software for controlling a mobile interactive artwork for "Invisible Cities"
+
+# Deployment (Testing)
+
+Terminal command
+
+        […]pizzabox-main$ scp pizzactrl/*.py  pi@10.10.0.23:/home/pi/pizzabox-main/pizzactrl/
+
diff --git a/pizzactrl/hal_serial.py b/pizzactrl/hal_serial.py
index fc08ae1..d994eb9 100644
--- a/pizzactrl/hal_serial.py
+++ b/pizzactrl/hal_serial.py
@@ -51,6 +51,9 @@ class SerialCommands(Enum):
     RECORD = b'C'
     REWIND = b'R'
 
+    DEBUG_SCROLL = b'S'
+    DEBUG_SENSORS = b'Z'
+
     EOT = b'\n'
 
 
@@ -86,24 +89,22 @@ class PizzaHAL:
         resp = self.serialcon.read_until()
         if resp == (SerialCommands.HELLO.value + SerialCommands.EOT.value):
             self.serialcon.write(SerialCommands.ALREADY_CONNECTED.value + SerialCommands.EOT.value)
+            resp = self.serialcon.read_until()
+            if resp == (SerialCommands.ALREADY_CONNECTED.value + SerialCommands.EOT.value):
+                logger.info('Serial Connection established')
+            elif resp == b'':
+                raise SerialCommunicationError('Timeout on initializing connection.')
+            else:
+                raise SerialCommunicationError(f'Serial Connection received invalid response to ALREADY CONNECTED: {resp}')
         elif resp == (SerialCommands.ALREADY_CONNECTED.value + SerialCommands.EOT.value):
             logger.warn('Serial Connection received ALREADY CONNECTED as response to HELLO. Assuming connection ok.')
-            self.connected = True
-            return
         elif resp == b'':
             raise SerialCommunicationError('Timeout on initializing connection.')
         else:
             raise SerialCommunicationError(f'Serial Connection received invalid response to HELLO: {resp}')
-        resp = self.serialcon.read_until()
-        if resp == (SerialCommands.ALREADY_CONNECTED.value + SerialCommands.EOT.value):
-            self.connected == True
-            logger.info('Serial Connection established')
-        elif resp == b'':
-            raise SerialCommunicationError('Timeout on initializing connection.')
-        else:
-            raise SerialCommunicationError(f'Serial Connection received invalid response to ALREADY CONNECTED: {resp}')
+        self.connected = True
 
-    def send_cmd(self, command: SerialCommands, *options: bytes):
+    def send_cmd(self, command: SerialCommands, *options):
         """
         Send a command and optional options. Options need to be encoded as bytes before passing.
         """