Add UM2 firmware version 13.10.

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

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index 098c07ebb130cbe93dbc01d519865e1acae42f01..141bcb06a800aad12493182e0f2e81087aec5b2b 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -12,12 +12,12 @@ from Cura.util import profile
 from Cura.util import resources
 
 def getDefaultFirmware():
-       if profile.getPreference('machine_type') == 'ultimaker':
-               if profile.getPreference('has_heated_bed') == 'True':
+       if profile.getMachineSetting('machine_type') == 'ultimaker':
+               if profile.getMachineSetting('has_heated_bed') == 'True':
                        return None
-               if profile.getPreferenceFloat('extruder_amount') > 2:
+               if profile.getMachineSettingFloat('extruder_amount') > 2:
                        return None
-               if profile.getPreferenceFloat('extruder_amount') > 1:
+               if profile.getMachineSettingFloat('extruder_amount') > 1:
                        if sys.platform.startswith('linux'):
                                return resources.getPathForFirmware("MarlinUltimaker-115200-dual.hex")
                        else:
@@ -26,32 +26,34 @@ def getDefaultFirmware():
                        return resources.getPathForFirmware("MarlinUltimaker-115200.hex")
                else:
                        return resources.getPathForFirmware("MarlinUltimaker-250000.hex")
+       if profile.getMachineSetting('machine_type') == 'ultimaker2':
+               return resources.getPathForFirmware("MarlinUltimaker2.hex")
        return None
 
 class InstallFirmware(wx.Dialog):
        def __init__(self, filename = None, port = None):
                super(InstallFirmware, self).__init__(parent=None, title="Firmware install", size=(250, 100))
                if port is None:
-                       port = profile.getPreference('serial_port')
+                       port = profile.getMachineSetting('serial_port')
                if filename is None:
                        filename = getDefaultFirmware()
                if filename is None:
-                       wx.MessageBox('I am sorry, but Cura does not ship with a default firmware for your machine configuration.', 'Firmware update', wx.OK | wx.ICON_ERROR)
+                       wx.MessageBox(_("I am sorry, but Cura does not ship with a default firmware for your machine configuration."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
                        self.Destroy()
                        return
 
                sizer = wx.BoxSizer(wx.VERTICAL)
-               
+
                self.progressLabel = wx.StaticText(self, -1, 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\nX')
                sizer.Add(self.progressLabel, 0, flag=wx.ALIGN_CENTER)
                self.progressGauge = wx.Gauge(self, -1)
                sizer.Add(self.progressGauge, 0, flag=wx.EXPAND)
-               self.okButton = wx.Button(self, -1, 'Ok')
+               self.okButton = wx.Button(self, -1, _("OK"))
                self.okButton.Disable()
                self.okButton.Bind(wx.EVT_BUTTON, self.OnOk)
                sizer.Add(self.okButton, 0, flag=wx.ALIGN_CENTER)
                self.SetSizer(sizer)
-               
+
                self.filename = filename
                self.port = port
 
@@ -59,15 +61,15 @@ class InstallFirmware(wx.Dialog):
                self.Fit()
 
                threading.Thread(target=self.OnRun).start()
-               
+
                self.ShowModal()
                self.Destroy()
                return
 
        def OnRun(self):
-               wx.CallAfter(self.updateLabel, "Reading firmware...")
+               wx.CallAfter(self.updateLabel, _("Reading firmware..."))
                hexFile = intelHex.readHex(self.filename)
-               wx.CallAfter(self.updateLabel, "Connecting to machine...")
+               wx.CallAfter(self.updateLabel, _("Connecting to machine..."))
                programmer = stk500v2.Stk500v2()
                programmer.progressCallback = self.OnProgress
                if self.port == 'AUTO':
@@ -82,21 +84,22 @@ class InstallFirmware(wx.Dialog):
                                programmer.connect(self.port)
                        except ispBase.IspError:
                                pass
-                               
+
                if programmer.isConnected():
-                       wx.CallAfter(self.updateLabel, "Uploading firmware...")
+                       wx.CallAfter(self.updateLabel, _("Uploading firmware..."))
                        try:
                                programmer.programChip(hexFile)
-                               wx.CallAfter(self.updateLabel, "Done!\nInstalled firmware: %s" % (os.path.basename(self.filename)))
+                               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))
-                               
+                               wx.CallAfter(self.updateLabel, _("Failed to write firmware.\n") + str(e))
+
                        programmer.close()
                        wx.CallAfter(self.okButton.Enable)
                        return
-               wx.MessageBox('Failed to find machine for firmware upgrade\nIs your machine connected to the PC?', 'Firmware update', wx.OK | wx.ICON_ERROR)
+               wx.MessageBox(_("Failed to find machine for firmware upgrade\nIs your machine connected to the PC?"),
+                                         _("Firmware update"), wx.OK | wx.ICON_ERROR)
                wx.CallAfter(self.Close)
-       
+
        def updateLabel(self, text):
                self.progressLabel.SetLabel(text)
                #self.Layout()