|
 |
48a30d7 |
diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
|
|
 |
48a30d7 |
index ced33b5..c41162e 100644
|
|
 |
48a30d7 |
--- a/Cura/gui/firmwareInstall.py
|
|
 |
48a30d7 |
+++ b/Cura/gui/firmwareInstall.py
|
|
 |
48a30d7 |
@@ -18,85 +18,6 @@ from Cura.util import profile
|
|
 |
4090bef |
from Cura.util import resources
|
|
 |
4090bef |
|
|
 |
4090bef |
def getDefaultFirmware(machineIndex = None):
|
|
 |
e904ee3 |
- firmwareDict = {
|
|
 |
e904ee3 |
- 'ultimaker2go':"MarlinUltimaker2go.hex",
|
|
 |
e904ee3 |
- 'Witbox':"MarlinWitbox.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- #Mini
|
|
 |
48a30d7 |
- 'lulzbot_mini': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex",
|
|
 |
48a30d7 |
- 'lulzbot_mini_flexystruder': "Mini-Single-or-Flexystruder-LBHexagon-1.0.2.2.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- #TAZ Budaschnozzle
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_SingleV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_SingleV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_FlexystruderV1': "Taz4-5-Single-or-Flexystruder-Budaschnozzle-2014Q3.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_DualV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_DualV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_FlexyDuallyV1': "Taz4-5-Dual-or-FlexyDually-Budaschnozzle-2015Q1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- #TAZ Hexagon
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_05nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_035nozzle': "TAZ4-5-Standard-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_FlexystruderV2': "TAZ4-5-Flexystruder-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_DualV2': "TAZ4-5-Dual-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_4_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_5_FlexyDuallyV2': "TAZ4-5-FlexyDually-LBHexagon-1.0.0.1.hex",
|
|
 |
48a30d7 |
-
|
|
 |
48a30d7 |
- #TAZ 6
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_6_Single_v2.1': "TAZ6_Single_v1.0.2.19.hex",
|
|
 |
2b42460 |
- 'lulzbot_TAZ_6_Flexystruder_v2': "TAZ6_Flexystruder_v1.0.2.19.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_6_Dual_v2': "TAZ6_Dual_v1.0.2.19.hex",
|
|
 |
48a30d7 |
- 'lulzbot_TAZ_6_FlexyDually_v2': "TAZ6_Dual_v1.0.2.19.hex",
|
|
 |
e904ee3 |
- }
|
|
 |
45bbe1c |
- machine_type = profile.getMachineSetting('machine_type', machineIndex)
|
|
 |
45bbe1c |
- extruders = profile.getMachineSettingFloat('extruder_amount', machineIndex)
|
|
 |
45bbe1c |
- heated_bed = profile.getMachineSetting('has_heated_bed', machineIndex) == 'True'
|
|
 |
45bbe1c |
- baudrate = 250000
|
|
 |
45bbe1c |
- if sys.platform.startswith('linux'):
|
|
 |
45bbe1c |
- baudrate = 115200
|
|
 |
45bbe1c |
- if machine_type == 'ultimaker':
|
|
 |
4090bef |
- name = 'MarlinUltimaker'
|
|
 |
45bbe1c |
- if extruders > 2:
|
|
 |
4090bef |
- return None
|
|
 |
45bbe1c |
- if heated_bed:
|
|
 |
4090bef |
- name += '-HBK'
|
|
 |
45bbe1c |
- name += '-%d' % (baudrate)
|
|
 |
45bbe1c |
- if extruders > 1:
|
|
 |
4090bef |
- name += '-dual'
|
|
 |
4090bef |
- return resources.getPathForFirmware(name + '.hex')
|
|
 |
4090bef |
-
|
|
 |
45bbe1c |
- if machine_type == 'ultimaker_plus':
|
|
 |
45bbe1c |
- name = 'MarlinUltimaker-UMOP-%d' % (baudrate)
|
|
 |
45bbe1c |
- if extruders > 2:
|
|
 |
4090bef |
- return None
|
|
 |
45bbe1c |
- if extruders > 1:
|
|
 |
4090bef |
- name += '-dual'
|
|
 |
4090bef |
- return resources.getPathForFirmware(name + '.hex')
|
|
 |
45bbe1c |
- if machine_type == 'ultimaker2':
|
|
 |
45bbe1c |
- if extruders > 2:
|
|
 |
4090bef |
- return None
|
|
 |
45bbe1c |
- if extruders > 1:
|
|
 |
4090bef |
- return resources.getPathForFirmware("MarlinUltimaker2-dual.hex")
|
|
 |
4090bef |
- return resources.getPathForFirmware("MarlinUltimaker2.hex")
|
|
 |
45bbe1c |
- if machine_type == 'ultimaker2extended':
|
|
 |
45bbe1c |
- if extruders > 2:
|
|
 |
45bbe1c |
- return None
|
|
 |
45bbe1c |
- if extruders > 1:
|
|
 |
45bbe1c |
- return resources.getPathForFirmware("MarlinUltimaker2extended-dual.hex")
|
|
 |
45bbe1c |
- return resources.getPathForFirmware("MarlinUltimaker2extended.hex")
|
|
 |
e904ee3 |
- if firmwareDict.has_key(machine_type):
|
|
 |
e904ee3 |
- return resources.getPathForFirmware(firmwareDict[machine_type])
|
|
 |
4090bef |
return None
|
|
 |
4090bef |
|
|
 |
e904ee3 |
def InstallFirmware(parent = None, filename = None, port = None, machineIndex = None):
|
|
 |
48a30d7 |
@@ -138,7 +59,7 @@ class InstallFirmwareDialog(wx.Dialog):
|
|
 |
e904ee3 |
|
|
 |
e904ee3 |
def Run(self):
|
|
 |
e904ee3 |
if self.filename is None:
|
|
 |
4090bef |
- 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)
|
|
 |
812839c |
+ wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for technical reasons. Please go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
|
|
 |
e904ee3 |
return False
|
|
 |
e904ee3 |
self.success = False
|
|
 |
e904ee3 |
self.thread = threading.Thread(target=self.OnRun)
|
|
 |
48a30d7 |
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
|
|
 |
48a30d7 |
index ecf0369..047df7a 100644
|
|
 |
48a30d7 |
--- a/Cura/gui/mainWindow.py
|
|
 |
48a30d7 |
+++ b/Cura/gui/mainWindow.py
|
|
 |
e904ee3 |
@@ -394,7 +394,6 @@ class mainWindow(wx.Frame):
|
|
 |
e904ee3 |
|
|
 |
812839c |
# Enabled sash
|
|
 |
812839c |
self.splitter.SetSashSize(4)
|
|
 |
812839c |
- self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
|
|
 |
45bbe1c |
if profile.getMachineSetting('machine_type').startswith('ultimaker2') or \
|
|
 |
45bbe1c |
profile.getMachineSetting('machine_type').startswith('lulzbot_'):
|
|
 |
812839c |
self.bedLevelWizardMenuItem.Enable(False)
|
|
 |
2b42460 |
@@ -515,9 +514,6 @@ class mainWindow(wx.Frame):
|
|
 |
812839c |
#Add tools for machines.
|
|
 |
812839c |
self.machineMenu.AppendSeparator()
|
|
 |
812839c |
|
|
 |
812839c |
- self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default firmware..."))
|
|
 |
812839c |
- self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
|
|
 |
812839c |
-
|
|
 |
812839c |
i = self.machineMenu.Append(-1, _("Install custom firmware..."))
|
|
 |
812839c |
self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
|
|
 |
812839c |
|