chiark / gitweb /
Fix firmware filenames.
authordaid <daid303@gmail.com>
Tue, 20 May 2014 11:45:35 +0000 (13:45 +0200)
committerdaid <daid303@gmail.com>
Tue, 20 May 2014 11:45:35 +0000 (13:45 +0200)
Cura/gui/firmwareInstall.py

index 02ead92b8a79fac864f40fd051882f8896c606f5..1dcac27f747f70cdc11ba51512341ba2d0a534a3 100644 (file)
@@ -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")