Merge branch 'master' into i2

interface1/firmware/src/main.cpp

@@ -212,6 +212,7 @@ void loop()
                 }
 
                 frameBufferCount = 0;
+                frameState = WAIT_START;
             } else if (byte == FRAME_ESCAPE) {
                 frameState = ESCAPE;
             } else {

pycoax/coax/__about__.py

@@ -1 +1 @@
-__version__ = '0.4.1'
+__version__ = '0.4.2'

pycoax/coax/serial_interface.py

@@ -21,17 +21,19 @@ class SerialInterface(Interface):
     def reset(self):
         original_serial_timeout = self.serial.timeout
 
+        self.serial.timeout = 5
+
         self.serial.reset_input_buffer()
 
         self._write_message(bytes([0x01]))
 
-        self.serial.timeout = 5
-
         try:
             message = self._read_message()
         finally:
             self.serial.timeout = original_serial_timeout
 
+            self.serial.reset_input_buffer()
+
         if message[0] != 0x01:
             raise _convert_error(message)