Merge branch 'master' of github.com:Ultimaker/Cura

cura/Settings/ExtruderManager.py

@@ -344,7 +344,7 @@ class ExtruderManager(QObject):
     #   \param key The key of the setting to retieve values for.
     #
     #   \return String representing the extruder values
-    @pyqtSlot(str, result="QList<int>")
+    @pyqtSlot(str, result="QVariant")
     def getInstanceExtruderValues(self, key):
         return ExtruderManager.getExtruderValues(key)
 

plugins/MachineSettingsAction/MachineSettingsAction.qml

@@ -147,7 +147,7 @@ Cura.MachineAction
 
                         ComboBox
                         {
-                            model: ["RepRap (Marlin/Sprinter)", "UltiGCode"]
+                            model: ["RepRap (Marlin/Sprinter)", "UltiGCode", "Repetier"]
                             currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1
                             onActivated:
                             {

plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py

@@ -398,6 +398,9 @@ class VersionUpgrade21to22(VersionUpgrade):
             if key == "retraction_combing": #Combing was made into an enum instead of a boolean.
                 new_settings[key] = "off" if (value == "False") else "all"
                 continue
+            if key == "cool_fan_full_layer": #Layer counting was made one-indexed.
+                new_settings[key] = str(int(value) + 1)
+                continue
             if key in _setting_name_translations:
                 new_settings[_setting_name_translations[key]] = value
                 continue

resources/definitions/fdmprinter.def.json

@@ -2228,10 +2228,10 @@
                             "label": "Regular Fan Speed at Layer",
                             "description": "The layer at which the fans spin on regular fan speed. If regular fan speed at height is set, this value is calculated and rounded to a whole number.",
                             "type": "int",
-                            "default_value": 1,
-                            "minimum_value": "0",
+                            "default_value": 2,
+                            "minimum_value": "1",
                             "maximum_value_warning": "100",
-                            "value": "max(0, int(math.floor((cool_fan_full_at_height - layer_height_0) / layer_height) + 1))",
+                            "value": "max(1, int(math.floor((cool_fan_full_at_height - layer_height_0) / layer_height) + 2))",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true
                         }
@@ -3307,7 +3307,7 @@
                     "type": "bool",
                     "enabled": "machine_extruder_count > 1",
                     "default_value": false,
-                    "resolve": "max(extruderValues('prime_tower_enable'))",
+                    "resolve": "any(extruderValues('prime_tower_enable'))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },

resources/definitions/kossel_mini.def.json

@@ -0,0 +1,67 @@
+{
+    "id": "kossel_mini",
+    "version": 2,
+    "name": "Kossel Mini",
+    "inherits": "fdmprinter",
+    "metadata": {
+        "visible": true,
+        "author": "Claudio Sampaio (Patola)",
+        "manufacturer": "Other",
+        "category": "Other",
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker2",
+        "platform": "kossel_platform.stl"
+    },
+
+    "overrides": {
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_width": {
+            "default_value": 170
+        },
+        "machine_height": {
+            "default_value": 200
+        },
+        "machine_depth": {
+            "default_value": 170
+        },
+        "machine_center_is_zero": {
+            "default_value": true
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "material_diameter": {
+            "default_value": 1.75
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default_value": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default_value": 2
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_disallowed_areas": {
+            "default_value": [
+                [[-34,  -85], [ -85,  -85], [-70,  -70]],
+		[[-85, -85], [-85, -34], [-70, -70]],
+                [[34,  -85], [ 85,  -85], [70,  -70]],
+		[[85, -85], [85, -34], [70, -70]],
+                [[-34,  85], [ -85,  85], [-70,  70]],
+		[[-85, 85], [-85, 34], [-70, 70]],
+                [[34,  85], [ 85,  85], [70,  70]],
+		[[85, 85], [85, 34], [70, 70]]
+            ]
+        }
+
+    }
+}