Fix gcode flavors in profiles

For some printer definitions the `machine_gcode_flavor` was entered incorrectly (the display name was used rather than the flavor-key). Previously in combo boxes the flavour would default to the first key (which is "marlin"). Due to recent changes we will not default anymore to the first option, but instead show nothing. By changing the flavor to the correct key the flavors will show up correctly again.

CURA-10374

(cherry picked from commit 2181bbceb3091ce00e24bdd88e4bdcb395402f9b)

resources/definitions/abax_pri3.def.json

@@ -13,19 +13,47 @@
     },
     "overrides":
     {
-        "layer_height": { "default_value": 0.2 },
-        "layer_height_0": { "default_value": 0.2 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 220 },
-        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-        "machine_gcode_flavor": { "default_value": "RepRap" },
-        "machine_heated_bed": { "default_value": false },
-        "machine_height": { "default_value": 200 },
-        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        "machine_width": { "default_value": 225 },
-        "speed_print": { "default_value": 40 },
-        "support_enable": { "default_value": true },
-        "top_bottom_thickness": { "default_value": 1 },
-        "wall_thickness": { "value": "1" }
+        "layer_height": {
+            "default_value": 0.2
+        },
+        "layer_height_0": {
+            "default_value": 0.2
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 220
+        },
+        "machine_end_gcode": {
+            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "machine_height": {
+            "default_value": 200
+        },
+        "machine_start_gcode": {
+            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        },
+        "machine_width": {
+            "default_value": 225
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "support_enable": {
+            "default_value": true
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
+        },
+        "wall_thickness": {
+            "value": "1"
+        }
     }
 }

resources/definitions/abax_pri5.def.json

@@ -13,19 +13,47 @@
     },
     "overrides":
     {
-        "layer_height": { "default_value": 0.2 },
-        "layer_height_0": { "default_value": 0.2 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 310 },
-        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-        "machine_gcode_flavor": { "default_value": "RepRap" },
-        "machine_heated_bed": { "default_value": false },
-        "machine_height": { "default_value": 300 },
-        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        "machine_width": { "default_value": 310 },
-        "speed_print": { "default_value": 40 },
-        "support_enable": { "default_value": true },
-        "top_bottom_thickness": { "default_value": 1 },
-        "wall_thickness": { "value": "1" }
+        "layer_height": {
+            "default_value": 0.2
+        },
+        "layer_height_0": {
+            "default_value": 0.2
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 310
+        },
+        "machine_end_gcode": {
+            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "machine_height": {
+            "default_value": 300
+        },
+        "machine_start_gcode": {
+            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        },
+        "machine_width": {
+            "default_value": 310
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "support_enable": {
+            "default_value": true
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
+        },
+        "wall_thickness": {
+            "value": "1"
+        }
     }
 }

resources/definitions/abax_titan.def.json

@@ -12,19 +12,47 @@
     },
     "overrides":
     {
-        "layer_height": { "default_value": 0.2 },
-        "layer_height_0": { "default_value": 0.2 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 310 },
-        "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --" },
-        "machine_gcode_flavor": { "default_value": "RepRap" },
-        "machine_heated_bed": { "default_value": false },
-        "machine_height": { "default_value": 300 },
-        "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --" },
-        "machine_width": { "default_value": 310 },
-        "speed_print": { "default_value": 40 },
-        "support_enable": { "default_value": true },
-        "top_bottom_thickness": { "default_value": 1 },
-        "wall_thickness": { "value": "1" }
+        "layer_height": {
+            "default_value": 0.2
+        },
+        "layer_height_0": {
+            "default_value": 0.2
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 310
+        },
+        "machine_end_gcode": {
+            "default_value": "; -- END GCODE --\nM104 S0                 ;set extruder temperature to zero (turned off)\nM140 S0  ;set temp of bed to Zero  \nG91                     ;set to relative positioning\nG1 E-10 F300            ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300                 ;move X to min and Y to max \nG90                     ;set to absolute positioning\nM84                     ;turn off steppers\n; -- end of END GCODE --"
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": false
+        },
+        "machine_height": {
+            "default_value": 300
+        },
+        "machine_start_gcode": {
+            "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z5.0 F200          ;move Z to position 5.0 mm\nG92 E0                  ;zero the extruded length\n; -- end of START GCODE --"
+        },
+        "machine_width": {
+            "default_value": 310
+        },
+        "speed_print": {
+            "default_value": 40
+        },
+        "support_enable": {
+            "default_value": true
+        },
+        "top_bottom_thickness": {
+            "default_value": 1
+        },
+        "wall_thickness": {
+            "value": "1"
+        }
     }
 }

resources/definitions/arjun300.def.json

@@ -26,25 +26,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 310 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
-        "machine_extruder_count": { "default_value": 2 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 290 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjun 300" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 310
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 290
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjun 300"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 317 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/arjun_duplication.def.json

@@ -16,25 +16,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 310 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 290 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjun 300 Duplication" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 310
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 1
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 290
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjun 300 Duplication"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 158.5 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/arjun_mirrored.def.json

@@ -16,25 +16,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 310 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 290 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjun 300 Mirror" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 310
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 1
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 290
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjun 300 Mirror"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 158.5 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/arjunpro300.def.json

@@ -26,25 +26,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 300 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" },
-        "machine_extruder_count": { "default_value": 2 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 293 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjun Pro 300" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 293
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjun Pro 300"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 300 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/arjunpro_duplication.def.json

@@ -16,25 +16,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 300 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 293 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjunpro 300 Duplication" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 1
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 293
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjunpro 300 Duplication"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 120 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/arjunpro_mirrored.def.json

@@ -16,25 +16,63 @@
     },
     "overrides":
     {
-        "adhesion_type": { "default_value": "skirt" },
-        "ironing_enabled": { "default_value": true },
-        "line_width": { "value": "machine_nozzle_size" },
-        "machine_acceleration": { "default_value": 2000 },
-        "machine_center_is_zero": { "default_value": false },
-        "machine_depth": { "default_value": 300 },
-        "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" },
-        "machine_extruder_count": { "default_value": 1 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_heated_bed": { "default_value": true },
-        "machine_height": { "default_value": 293 },
-        "machine_max_feedrate_e": { "value": 150 },
-        "machine_max_feedrate_x": { "value": 300 },
-        "machine_max_feedrate_y": { "value": 300 },
-        "machine_max_feedrate_z": { "value": 15 },
-        "machine_name": { "default_value": "Arjunpro 300 Mirror" },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "machine_show_variants": { "default_value": true },
-        "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" },
+        "adhesion_type": {
+            "default_value": "skirt"
+        },
+        "ironing_enabled": {
+            "default_value": true
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "machine_acceleration": {
+            "default_value": 2000
+        },
+        "machine_center_is_zero": {
+            "default_value": false
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_end_gcode": {
+            "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"
+        },
+        "machine_extruder_count": {
+            "default_value": 1
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_heated_bed": {
+            "default_value": true
+        },
+        "machine_height": {
+            "default_value": 293
+        },
+        "machine_max_feedrate_e": {
+            "value": 150
+        },
+        "machine_max_feedrate_x": {
+            "value": 300
+        },
+        "machine_max_feedrate_y": {
+            "value": 300
+        },
+        "machine_max_feedrate_z": {
+            "value": 15
+        },
+        "machine_name": {
+            "default_value": "Arjunpro 300 Mirror"
+        },
+        "machine_nozzle_size": {
+            "default_value": 0.4
+        },
+        "machine_show_variants": {
+            "default_value": true
+        },
+        "machine_start_gcode": {
+            "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"
+        },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 120 },
         "material_diameter": { "default_value": 1.75 },

resources/definitions/atmat_signal_pro_base.def.json

@@ -129,27 +129,62 @@
         "jerk_support": { "value": "jerk_print" },
         "jerk_support_interface": { "value": "jerk_print" },
         "jerk_topbottom": { "value": "jerk_print" },
-        "jerk_travel": { "value": "jerk_layer_0" },
-        "jerk_travel_layer_0": { "value": "jerk_layer_0" },
-        "jerk_wall": { "value": "jerk_print" },
-        "jerk_wall_0": { "value": "jerk_print" },
-        "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" },
-        "line_width": { "value": "machine_nozzle_size * 1.125" },
-        "machine_acceleration": { "default_value": 1500 },
-        "machine_depth": { "default_value": 300 },
-        "machine_end_gcode": { "default_value": "M104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off\nG91\nG1 Z1 F420                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90                         ;absolute positioning\nG1 X0 Y300 F6000                              ;move the head out of the way\nM84                         ;steppers off" },
-        "machine_extruder_count": { "default_value": 2 },
-        "machine_gcode_flavor": { "default_value": "Marlin" },
-        "machine_head_with_fans_polygon":
-        {
+        "jerk_travel": {
+            "value": "jerk_layer_0"
+        },
+        "jerk_travel_layer_0": {
+            "value": "jerk_layer_0"
+        },
+        "jerk_wall": {
+            "value": "jerk_print"
+        },
+        "jerk_wall_0": {
+            "value": "jerk_print"
+        },
+        "layer_height_0": {
+            "resolve": "max(0.2, min(extruderValues('layer_height')))"
+        },
+        "line_width": {
+            "value": "machine_nozzle_size * 1.125"
+        },
+        "machine_acceleration": {
+            "default_value": 1500
+        },
+        "machine_depth": {
+            "default_value": 300
+        },
+        "machine_end_gcode": {
+            "default_value": "M104 T0 S0                     ;extruder heater off\nM104 T1 S0                     ;extruder heater off\nM140 S0                     ;heated bed heater off\nG91\nG1 Z1 F420                                        ;relative positioning\nG1 E-1 F300                            ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90                         ;absolute positioning\nG1 X0 Y300 F6000                              ;move the head out of the way\nM84                         ;steppers off"
+        },
+        "machine_extruder_count": {
+            "default_value": 2
+        },
+        "machine_gcode_flavor": {
+            "default_value": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_head_with_fans_polygon": {
             "default_value": [
-                [-35, 65],
-                [-35, -50],
-                [35, -50],
-                [35, 65]
+                [
+                    -35,
+                    65
+                ],
+                [
+                    -35,
+                    -50
+                ],
+                [
+                    35,
+                    -50
+                ],
+                [
+                    35,
+                    65
+                ]
             ]
         },
-        "machine_heated_bed": { "default_value": true },
+        "machine_heated_bed": {
+            "default_value": true
+        },
         "machine_heated_build_volume": { "default_value": true },
         "machine_height": { "default_value": 300 },
         "machine_max_acceleration_x": { "default_value": 1500 },