|
|
4090bef |
diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
|
|
|
812839c |
index 4dd751e..67528e2 100644
|
|
|
4090bef |
--- a/Cura/gui/firmwareInstall.py
|
|
|
4090bef |
+++ b/Cura/gui/firmwareInstall.py
|
|
|
4090bef |
@@ -17,42 +17,6 @@ from Cura.util import profile
|
|
|
4090bef |
from Cura.util import resources
|
|
|
4090bef |
|
|
|
4090bef |
def getDefaultFirmware(machineIndex = None):
|
|
|
4090bef |
- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker':
|
|
|
4090bef |
- name = 'MarlinUltimaker'
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
|
|
|
4090bef |
- return None
|
|
|
4090bef |
- if profile.getMachineSetting('has_heated_bed', machineIndex) == 'True':
|
|
|
4090bef |
- name += '-HBK'
|
|
|
4090bef |
- if sys.platform.startswith('linux'):
|
|
|
4090bef |
- name += '-115200'
|
|
|
4090bef |
- else:
|
|
|
4090bef |
- name += '-250000'
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
|
|
|
4090bef |
- name += '-dual'
|
|
|
4090bef |
- return resources.getPathForFirmware(name + '.hex')
|
|
|
4090bef |
-
|
|
|
4090bef |
- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker_plus':
|
|
|
4090bef |
- name = 'MarlinUltimaker-UMOP'
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
|
|
|
4090bef |
- return None
|
|
|
4090bef |
- if sys.platform.startswith('linux'):
|
|
|
4090bef |
- name += '-115200'
|
|
|
4090bef |
- else:
|
|
|
4090bef |
- name += '-250000'
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
|
|
|
4090bef |
- name += '-dual'
|
|
|
4090bef |
- return resources.getPathForFirmware(name + '.hex')
|
|
|
4090bef |
-
|
|
|
4090bef |
- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker2':
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
|
|
|
4090bef |
- return None
|
|
|
4090bef |
- if profile.getMachineSettingFloat('extruder_amount', machineIndex) == 2:
|
|
|
4090bef |
- return resources.getPathForFirmware("MarlinUltimaker2-dual.hex")
|
|
|
4090bef |
- return resources.getPathForFirmware("MarlinUltimaker2.hex")
|
|
|
4090bef |
- if profile.getMachineSetting('machine_type', machineIndex) == 'lulzbot_mini':
|
|
|
4090bef |
- return resources.getPathForFirmware("marlin_mini_2014Q4.hex")
|
|
|
4090bef |
- if profile.getMachineSetting('machine_type', machineIndex) == 'Witbox':
|
|
|
4090bef |
- return resources.getPathForFirmware("MarlinWitbox.hex")
|
|
|
4090bef |
return None
|
|
|
4090bef |
|
|
|
4090bef |
class InstallFirmware(wx.Dialog):
|
|
|
4090bef |
@@ -63,7 +27,7 @@ class InstallFirmware(wx.Dialog):
|
|
|
4090bef |
if filename is None:
|
|
|
4090bef |
filename = getDefaultFirmware(machineIndex)
|
|
|
4090bef |
if 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)
|
|
|
4090bef |
self.Destroy()
|
|
|
4090bef |
return
|
|
|
4090bef |
self._machine_type = profile.getMachineSetting('machine_type', machineIndex)
|
|
|
812839c |
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
|
|
|
812839c |
index 71dac36..545f758 100644
|
|
|
812839c |
--- a/Cura/gui/mainWindow.py
|
|
|
812839c |
+++ b/Cura/gui/mainWindow.py
|
|
|
812839c |
@@ -364,7 +364,6 @@ class mainWindow(wx.Frame):
|
|
|
812839c |
self.splitter.SetSashPosition(self.normalSashPos, True)
|
|
|
812839c |
# Enabled sash
|
|
|
812839c |
self.splitter.SetSashSize(4)
|
|
|
812839c |
- self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
|
|
|
812839c |
if profile.getMachineSetting('machine_type') == 'ultimaker2' or profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
|
|
|
812839c |
self.bedLevelWizardMenuItem.Enable(False)
|
|
|
812839c |
self.headOffsetWizardMenuItem.Enable(False)
|
|
|
812839c |
@@ -475,9 +474,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 |
|