From 05b4689bd6e34a3c5eb792020eac94be1be260d4 Mon Sep 17 00:00:00 2001
From: orel Windows <aurelien.gibaud@gmail.com>
Date: Wed, 15 Nov 2017 11:39:54 +0100
Subject: [PATCH 1/2] Improve discoeasy200 profile, especially the machine
 gcode start as it uses 'print_temperature' which is an invalid Cura setting.

---
 .../definitions/dagoma_discoeasy200.def.json  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json
index 8f1a792bc0..ef9a6084c8 100644
--- a/resources/definitions/dagoma_discoeasy200.def.json
+++ b/resources/definitions/dagoma_discoeasy200.def.json
@@ -8,7 +8,7 @@
         "author": "Dagoma",
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
-        "icon": "icon_ultimaker2.png",
+        "icon": "icon_discoeasy200.png",
         "platform": "discoeasy200.stl",
         "platform_offset": [ 105, -59, 280]
     },
@@ -30,24 +30,23 @@
         },
         "machine_head_with_fans_polygon": {
             "default_value": [
-                [16, 37],
-                [16, -65],
-                [-16, -65],
-                [16, 37]
+                [17, 70],
+                [17, -40],
+                [-17, -40],
+                [17, 70]
             ]
         },
         "gantry_height": {
-            "default_value": 55
-        },
-        "machine_gcode_flavor": {
-            "default_value": "RepRap"
+            "default_value": 10
         },
         "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90   ;absolute positioning\nM106 S250 ;fan on for the palpeur\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{print_temperature}\n;Activation palpeur\n;bloc palpeur\nG29 ;Auto level\nM107 ;start with the fan off\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{print_temperature}\nM140 S{material_bed_temperature}\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z3\nG1 F3000\n"
+            "default_value": ";Gcode by Cura\nG90   ;absolute positioning\nM106 S250 ;fan on for the palpeur\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{material_initial_print_temperature}\n;Activation palpeur\n;bloc palpeur\nG29 ;Auto level\nM107 ;start with the fan off\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_initial_print_temperature}\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z3\nG1 F6000"
         },
         "machine_end_gcode": {
-            "default_value": "\nM104 S0\nM106 S255   ;start fan full power\nM140 S0   ;heated bed heater off (if you have it)\n;Home machine\nG91   ;relative positioning\nG1 E-1 F{retraction_speed} ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+3 F3000  ;move Z up a bit and retract filament even more\nG90\nG28 X Y\n;Ventilation forcee\nM107    ;stop fan\n;Shut down motor\nM84   ;shut down motors\n"
+            "default_value": "M104 S0\nM106 S255   ;start fan full power\nM140 S0   ;heated bed heater off (if you have it)\n;Home machine\nG91   ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+3 F3000  ;move Z up a bit and retract filament even more\nG90\nG28 X Y\n;Ventilation forcee\nM107    ;stop fan\n;Shut down motor\nM84   ;shut down motors"
+        },
+        "material_diameter": {
+            "default_value": 1.75
         }
     }
 }
-

From 565574a18365089cd47ffa5e814a46dd2837cf7d Mon Sep 17 00:00:00 2001
From: orel Windows <aurelien.gibaud@gmail.com>
Date: Mon, 20 Nov 2017 10:59:57 +0100
Subject: [PATCH 2/2] Replace the print temperature setting used in gstart code
 as layer 0 print temperature seems more relevant.

---
 resources/definitions/dagoma_discoeasy200.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json
index ef9a6084c8..3b62ff042f 100644
--- a/resources/definitions/dagoma_discoeasy200.def.json
+++ b/resources/definitions/dagoma_discoeasy200.def.json
@@ -40,7 +40,7 @@
             "default_value": 10
         },
         "machine_start_gcode": {
-            "default_value": ";Gcode by Cura\nG90   ;absolute positioning\nM106 S250 ;fan on for the palpeur\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{material_initial_print_temperature}\n;Activation palpeur\n;bloc palpeur\nG29 ;Auto level\nM107 ;start with the fan off\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_initial_print_temperature}\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z3\nG1 F6000"
+            "default_value": ";Gcode by Cura\nG90   ;absolute positioning\nM106 S250 ;fan on for the palpeur\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{material_print_temperature_layer_0}\n;Activation palpeur\n;bloc palpeur\nG29 ;Auto level\nM107 ;start with the fan off\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z3\nG1 F6000"
         },
         "machine_end_gcode": {
             "default_value": "M104 S0\nM106 S255   ;start fan full power\nM140 S0   ;heated bed heater off (if you have it)\n;Home machine\nG91   ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+3 F3000  ;move Z up a bit and retract filament even more\nG90\nG28 X Y\n;Ventilation forcee\nM107    ;stop fan\n;Shut down motor\nM84   ;shut down motors"