BoardID, closing serial

Boards are taken by their ports instead of ids, multiple instances was causing boards ids to be reseted and not macthed. close serial monitor now sends that status to webclient

Author: tauzm

Board.py

@@ -21,8 +21,7 @@ def __init__(self, boardName, fqbn, port):
         self.boardName = boardName
         self.fqbn = fqbn
         self.port = port
-        self.ID = random.randint(1000000, 9999999)
-        logging.info(f"Board with Name:{boardName}, FQBN:{fqbn}, Port:{port}, ID:{self.ID} is created")
+        logging.info(f"Board with Name:{boardName}, FQBN:{fqbn}, Port:{port} is created")
 
     def uploadCode(self, code, fqbn = None):
         """
@@ -33,7 +32,7 @@ def uploadCode(self, code, fqbn = None):
 
         fqbn (str): kodun arduino-cli tarafında ki adı
         """
-        logging.info(f"Uploading code to {self.ID}")
+        logging.info(f"Uploading code to {self.boardName}:{self.port}")
         fqbn = fqbn if fqbn != None else self.fqbn
         createInoFile(code)
         pipe = executeCliPipe(f"compile --port {self.port} --upload --fqbn {fqbn} {config.TEMP_PATH}/tempCode")
@@ -48,7 +47,7 @@ def compileCode(self, code, fqbn = None):
 
         fqbn (str): kodun arduino-cli tarafında ki adı
         """
-        logging.info(f"Compiling code for {self.ID}")
+        logging.info(f"Compiling code for {self.boardName}:{self.port}")
         fqbn = fqbn if fqbn != None else self.fqbn
         createInoFile(code)
         pipe = executeCliPipe(f"compile --fqbn {fqbn} {config.TEMP_PATH}/tempCode")
@@ -74,7 +73,7 @@ def refreshBoards():
             boardPort = boardJson["port"]["address"]
             logging.info(f"Found board with Name:{boardName}, FQBN:{boardId}, Port:{boardPort}")
             board = Board(boardName, boardId, boardPort)
-            Data.boards[board.ID] = board
+            Data.boards[boardPort] = board
 
     @staticmethod
     async def sendBoardInfo(websocket):
@@ -86,11 +85,11 @@ async def sendBoardInfo(websocket):
         """
         body = {"command": "returnBoards", "boards": []}
         for k, v in Data.boards.items():
-            body['boards'].append({"boardName": v.boardName, "port": v.port, "ID": v.ID})
+            body['boards'].append({"boardName": v.boardName, "port": v.port})
         body = json.dumps(body)
         logging.info(f"Sending {body}")
         await websocket.send(body)
 
 
     def __repr__(self):
-        return f"{self.boardName} on port: {self.port} with fqbn of {self.fqbn} and ID of :{self.ID}"
+        return f"{self.boardName} on port: {self.port} with fqbn of {self.fqbn}"

SerialMonitorWebsocket.py

@@ -52,11 +52,11 @@ async def commandParser(self, body):
             await self.sendResponse()
 
         if command == "upload":
-            self.closeSerialMonitor()
+            await self.closeSerialMonitor()
         elif command == "openSerialMonitor":
             self.openSerialMontor(body["port"], body["baudRate"])
         elif command == "closeSerialMonitor":
-            self.closeSerialMonitor()
+            await self.closeSerialMonitor()
         elif command == "serialWrite":
             self.serialWrite(body["text"])
 
@@ -101,23 +101,30 @@ async def sendResponse(self):
         logging.info(f"SerialMonitorWebsocket sending response back")
         await self.websocket.send(bodyToSend)
 
-    def closeSerialMonitor(self):
+    async def closeSerialMonitor(self):
         """
         Serial monitörü kapatır
         """
         logging.info(f"Closing serial monitor")
         if self.serialOpen and self.ser != None:
             self.ser.close()
+            bodyToSend = {"command":"closeSerialMonitor"}
+            bodyToSend = json.dumps(bodyToSend)
+            await self.websocket.send(bodyToSend)
+
         self.serialOpen = False
 
     async def serialLog(self):
         """
         Serial monitörü okur ve websocket aracılığı ile web tarafına gönderir
         """
         if self.serialOpen and self.ser != None:
-            waiting = self.ser.in_waiting
             try:
+                waiting = self.ser.in_waiting
                 line = self.ser.read(waiting).decode("utf-8")
+            except serial.SerialException:
+                await self.closeSerialMonitor()
+                return
             except:
                 return
             if line == "":

Websocket.py

@@ -79,9 +79,9 @@ async def commandParser(self, body):
             await self.sendResponse()
 
         if command == "upload":
-            await self.upload(body['ID'], body["code"])
+            await self.upload(body['port'], body["code"])
         elif command == "compile":
-            await self.compile(body['ID'], body["code"])
+            await self.compile(body['port'], body["code"])
         elif command == "getBoards":
             await self.getBoards()
 
@@ -97,7 +97,7 @@ async def sendResponse(self):
         await self.websocket.send(bodyToSend)
 
 
-    async def upload(self, ID, code):
+    async def upload(self, port, code):
         """
         Kodun karta yüklenmesi için Board.uploadCode() fonksiyonunu çalştıran fonksiyon
 
@@ -106,13 +106,13 @@ async def upload(self, ID, code):
 
         code (str): kodun kendisi.
         """
-        pipe = Data.boards[ID].uploadCode(code)
+        pipe = Data.boards[port].uploadCode(code)
         bodyToSend = {"command": "cleanConsoleLog", "log": ""}
         bodyToSend = json.dumps(bodyToSend)
         await self.websocket.send(bodyToSend)
         await self.readAndSend(pipe)
 
-    async def compile(self, ID, code):
+    async def compile(self, port, code):
         """
         Kodun derlenmesi için Board.compileCode() fonksiyonunu çalştıran fonksiyon
 
@@ -121,7 +121,7 @@ async def compile(self, ID, code):
 
         code (str): kodun kendisi.
         """
-        pipe = Data.boards[ID].compileCode(code)
+        pipe = Data.boards[port].compileCode(code)
 
         bodyToSend = {"command": "cleanConsoleLog", "log": "Compling Code...\n"}
         bodyToSend = json.dumps(bodyToSend)
@@ -159,6 +159,7 @@ async def mainLoop(self):
                         body = self.queue.get()
 
                 await self.commandParser(body)
-
+        except:
+            logging.exception("Websocket Mainloop: ")
         finally:
             self.deviceChecker.terminate()