Some firmware programming improvements in the error handling.

diff --git a/Cura/avr_isp/stk500v2.py b/Cura/avr_isp/stk500v2.py
index 62fd17260f0d78ea7c91f510040378103a1a48f8..27e679f1da3bba9fda89aa12f4fff726db4664d3 100644 (file)
--- a/Cura/avr_isp/stk500v2.py
+++ b/Cura/avr_isp/stk500v2.py
@@ -7,6 +7,7 @@ import os, struct, sys, time
 
 from serial import Serial
 from serial import SerialException
+from serial import SerialTimeoutException
 
 import ispBase, intelHex
 
@@ -133,7 +134,7 @@ class Stk500v2(ispBase.IspBase):
                try:
                        self.serial.write(message)
                        self.serial.flush()
-               except Serial.SerialTimeoutException:
+               except SerialTimeoutException:
                        raise ispBase.IspError('Serial send timeout')
                self.seq = (self.seq + 1) & 0xFF
                return self.recvMessage()

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index 8a2972e07fe7d2ee5a5f425b9669a0a66e128cdc..2ee983f2c666dae093c4a407b0706bf91d550752 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -108,7 +108,7 @@ class InstallFirmware(wx.Dialog):
                                                programmer.connect(self.port)
                                                break
                                        except ispBase.IspError:
-                                               pass
+                                               programmer.close()
                                time.sleep(1)
                                if not self:
                                        #Window destroyed
@@ -117,7 +117,7 @@ class InstallFirmware(wx.Dialog):
                        try:
                                programmer.connect(self.port)
                        except ispBase.IspError:
-                               pass
+                               programmer.close()
 
                if not programmer.isConnected():
                        wx.MessageBox(_("Failed to find machine for firmware upgrade\nIs your machine connected to the PC?"),