Changed the exception handling so that Ctrl-C passes through and isn't treated as a timeout.

1 files changed, 16 insertions, 15 deletions

diff --git a/support/stm32loader.py b/support/stm32loader.py
index d8e1f9f..a817efc 100755
--- a/support/stm32loader.py
+++ b/support/stm32loader.py
@@ -59,23 +59,24 @@ class CommandInterface:
 
 
     def _wait_for_ask(self, info = ""):
+        got = self.sp.read(1)
+
+        if not got:
+            raise CmdException("No response")
+
         # wait for ask
-        try:
-            ask = ord(self.sp.read())
-        except:
-            raise CmdException("Can't read port or timeout")
+        ask = ord(got)
+
+        if ask == 0x79:
+            # ACK
+            return 1
         else:
-            if ask == 0x79:
-                # ACK
-                return 1
+            if ask == 0x1F:
+                # NACK
+                raise CmdException("NACK "+info)
             else:
-                if ask == 0x1F:
-                    # NACK
-                    raise CmdException("NACK "+info)
-                else:
-                    # Unknow responce
-                    raise CmdException("Unknow response. "+info+": "+hex(ask))
-
+                # Unknow responce
+                raise CmdException("Unknow response. "+info+": "+hex(ask))
 
     def reset(self):
         self.sp.setDTR(0)
@@ -407,7 +408,7 @@ if __name__ == "__main__":
     try:
         try:
             cmd.initChip()
-        except:
+        except CmdException:
             print "Can't init. Ensure that BOOT0 is enabled and reset device"
 
         bootversion = cmd.cmdGet()