.

Author: tauzm

SerialMonitorWebsocket.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
-import sys
-import time
+import traceback
 
 import serial
 import logging
@@ -34,7 +33,7 @@ async def __init__(self, websocket, path):
 
         self.websocket = websocket
         self.serialOpen = False
-
+        self.ser = None
         await self.mainLoop()
 
     async def commandParser(self, body):
@@ -84,7 +83,6 @@ def openSerialMontor(self, port, baudRate):
         """
         logging.info(f"Opening serial monitor")
         if not self.serialOpen:
-
             self.serialOpen = True
             self.ser = serial.Serial(
                 port=port,
@@ -108,34 +106,34 @@ def closeSerialMonitor(self):
         Serial monitörü kapatır
         """
         logging.info(f"Closing serial monitor")
-        if self.serialOpen:
+        if self.serialOpen and self.ser != None:
             self.ser.close()
         self.serialOpen = False
 
     async def serialLog(self):
         """
         Serial monitörü okur ve websocket aracılığı ile web tarafına gönderir
         """
-        waiting = self.ser.in_waiting
-        try:
-            line = self.ser.read(waiting).decode("utf-8")
-        except:
-            return
-        if line == "":
-            return
-        # print(line, end="")"
-        bodyToSend = {"command":"serialLog", "log":line}
-        bodyToSend = json.dumps(bodyToSend)
-        await self.websocket.send(bodyToSend)
+        if self.serialOpen and self.ser != None:
+            waiting = self.ser.in_waiting
+            try:
+                line = self.ser.read(waiting).decode("utf-8")
+            except:
+                return
+            if line == "":
+                return
+            # print(line, end="")"
+            bodyToSend = {"command":"serialLog", "log":line}
+            bodyToSend = json.dumps(bodyToSend)
+            await self.websocket.send(bodyToSend)
 
     async def mainLoop(self):
         """
         Ana döngü, her döngüde, web tarafından mesaj gelip gelmediğini kontrol eder, veri geldiyse commandParser()'a gönderir,
         aksi halde serial monitör açık ise serialLog()'u çalıştırır
         """
-        try:
-            while True:
-
+        while True:
+            try:
                 if not self.serialOpen:
                     await asyncio.sleep(.3)
 
@@ -151,7 +149,11 @@ async def mainLoop(self):
                         await self.serialLog()
 
                 await self.commandParser(body)
-        except:
-            logging.info("Closing Serial Monitor.")
-        finally:
-            sys.exit()
+
+            except Exception as e:
+                logging.info("Serial Monitor Error")
+                logging.exception("Because!: ")
+                traceback.print_exc()
+                bodyToSend = {"command": "serialLog", "log": str(e)+"\n"}
+                bodyToSend = json.dumps(bodyToSend)
+                await self.websocket.send(bodyToSend)

Websocket.py

@@ -107,7 +107,7 @@ async def upload(self, ID, code):
         code (str): kodun kendisi.
         """
         pipe = Data.boards[ID].uploadCode(code)
-        bodyToSend = {"command": "cleanConsoleLog", "log": "Uploading Code...\n"}
+        bodyToSend = {"command": "cleanConsoleLog", "log": ""}
         bodyToSend = json.dumps(bodyToSend)
         await self.websocket.send(bodyToSend)
         await self.readAndSend(pipe)