small updates to emu and emu sample code usage. does in fact work

Author: kaiden-keane

samples/emu_connection.py

@@ -1,13 +1,39 @@
 from src.modules.emu import Emu
+import time
+import json
+
+emu = Emu()
 
 def onConnect():
-    print("connected!")
+    loadCurrent = {
+        "type": "load",
+        "uavStatus": {
+            "connection": "no",
+            "mode": "test",
+            "imageCount": "2",
+            "timeSinceMessage": "3"
+        },
+        "imageName": "res/sample1.jpg"
+    }
+    emu.send_msg(json.dumps(loadCurrent))
 
-emu = Emu("127.0.0.1", 14555)
-emu.set_on_connect(onConnect)
 
+emu.set_on_connect(onConnect)
 emu.start_comms()
 
-emu.send_log("normal log message", "normal")
-emu.send_log("warning log message", "warning")
-emu.send_log("error log message", "error")
+time.sleep(2)
+
+# test different logs
+for i in range(6):
+    if i % 3 == 0: severity = "normal"
+    elif i % 3 == 1: severity = "warning"
+    else: severity = "error"
+    emu.send_log(f"log text {i}", severity)
+    time.sleep(0.5)
+
+# send new photo
+
+# change mode
+
+while True:
+    pass

src/modules/emu/emu.py

@@ -16,9 +16,9 @@ class Emu():
     class representation of a connection to Emu
     """
 
-    def __init__(self, hostname: str, port: int):
-        self.hostname = hostname
-        self.port = port
+    def __init__(self):
+        self.hostname = "127.0.0.1"
+        self.port = 14555
 
         self._send_queue = queue.Queue()
         self._recv_queue = queue.Queue()
@@ -28,7 +28,7 @@ def __init__(self, hostname: str, port: int):
         self._is_connected = False
 
     def start_comms(self):
-        self._comms_thread = threading.Thread(target=self._start_comms_loop)
+        self._comms_thread = threading.Thread(target=self._start_comms_loop, daemon=True)
         self._comms_thread.start()
 
     def send_image(self, path: str):
@@ -53,22 +53,29 @@ def send_log(self, message: str, severity: str="normal"):
         }
         self._send_queue.put(json.dumps(content))
 
+    def send_msg(self, message: str):
+        """
+        sends message as it is, follow the proper JSON API messages
+        """
+        self._send_queue.put(message)
+
     def set_on_connect(self, func: Callable):
         self._on_connect = func
 
     def _start_comms_loop(self):
         """
         starts connection loop with asyncio
         """
+        print("start_comms loop")
         asyncio.run(self._connect())
-        pass
 
     async def _connect(self):
         """
         starts the server and waits for clients to connect. Once they do,
         self._handler handles each client
         """
-        async with serve(self._handler, self.hostname, self.port) as server:
+        print("connect")
+        async with serve(self._handler, "", self.port) as server:
             await server.serve_forever()