Integrate Gcode modifications from @Sophist-UK and use the inherits feature to gather common parameters between profiles

1 files changed, 6 insertions, 50 deletions

diff --git a/resources/definitions/dagoma_discoeasy200_bicolor.def.json b/resources/definitions/dagoma_discoeasy200_bicolor.def.json
index c2716fd5c8..a28d177b93 100644
--- a/resources/definitions/dagoma_discoeasy200_bicolor.def.json
+++ b/resources/definitions/dagoma_discoeasy200_bicolor.def.json
@@ -1,7 +1,7 @@
 {
     "name": "Dagoma DiscoEasy200 Bicolor",
     "version": 2,
-    "inherits": "fdmprinter",
+    "inherits": "dagoma_disco",
     "metadata": {
         "visible": true,
         "author": "Dagoma",
@@ -19,64 +19,20 @@
         }
     },
     "overrides": {
+        "machine_name": {
+            "default_value": "Dagoma DiscoEasy200 Bicolor"
+        },
         "machine_extruder_count": {
             "default_value": 2
         },
         "machine_extruders_share_heater": {
             "default_value": true
         },
-        "machine_width": {
-            "default_value": 205
-        },
-        "machine_height": {
-            "default_value": 205
-        },
-        "machine_depth": {
-            "default_value": 205
-        },
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "machine_head_with_fans_polygon": {
-            "default_value": [
-                [-17, -70],
-                [-17, 40],
-                [17, 40],
-                [17, -70]
-            ]
-        },
-        "gantry_height": {
-            "value": "10"
-        },
         "machine_start_gcode": {
-            "default_value": "\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nG29\nM104 S{material_print_temperature_layer_0}\nM107\nG1 X100 Y20 Z0.5 F3000\nM109 S{material_print_temperature_layer_0}\nM83\nG1 E60 F3000\nG1 E10 F200\nG1 E-3 F5000\nG1 Z3 F240\nM82\nG92 E0\n"
+            "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E60 F3000 ;Reverse multi-extruder retract\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n"
         },
         "machine_end_gcode": {
-            "default_value": "\nM106 S255\nM104 S0\nM140 S0\nG91\nG1 E3 F3000\nG1 E-60 F10000\nG1 Z2 F3000\nG90\nG28 X Y\nM107\nM84\n"
-        },
-        "default_material_print_temperature": {
-            "default_value": 205
-        },
-        "speed_print": {
-            "default_value": 60
-        },
-        "retraction_amount": {
-            "default_value": 3.5
-        },
-        "retraction_speed": {
-            "default_value": 50
-        },
-        "adhesion_type": {
-            "default_value": "skirt"
-        },
-        "skirt_line_count": {
-            "default_value": 2
-        },
-        "layer_height_0": {
-            "default_value": 0.26
-        },
-        "top_bottom_thickness": {
-            "default_value": 1
+            "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200 Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200 Bicolor\n"
         }
     }
 }