Merge branch 'master' into mergemaster

Author: beniroquai

uc2rest/mserial.py

@@ -14,7 +14,7 @@ def __init__(self, port, baudrate=115200, timeout=5,
         self.baudrate = baudrate
         self.timeout = timeout
         self._parent = parent
-        
+
         if self._parent is None:
             import logging
             self._logger = logging.getLogger(__name__)
@@ -183,28 +183,13 @@ def _process_commands(self):
                     if time.time() - timeLastTrasmissionWasAsked > 0.1: #timeout to wait until ESP32 responds
                         lastTransmisionSuccess = True # something went wrong, we have to free serial now!
                 except Exception as e:
-                    time.sleep(0.1) # add an artifical delay in case the esp32 did reply but we didn't catch it and then free the serial connection
+                    time.sleep(0.01) # add an artifical delay in case the esp32 did reply but we didn't catch it and then free the serial connection
                     lastTransmisionSuccess = True
             if not self.command_queue.empty() and not reading_json and lastTransmisionSuccess:
                 currentIdentifier, command = self.command_queue.get()
-
                 if self.DEBUG: self._logger.debug("Sending: "+ str(command))
-                json_command = json.dumps(command)
-                try:
-                    self.ser.write(json_command.encode('utf-8'))
-                    qeueIdSuccess[str(currentIdentifier)]=(False, time.time())
-                except Exception as e:
-                    try:
-                        self.ser.write_timeout = 1
-                        self.ser.write(json_command.encode('utf-8'))
-                        self.ser.write_timeout=self.write_timeout
-                    except Exception as e:
-                        self._logger.error("Writing failed in sreial, %s", e)
-                try:self.ser.write(b'\n')
-                except:
-                    self._logger.error("Break the loop in serial")
-                    break
-
+                qeueIdSuccess[str(currentIdentifier)]=(False, time.time())
+                
             # device not ready yet
             if self.ser is None:
                 self.is_connected = False
@@ -320,6 +305,12 @@ def sendMessage(self, command, nResponses=1, timeout = 20):
         identifier = self._generate_identifier()
         command["qid"] = identifier
         self.command_queue.put((identifier, command))
+        try:
+            json_command = json.dumps(command)+"\n"
+            self.ser.write(json_command.encode('utf-8') )
+        except Exception as e:
+            if self.DEBUG: self._logger.error(e)
+            return "Failed to Send"
         self.commands[identifier]=command
         if nResponses <= 0 or not self.is_connected or not type(self.ser.BAUDRATES) is tuple:
             return identifier