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