Merge pull request #601 from CapnBry/reloadscene

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

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index 8dc16fac8138d0d55a8f4fc17881931a286f3253..ff45017b5da1c91f742b587f525dc9c5fc41457c 100644 (file)
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
 import os
@@ -15,13 +14,13 @@ from Cura.util import machineCom
 from Cura.util import profile
 from Cura.util import resources
 
-def getDefaultFirmware():
-       if profile.getMachineSetting('machine_type') == 'ultimaker':
-               if profile.getMachineSetting('has_heated_bed') == 'True':
+def getDefaultFirmware(machineIndex = None):
+       if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker':
+               if profile.getMachineSetting('has_heated_bed', machineIndex) == 'True':
                        return None
-               if profile.getMachineSettingFloat('extruder_amount') > 2:
+               if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
                        return None
-               if profile.getMachineSettingFloat('extruder_amount') > 1:
+               if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
                        if sys.platform.startswith('linux'):
                                return resources.getPathForFirmware("MarlinUltimaker-115200-dual.hex")
                        else:
@@ -30,22 +29,22 @@ def getDefaultFirmware():
                        return resources.getPathForFirmware("MarlinUltimaker-115200.hex")
                else:
                        return resources.getPathForFirmware("MarlinUltimaker-250000.hex")
-       if profile.getMachineSetting('machine_type') == 'ultimaker2':
+       if profile.getMachineSetting('machine_type', machineIndex) == '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 for %s" % (profile.getMachineSetting('machine_name').title()), size=(250, 100))
+       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))
                if port is None:
                        port = profile.getMachineSetting('serial_port')
                if filename is None:
-                       filename = getDefaultFirmware()
+                       filename = getDefaultFirmware(machineIndex)
                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)
                        self.Destroy()
                        return
-               if profile.getMachineSetting('machine_type') == 'reprap':
+               if profile.getMachineSetting('machine_type', machineIndex) == 'reprap':
                        wx.MessageBox(_("Cura only supports firmware updates for ATMega2560 based hardware.\nSo updating your RepRap with Cura might or might not work."), _("Firmware update"), wx.OK | wx.ICON_INFORMATION)
 
                sizer = wx.BoxSizer(wx.VERTICAL)