Add debug feature to watch and auto install firmware to easy firmware development.

[cura.git] / Cura / gui / firmwareInstall.py

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index aa0a8b250dc30d5638f54d77534cf095dbaa636d..f38f7b8c8c3e91cda6b30105e352942da81aa9e7 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -10,6 +10,7 @@ from Cura.avr_isp import stk500v2
 from Cura.avr_isp import ispBase
 from Cura.avr_isp import intelHex
 
+from Cura.gui.util import taskbar
 from Cura.util import machineCom
 from Cura.util import profile
 from Cura.util import resources
@@ -50,8 +51,8 @@ def getDefaultFirmware(machineIndex = None):
        return None
 
 class InstallFirmware(wx.Dialog):
-       def __init__(self, filename = None, port = None, machineIndex = None):
-               super(InstallFirmware, self).__init__(parent=None, title="Firmware install for %s" % (profile.getMachineSetting('machine_name', machineIndex).title()), size=(250, 100))
+       def __init__(self, parent = None, filename = None, port = None, machineIndex = None):
+               super(InstallFirmware, self).__init__(parent=parent, title="Firmware install for %s" % (profile.getMachineSetting('machine_name', machineIndex).title()), size=(250, 100))
                if port is None:
                        port = profile.getMachineSetting('serial_port')
                if filename is None:
@@ -151,9 +152,109 @@ class InstallFirmware(wx.Dialog):
        def OnProgress(self, value, max):
                wx.CallAfter(self.progressGauge.SetRange, max)
                wx.CallAfter(self.progressGauge.SetValue, value)
+               taskbar.setProgress(self.GetParent(), value, max)
 
        def OnOk(self, e):
                self.Close()
+               taskbar.setBusy(self.GetParent(), False)
+
+       def OnClose(self, e):
+               self.Destroy()
+
+
+class AutoUpdateFirmware(wx.Dialog):
+       def __init__(self, parent, filename = None, port = None, machineIndex = None):
+               super(AutoUpdateFirmware, self).__init__(parent=parent, title="Auto Firmware install", size=(250, 100))
+               if port is None:
+                       port = profile.getMachineSetting('serial_port')
+
+               sizer = wx.BoxSizer(wx.VERTICAL)
+
+               self.progressLabel = wx.StaticText(self, -1, 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\nX\nX')
+               sizer.Add(self.progressLabel, 0, flag=wx.ALIGN_CENTER|wx.ALL, border=5)
+               self.progressGauge = wx.Gauge(self, -1)
+               sizer.Add(self.progressGauge, 0, flag=wx.EXPAND)
+               self.okButton = wx.Button(self, -1, _("OK"))
+               self.okButton.Bind(wx.EVT_BUTTON, self.OnOk)
+               sizer.Add(self.okButton, 0, flag=wx.ALIGN_CENTER|wx.ALL, border=5)
+               self.SetSizer(sizer)
+
+               self.filename = filename
+               self.port = port
+
+               self.Layout()
+               self.Fit()
+
+               self.thread = threading.Thread(target=self.OnRun)
+               self.thread.daemon = True
+               self.thread.start()
+
+               self.ShowModal()
+               self.Destroy()
+               return
+
+       def OnRun(self):
+               mtime = 0
+               while bool(self):
+                       new_mtime = os.stat(self.filename).st_mtime
+                       if mtime != new_mtime:
+                               mtime = new_mtime
+                               time.sleep(0.5)
+                               self.OnInstall()
+                       time.sleep(0.5)
+
+       def OnInstall(self):
+               wx.CallAfter(self.okButton.Disable)
+               wx.CallAfter(self.updateLabel, _("Reading firmware..."))
+               hexFile = intelHex.readHex(self.filename)
+               wx.CallAfter(self.updateLabel, _("Connecting to machine..."))
+               programmer = stk500v2.Stk500v2()
+               programmer.progressCallback = self.OnProgress
+               if self.port == 'AUTO':
+                       wx.CallAfter(self.updateLabel, _("Please connect the printer to\nyour computer with the USB cable."))
+                       while not programmer.isConnected():
+                               for self.port in machineCom.serialList(True):
+                                       try:
+                                               programmer.connect(self.port)
+                                               break
+                                       except ispBase.IspError:
+                                               pass
+                               time.sleep(1)
+                               if not self:
+                                       #Window destroyed
+                                       return
+               else:
+                       try:
+                               programmer.connect(self.port)
+                       except ispBase.IspError:
+                               pass
+
+               if not programmer.isConnected():
+                       wx.CallAfter(self.updateLabel, _("Failed to connect to programmer.\n"))
+                       return
+
+               wx.CallAfter(self.updateLabel, _("Uploading firmware..."))
+               try:
+                       programmer.programChip(hexFile)
+                       wx.CallAfter(self.updateLabel, _("Done!\nInstalled firmware: %s") % (os.path.basename(self.filename)))
+               except ispBase.IspError as e:
+                       wx.CallAfter(self.updateLabel, _("Failed to write firmware.\n") + str(e))
+
+               programmer.close()
+               wx.CallAfter(self.okButton.Enable)
+
+       def updateLabel(self, text):
+               self.progressLabel.SetLabel(text)
+               #self.Layout()
+
+       def OnProgress(self, value, max):
+               wx.CallAfter(self.progressGauge.SetRange, max)
+               wx.CallAfter(self.progressGauge.SetValue, value)
+               taskbar.setProgress(self.GetParent(), value, max)
+
+       def OnOk(self, e):
+               self.Close()
+               taskbar.setBusy(self.GetParent(), False)
 
        def OnClose(self, e):
                self.Destroy()