Use initial layer settings during start g-code

Fixes #8364.

8 files changed, 8 insertions, 8 deletions

diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json
index f939dcfc34..ff8badd355 100644
--- a/resources/definitions/tronxy_d01.def.json
+++ b/resources/definitions/tronxy_d01.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 30 },
 
-        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" },
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y220.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y220.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" },
 
         "machine_max_feedrate_x": { "value": 150 },
         "machine_max_feedrate_y": { "value": 150 },
diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json
index 54a8d50432..99be1152af 100644
--- a/resources/definitions/tronxy_x.def.json
+++ b/resources/definitions/tronxy_x.def.json
@@ -24,7 +24,7 @@
     },
     "overrides": {
         "machine_name": { "default_value": "Tronxy Base Printer" },
-        "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel}\nG0 E3 F200\nG92 E0\n" },
+        "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel_layer_0}\nG0 E3 F200\nG92 E0\n" },
         "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" },
 
         "machine_max_feedrate_x": { "value": 100 },
diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json
index 89a093de13..0e70dd72b4 100644
--- a/resources/definitions/tronxy_x5sa.def.json
+++ b/resources/definitions/tronxy_x5sa.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 40 },
 
-        "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_start_gcode": { "default_value": "; X5SA Pro Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"},
         "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y0\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" }
     }
 }
diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json
index 26c64807c6..5604b17619 100644
--- a/resources/definitions/tronxy_x5sa_400.def.json
+++ b/resources/definitions/tronxy_x5sa_400.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 40 },
 
-        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"},
+        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y370.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y370.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish"},
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" },
 
         "machine_max_feedrate_x": { "value": 100 },
diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json
index 2856e09181..b68a954115 100644
--- a/resources/definitions/tronxy_x5sa_500.def.json
+++ b/resources/definitions/tronxy_x5sa_500.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 40 },
 
-        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n "},
+        "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n "},
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 \nG1 E-2 Z0.2 F2400 \nG1 X5 Y5 F3000\nG1 Z10\nG90\n\nG1 X0 Y0 \nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E \n" },
 
         "machine_max_feedrate_x": { "value": 150 },
diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json
index 15f0f11f26..eaae1dbb08 100644
--- a/resources/definitions/tronxy_xy2.def.json
+++ b/resources/definitions/tronxy_xy2.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 40 },
 
-        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"},
         "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0 ;Turn-off fan\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
 
         "machine_max_feedrate_x": { "value": 100 },
diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json
index 6e771fafd3..59e727bbb0 100644
--- a/resources/definitions/tronxy_xy2pro.def.json
+++ b/resources/definitions/tronxy_xy2pro.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 40 },
 
-        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"},
         "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
 
         "machine_max_feedrate_x": { "value": 100 },
diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json
index 5e0ada7916..db03c344f5 100644
--- a/resources/definitions/tronxy_xy3.def.json
+++ b/resources/definitions/tronxy_xy3.def.json
@@ -22,7 +22,7 @@
         },
         "gantry_height": { "value": 30 },
 
-        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n"},
+        "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\n"},
         "machine_end_gcode": { "default_value": "G91\nG1 E-2 F3000\nG1 E-2 Z0.2 F1200\nG1 X5 Y5 F3600\nG1 Z10\nG90\nG1 X0 Y{machine_depth}\nM106 S0\nM104 S0\nM140 S0\n\nM84 X Y E\n" },
 
         "machine_max_feedrate_x": { "value": 100 },