diff -up cura-lulzbot-20.01/Cura/gui/firmwareInstall.py.nofw cura-lulzbot-20.01/Cura/gui/firmwareInstall.py
--- cura-lulzbot-20.01/Cura/gui/firmwareInstall.py.nofw 2016-07-28 17:49:48.725010885 -0400
+++ cura-lulzbot-20.01/Cura/gui/firmwareInstall.py 2016-07-28 17:51:59.212219851 -0400
@@ -19,85 +19,6 @@ from Cura.util import profile
from Cura.util import resources
def getDefaultFirmware(machineIndex = None):
- firmwareDict = {
- 'ultimaker2go':"MarlinUltimaker2go.hex",
- 'Witbox':"MarlinWitbox.hex",
-
- #TAZ Budaschnozzle
- 'lulzbot_TAZ_4_SingleV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
- 'lulzbot_TAZ_5_SingleV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
- 'lulzbot_TAZ_4_FlexystruderV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
- 'lulzbot_TAZ_5_FlexystruderV1': "TAZ4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
-
- 'lulzbot_TAZ_4_DualV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
- 'lulzbot_TAZ_5_DualV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
- 'lulzbot_TAZ_4_FlexyDuallyV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
- 'lulzbot_TAZ_5_FlexyDuallyV1': "TAZ4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
-
- #TAZ Hexagon
- 'lulzbot_TAZ_4_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
- 'lulzbot_TAZ_4_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
-
- 'lulzbot_TAZ_5_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
- 'lulzbot_TAZ_5_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
-
- 'lulzbot_TAZ_4_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex",
- 'lulzbot_TAZ_5_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex",
-
- 'lulzbot_TAZ_4_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex",
- 'lulzbot_TAZ_5_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex",
-
- 'lulzbot_TAZ_4_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex",
- 'lulzbot_TAZ_5_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex",
-
- #TAZ 6
- 'lulzbot_TAZ_6_Single_v2.1': "TAZ6_Single_v1.0.2.19.hex",
- 'lulzbot_TAZ_6_Flexystruder_v2': "TAZ6_Flexystruder_v1.0.2.19.hex",
- 'lulzbot_TAZ_6_Dual_v2': "TAZ6_Dual_v1.0.2.19.hex",
- 'lulzbot_TAZ_6_FlexyDually_v2': "TAZ6_Dual_v1.0.2.19.hex",
-
- #Mini
- 'lulzbot_mini': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex",
- 'lulzbot_mini_flexystruder': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex",
- }
- machine_type = profile.getMachineSetting('machine_type', machineIndex)
- extruders = profile.getMachineSettingFloat('extruder_amount', machineIndex)
- heated_bed = profile.getMachineSetting('has_heated_bed', machineIndex) == 'True'
- baudrate = 250000
- if sys.platform.startswith('linux'):
- baudrate = 115200
- if machine_type == 'ultimaker':
- name = 'MarlinUltimaker'
- if extruders > 2:
- return None
- if heated_bed:
- name += '-HBK'
- name += '-%d' % (baudrate)
- if extruders > 1:
- name += '-dual'
- return resources.getPathForFirmware(name + '.hex')
-
- if machine_type == 'ultimaker_plus':
- name = 'MarlinUltimaker-UMOP-%d' % (baudrate)
- if extruders > 2:
- return None
- if extruders > 1:
- name += '-dual'
- return resources.getPathForFirmware(name + '.hex')
- if machine_type == 'ultimaker2':
- if extruders > 2:
- return None
- if extruders > 1:
- return resources.getPathForFirmware("MarlinUltimaker2-dual.hex")
- return resources.getPathForFirmware("MarlinUltimaker2.hex")
- if machine_type == 'ultimaker2extended':
- if extruders > 2:
- return None
- if extruders > 1:
- return resources.getPathForFirmware("MarlinUltimaker2extended-dual.hex")
- return resources.getPathForFirmware("MarlinUltimaker2extended.hex")
- if firmwareDict.has_key(machine_type):
- return resources.getPathForFirmware(firmwareDict[machine_type])
return None
def InstallFirmware(parent = None, filename = None, port = None, machineIndex = None):
@@ -147,7 +68,7 @@ class InstallFirmwareDialog(wx.Dialog):
def Run(self):
if self.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 on Fedora does not ship with a default firmware for your machine configuration."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
return False
self.success = False
firmware_file_name = os.path.basename(self.filename)
diff -up cura-lulzbot-20.01/Cura/gui/mainWindow.py.nofw cura-lulzbot-20.01/Cura/gui/mainWindow.py
--- cura-lulzbot-20.01/Cura/gui/mainWindow.py.nofw 2016-07-11 14:20:16.000000000 -0400
+++ cura-lulzbot-20.01/Cura/gui/mainWindow.py 2016-07-28 17:49:48.725010885 -0400
@@ -394,7 +394,6 @@ class mainWindow(wx.Frame):
# Enabled sash
self.splitter.SetSashSize(4)
- self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
if profile.getMachineSetting('machine_type').startswith('ultimaker2') or \
profile.getMachineSetting('machine_type').startswith('lulzbot_'):
self.bedLevelWizardMenuItem.Enable(False)
@@ -515,9 +514,6 @@ class mainWindow(wx.Frame):
#Add tools for machines.
self.machineMenu.AppendSeparator()
- self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default firmware..."))
- self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
-
i = self.machineMenu.Append(-1, _("Install custom firmware..."))
self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)