added first multiline response handling approach

geo-rg · Apr 5, 2017 · c0dbc03 · c0dbc03
1 parent 2ed4034
commit c0dbc03
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Firmware/Chameleon-Mini/Terminal/CommandLine.c b/Firmware/Chameleon-Mini/Terminal/CommandLine.c
@@ -436,6 +436,7 @@ static void DecodeCommand(void)
     TerminalSendString(pTerminalBuffer);
     TerminalSendStringP(PSTR(OPTIONAL_ANSWER_TRAILER));
   }
+  TerminalSendChar('\0');
 }
 
 void CommandLineInit(void)
@@ -487,6 +488,7 @@ INLINE void Timeout(void)
 		CommandLinePendingTaskTimeout(); // call the function that ends the task
 		CommandLinePendingTaskTimeout = NO_FUNCTION;
 	}
+	TerminalSendChar('\0');
 }
 
 void CommandLineTick(void)
@@ -521,6 +523,7 @@ void CommandLinePendingTaskFinished(CommandStatusIdType ReturnStatusID, char con
 		TerminalSendString(OutMessage);
 	    TerminalSendStringP(PSTR(OPTIONAL_ANSWER_TRAILER));
 	}
+	TerminalSendChar('\0');
 }
 
 void CommandLineAppendData(void const * const Buffer, uint16_t Bytes)
@@ -551,4 +554,5 @@ void CommandLineAppendData(void const * const Buffer, uint16_t Bytes)
     }
 
     TerminalSendStringP(PSTR(OPTIONAL_ANSWER_TRAILER));
+    TerminalSendChar('\0');
 }
diff --git a/Software/Chameleon/Device.py b/Software/Chameleon/Device.py
@@ -147,9 +147,16 @@ def writeCmd(self, cmd):
 
     def readResponse(self):
         # Read response to command, if any
-        response = self.serial.readline().decode('ascii').rstrip()
+        timeout = self.serial.timeout
+        self.serial.timeout = 1
+        response = ""
+        tmp = self.serial.read(1)
+        while tmp != b'\0':
+          response += tmp.decode('ascii')
+          tmp = self.serial.read(1)
         self.verboseLog("Response: {}".format(response))
-        return response
+        self.serial.timeout = timeout
+        return response.rstrip()
 
     def execCmd(self, cmd, args=None):
         if (args is None):