|
 |
c668bff |
diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
|
|
|
30552d2 |
index 6c2b60c..482a933 100644
|
|
|
c668bff |
--- a/Cura/gui/firmwareInstall.py
|
|
|
c668bff |
+++ b/Cura/gui/firmwareInstall.py
|
|
|
30552d2 |
@@ -17,47 +17,6 @@ from Cura.util import profile
|
|
|
c668bff |
from Cura.util import resources
|
|
|
c668bff |
|
|
|
c668bff |
def getDefaultFirmware(machineIndex = None):
|
|
|
30552d2 |
- machine_type = profile.getMachineSetting('machine_type', machineIndex)
|
|
|
30552d2 |
- extruders = profile.getMachineSettingFloat('extruder_amount', machineIndex)
|
|
|
30552d2 |
- heated_bed = profile.getMachineSetting('has_heated_bed', machineIndex) == 'True'
|
|
|
30552d2 |
- baudrate = 250000
|
|
|
30552d2 |
- if sys.platform.startswith('linux'):
|
|
|
30552d2 |
- baudrate = 115200
|
|
|
30552d2 |
- if machine_type == 'ultimaker':
|
|
|
c668bff |
- name = 'MarlinUltimaker'
|
|
|
30552d2 |
- if extruders > 2:
|
|
|
c668bff |
- return None
|
|
|
30552d2 |
- if heated_bed:
|
|
|
c668bff |
- name += '-HBK'
|
|
|
30552d2 |
- name += '-%d' % (baudrate)
|
|
|
30552d2 |
- if extruders > 1:
|
|
|
c668bff |
- name += '-dual'
|
|
|
c668bff |
- return resources.getPathForFirmware(name + '.hex')
|
|
|
c668bff |
-
|
|
|
30552d2 |
- if machine_type == 'ultimaker_plus':
|
|
|
30552d2 |
- name = 'MarlinUltimaker-UMOP-%d' % (baudrate)
|
|
|
30552d2 |
- if extruders > 2:
|
|
|
c668bff |
- return None
|
|
|
30552d2 |
- if extruders > 1:
|
|
|
c668bff |
- name += '-dual'
|
|
|
c668bff |
- return resources.getPathForFirmware(name + '.hex')
|
|
|
c668bff |
-
|
|
|
30552d2 |
- if machine_type == 'ultimaker2':
|
|
|
30552d2 |
- if extruders > 2:
|
|
|
c668bff |
- return None
|
|
|
30552d2 |
- if extruders > 1:
|
|
|
c668bff |
- return resources.getPathForFirmware("MarlinUltimaker2-dual.hex")
|
|
|
c668bff |
- return resources.getPathForFirmware("MarlinUltimaker2.hex")
|
|
|
30552d2 |
- if machine_type == 'ultimaker2go':
|
|
|
30552d2 |
- return resources.getPathForFirmware("MarlinUltimaker2go.hex")
|
|
|
30552d2 |
- if machine_type == 'ultimaker2extended':
|
|
|
30552d2 |
- if extruders > 2:
|
|
|
30552d2 |
- return None
|
|
|
30552d2 |
- if extruders > 1:
|
|
|
30552d2 |
- return resources.getPathForFirmware("MarlinUltimaker2extended-dual.hex")
|
|
|
30552d2 |
- return resources.getPathForFirmware("MarlinUltimaker2extended.hex")
|
|
|
30552d2 |
- if machine_type == 'Witbox':
|
|
|
c668bff |
- return resources.getPathForFirmware("MarlinWitbox.hex")
|
|
|
c668bff |
return None
|
|
|
c668bff |
|
|
|
c668bff |
class InstallFirmware(wx.Dialog):
|
|
|
30552d2 |
@@ -68,7 +27,7 @@ class InstallFirmware(wx.Dialog):
|
|
|
c668bff |
if filename is None:
|
|
|
c668bff |
filename = getDefaultFirmware(machineIndex)
|
|
|
c668bff |
if filename is None:
|
|
|
c668bff |
- 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)
|
|
|
39fb8be |
+ 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)
|
|
|
c668bff |
self.Destroy()
|
|
|
c668bff |
return
|
|
|
c668bff |
self._machine_type = profile.getMachineSetting('machine_type', machineIndex)
|
|
|
39fb8be |
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
|
|
|
30552d2 |
index 9cbb3d1..b263023 100644
|
|
|
39fb8be |
--- a/Cura/gui/mainWindow.py
|
|
|
39fb8be |
+++ b/Cura/gui/mainWindow.py
|
|
|
30552d2 |
@@ -375,7 +375,6 @@ class mainWindow(wx.Frame):
|
|
|
39fb8be |
self.splitter.SetSashPosition(self.normalSashPos, True)
|
|
|
39fb8be |
# Enabled sash
|
|
|
39fb8be |
self.splitter.SetSashSize(4)
|
|
|
39fb8be |
- self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
|
|
|
30552d2 |
if profile.getMachineSetting('machine_type').startswith('ultimaker2'):
|
|
|
39fb8be |
self.bedLevelWizardMenuItem.Enable(False)
|
|
|
39fb8be |
self.headOffsetWizardMenuItem.Enable(False)
|
|
|
30552d2 |
@@ -483,9 +482,6 @@ class mainWindow(wx.Frame):
|
|
|
39fb8be |
#Add tools for machines.
|
|
|
39fb8be |
self.machineMenu.AppendSeparator()
|
|
|
39fb8be |
|
|
|
39fb8be |
- self.defaultFirmwareInstallMenuItem = self.machineMenu.Append(-1, _("Install default firmware..."))
|
|
|
39fb8be |
- self.Bind(wx.EVT_MENU, self.OnDefaultMarlinFirmware, self.defaultFirmwareInstallMenuItem)
|
|
|
39fb8be |
-
|
|
|
39fb8be |
i = self.machineMenu.Append(-1, _("Install custom firmware..."))
|
|
|
39fb8be |
self.Bind(wx.EVT_MENU, self.OnCustomFirmware, i)
|
|
|
39fb8be |
|