Merge remote-tracking branch 'upstream/master' into master-code-fixes

plugins/USBPrinting/USBPrinterManager.py

@@ -134,35 +134,44 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension):
     def _getDefaultFirmwareName(self):
         machine_instance = Application.getInstance().getMachineManager().getActiveMachineInstance()
         machine_type = machine_instance.getMachineDefinition().getId()
-        baudrate = 250000
+        if platform.system() == "Linux":
-        if sys.platform.startswith("linux"):
+            baudrate = 115200
-                baudrate = 115200
-        if machine_type == "ultimaker_original":
-            firmware_name = "MarlinUltimaker"
-            if machine_instance.getMachineSettingValue("machine_heated_bed"): #Has heated bed upgrade kit?
-                firmware_name += "-HBK"
-            firmware_name += "-%d" % (baudrate)
-            return firmware_name + ".hex"
-        elif machine_type == "ultimaker_original_plus":
-            firmware_name = "MarlinUltimaker-UMOP-%d" % (baudrate)
-            return firmware_name + ".hex"
-        elif machine_type == "bq_witbox":
-            return "MarlinWitbox.hex"
-        elif machine_type == "ultimaker2_go":
-            return "MarlinUltimaker2go.hex"
-        elif machine_type == "ultimaker2_extended":
-            return "MarlinUltimaker2extended.hex"
-        elif machine_type == "ultimaker2":
-            return "MarlinUltimaker2.hex"
-        elif machine_type == "ultimaker2plus":
-            return "MarlinUltimaker2plus.hex"
-        elif machine_type == "ultimaker2_extended_plus":
-            return "MarlinUltimaker2extended-plus.hex"
         else:
-            Logger.log("e", "I don't know of any firmware for machine %s.", machine_type)
+            baudrate = 250000
-            raise FileNotFoundError()
+
+        # NOTE: The keyword used here is the id of the machine. You can find the id of your machine in the *.json file, eg.
+        # https://github.com/Ultimaker/Cura/blob/master/resources/machines/ultimaker_original.json#L2
+        # The *.hex files are stored at a seperate repository:
+        # https://github.com/Ultimaker/cura-binary-data/tree/master/cura/resources/firmware
+        machine_without_extras  = {"bq_witbox"                : "MarlinWitbox.hex",
+                                   "ultimaker_original"       : "MarlinUltimaker-{baudrate}.hex",
+                                   "ultimaker_original_plus"  : "MarlinUltimaker-UMOP-{baudrate}.hex",
+                                   "ultimaker2"               : "MarlinUltimaker2.hex",
+                                   "ultimaker2_go"            : "MarlinUltimaker2go.hex",
+                                   "ultimaker2plus"           : "MarlinUltimaker2plus.hex",
+                                   "ultimaker2_extended"      : "MarlinUltimaker2extended.hex",
+                                   "ultimaker2_extended_plus" : "MarlinUltimaker2extended-plus.hex",
+                                   }
+        machine_with_heated_bed = {"ultimaker_original"       : "MarlinUltimaker-HBK-{baudrate}.hex",
+                                   }
 
         ##TODO: Add check for multiple extruders
+        hex_file = None
+        if  machine_type in machine_without_extras.keys(): # The machine needs to be defined here!
+            if  machine_type in machine_with_heated_bed.keys() and machine_instance.getMachineSettingValue("machine_heated_bed"):
+                Logger.log("d", "Choosing firmware with heated bed enabled for machine %s.", machine_type)
+                hex_file = machine_with_heated_bed[machine_type] # Return firmware with heated bed enabled
+            else:
+                Logger.log("d", "Choosing basic firmware for machine %s.", machine_type)
+                hex_file = machine_without_extras[machine_type] # Return "basic" firmware
+        else:
+            Logger.log("e", "There is no firmware for machine %s.", machine_type)
+
+        if hex_file:
+            return hex_file.format(baudrate=baudrate)
+        else:
+            Logger.log("e", "Could not find any firmware for machine %s.", machine_type)
+            raise FileNotFoundError()
 
     def _addRemovePorts(self, serial_ports):
         # First, find and add all new or changed keys

resources/machines/fdmprinter.json

@@ -373,6 +373,17 @@
                                 }
                             }
                         },
+                        "wall_0_inset": {
+                            "label": "Outer Wall Inset",
+                            "description": "Inset applied to the path of the outer wall. If the outer wall is smaller than the nozzle, and printed after the inner walls, use this offset to get the hole in the nozzle to overlap with the inner walls instead of the outside of the object.",
+                            "unit": "mm",
+                            "type": "float",
+                            "default": 0.0,
+                            "inherit_function": "(machine_nozzle_size - wall_line_width_0) / 2 if wall_line_width_0 < machine_nozzle_size else 0",
+                            "min_value_warning": "0",
+                            "max_value_warning": "machine_nozzle_size",
+                            "visible": false
+                        },
                         "alternate_extra_perimeter": {
                             "label": "Alternate Extra Wall",
                             "description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.",

resources/qml/ProfileSetup.qml

@@ -74,9 +74,9 @@ Item{
                     MenuItem
                     {
                         id: item
-                        text: model_data.name
+                        text: model_data ? model_data.name : ""
                         checkable: true;
-                        checked: model_data.active;
+                        checked: model_data ? model_data.active : false;
                         exclusiveGroup: profileSelectionMenuGroup;
                         onTriggered:
                         {

resources/themes/cura/styles.qml

@@ -295,6 +295,9 @@ QtObject {
         controlBorderHighlightColor: Theme.getColor("setting_control_border_highlight");
         controlTextColor: Theme.getColor("setting_control_text");
         controlBorderWidth: Theme.getSize("default_lining").width;
+        controlDisabledColor: Theme.getColor("setting_control_disabled");
+        controlDisabledTextColor: Theme.getColor("setting_control_disabled_text");
+        controlDisabledBorderColor: Theme.getColor("setting_control_disabled_border");
         controlFont: Theme.getFont("default");
 
         validationErrorColor: Theme.getColor("setting_validation_error");

resources/themes/cura/theme.json

@@ -138,6 +138,9 @@
         "setting_control_depth_line": [127, 127, 127, 255],
         "setting_control_button": [127, 127, 127, 255],
         "setting_control_button_hover": [70, 84, 113, 255],
+        "setting_control_disabled": [245, 245, 245, 255],
+        "setting_control_disabled_text": [127, 127, 127, 255],
+        "setting_control_disabled_border": [127, 127, 127, 255],
         "setting_unit": [127, 127, 127, 255],
         "setting_validation_error": [255, 57, 14, 255],
         "setting_validation_warning": [255, 186, 15, 255],