From: daid <daid303@gmail.com>
Date: Tue, 20 May 2014 11:45:35 +0000 (+0200)
Subject: Fix firmware filenames.
X-Git-Tag: 14.06~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ebbc0572b8d9735db88024607b528f1322a1f961;p=cura.git

Fix firmware filenames.
---

diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
index 02ead92b..1dcac27f 100644
--- a/Cura/gui/firmwareInstall.py
+++ b/Cura/gui/firmwareInstall.py
@@ -16,17 +16,18 @@ from Cura.util import resources
 
 def getDefaultFirmware(machineIndex = None):
 	if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker':
-		if sys.platform.startswith('linux'):
-			name = 'MarlinUltimaker-115200'
-		else:
-			name = 'MarlinUltimaker-250000'
+		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 name + '.hex'
+		return resources.getPathForFirmware(name + '.hex')
 
 	if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker2':
 		return resources.getPathForFirmware("MarlinUltimaker2.hex")