Applied printer-linter format

Ultimaker · Mar 1, 2024 · 87e1197 · 87e1197
1 parent 4a8d287
commit 87e1197
Show file tree

Hide file tree

Showing 33 changed files with 62 additions and 33 deletions.
diff --git a/resources/definitions/dagoma_sigma_pro.def.json b/resources/definitions/dagoma_sigma_pro.def.json
@@ -9,24 +9,24 @@
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
         "platform": "dagoma_sigma_pro.obj",
-        "platform_texture": "dagoma_sigma_pro.png",
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_variants": true,
-        "variants_name": "Nozzle",
         "machine_extruder_trains": { "0": "dagoma_sigma_pro_extruder" },
+        "platform_texture": "dagoma_sigma_pro.png",
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
-        "quality_definition": "dagoma_sigma_pro"
+        "quality_definition": "dagoma_sigma_pro",
+        "variants_name": "Nozzle"
     },
     "overrides":
     {
-        "machine_heated_bed": { "default_value": true },
-        "machine_name": { "default_value": "Dagoma Sigma Pro 500Z" },
-        "machine_width": { "default_value": 200 },
         "machine_depth": { "default_value": 200 },
+        "machine_end_gcode": { "default_value": ";End Gcode for {machine_name}\n;Author: Dagoma\nM104 S0\nM107 ;stop fan\nM140 S0 ;heated bed heater off (if you have it)\nG92 E0\nG1 E-55 F4600\nG27\nG90 ; Absolute positioning\nT0" },
+        "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 501 },
-        "machine_start_gcode": { "default_value": ";Start Gcode for {machine_name}\n;Author: Dagoma\n;Sliced: {date} {time}\n;Estimated print time: {print_time}\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}°C\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\nG90 ;absolute positioning\nM190 S{material_bed_temperature_layer_0};\nM109 S140;\nG1 F200 E-1.0\nM106 S255 ;Activating layers fans\nG28 ;Homing\nG29 ;Calibration\nM107 ;Off Ventilateur\nM109 S{material_print_temperature_layer_0} ;Temperature for the first layer only\nG92 E0 ;Zero the extruded length again\nG1 X0 Y-105 Z1 F3000\nG1 F{speed_travel}\nM117 Printing...\n" },
-        "machine_end_gcode": { "default_value": ";End Gcode for {machine_name}\n;Author: Dagoma\nM104 S0\nM107 ;stop fan\nM140 S0 ;heated bed heater off (if you have it)\nG92 E0\nG1 E-55 F4600\nG27\nG90 ; Absolute positioning\nT0" }
+        "machine_name": { "default_value": "Dagoma Sigma Pro 500Z" },
+        "machine_start_gcode": { "default_value": ";Start Gcode for {machine_name}\n;Author: Dagoma\n;Sliced: {date} {time}\n;Estimated print time: {print_time}\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}\u00b0C\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\nG90 ;absolute positioning\nM190 S{material_bed_temperature_layer_0};\nM109 S140;\nG1 F200 E-1.0\nM106 S255 ;Activating layers fans\nG28 ;Homing\nG29 ;Calibration\nM107 ;Off Ventilateur\nM109 S{material_print_temperature_layer_0} ;Temperature for the first layer only\nG92 E0 ;Zero the extruded length again\nG1 X0 Y-105 Z1 F3000\nG1 F{speed_travel}\nM117 Printing...\n" },
+        "machine_width": { "default_value": 200 }
     }
-}
+}
diff --git a/resources/definitions/dagoma_sigma_pro_dual.def.json b/resources/definitions/dagoma_sigma_pro_dual.def.json
@@ -9,28 +9,29 @@
         "manufacturer": "Dagoma",
         "file_formats": "text/x-gcode",
         "platform": "dagoma_sigma_pro.obj",
-        "platform_texture": "dagoma_sigma_pro.png",
         "first_start_actions": [ "MachineSettingsAction" ],
         "has_machine_quality": true,
         "has_variants": true,
-        "variants_name": "Nozzle",
-        "machine_extruder_trains": { 
+        "machine_extruder_trains":
+        {
             "0": "dagoma_sigma_pro_dual_extruder_right",
             "1": "dagoma_sigma_pro_dual_extruder_left"
         },
+        "platform_texture": "dagoma_sigma_pro.png",
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
-        "quality_definition": "dagoma_sigma_pro_dual"
+        "quality_definition": "dagoma_sigma_pro_dual",
+        "variants_name": "Nozzle"
     },
     "overrides":
     {
-        "machine_heated_bed": { "default_value": true },
-        "machine_extruder_count": { "default_value": 2 },
-        "machine_name": { "default_value": "Dagoma Sigma Pro 500Z Dual" },
-        "machine_width": { "default_value": 200 },
         "machine_depth": { "default_value": 200 },
+        "machine_end_gcode": { "default_value": ";End Gcode for {machine_name}\n;Author: Dagoma\nM104 S0\nM107 ;stop fan\nM140 S0 ;heated bed heater off (if you have it)\nG92 E0\nG1 E-55 F4600\nG27\nG90 ; Absolute positioning\nT0" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 501 },
-        "machine_start_gcode": { "default_value": ";Start Gcode for {machine_name}\n;Author: Dagoma\n;Sliced: {date} {time}\n;Estimated print time: {print_time}\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}°C\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\nG90 ;absolute positioning\nM190 S{material_bed_temperature_layer_0};\nM109 S140;\nG1 F200 E-1.0\nM106 S255 ;Activating layers fans\nG28 ;Homing\nG29 ;Calibration\nM107 ;Off Ventilateur\nM109 S{material_print_temperature_layer_0} ;Temperature for the first layer only\nG92 E0 ;Zero the extruded length again\nG1 X0 Y-105 Z1 F3000\nG1 F{speed_travel}\nM117 Printing...\n" },
-        "machine_end_gcode": { "default_value": ";End Gcode for {machine_name}\n;Author: Dagoma\nM104 S0\nM107 ;stop fan\nM140 S0 ;heated bed heater off (if you have it)\nG92 E0\nG1 E-55 F4600\nG27\nG90 ; Absolute positioning\nT0" }
+        "machine_name": { "default_value": "Dagoma Sigma Pro 500Z Dual" },
+        "machine_start_gcode": { "default_value": ";Start Gcode for {machine_name}\n;Author: Dagoma\n;Sliced: {date} {time}\n;Estimated print time: {print_time}\n;Print speed: {speed_print}mm/s\n;Layer height: {layer_height}mm\n;Wall thickness: {wall_thickness}mm\n;Infill density: {infill_sparse_density}%\n;Infill pattern: {infill_pattern}\n;Support: {support_enable}\n;Print temperature: {material_print_temperature}\u00b0C\n;Flow: {material_flow}%\n;Retraction amount: {retraction_amount}mm\n;Retraction speed: {retraction_retract_speed}mm/s\nG90 ;absolute positioning\nM190 S{material_bed_temperature_layer_0};\nM109 S140;\nG1 F200 E-1.0\nM106 S255 ;Activating layers fans\nG28 ;Homing\nG29 ;Calibration\nM107 ;Off Ventilateur\nM109 S{material_print_temperature_layer_0} ;Temperature for the first layer only\nG92 E0 ;Zero the extruded length again\nG1 X0 Y-105 Z1 F3000\nG1 F{speed_travel}\nM117 Printing...\n" },
+        "machine_width": { "default_value": 200 }
     }
-}
+}
diff --git a/resources/extruders/dagoma_sigma_pro_dual_extruder_left.def.json b/resources/extruders/dagoma_sigma_pro_dual_extruder_left.def.json
@@ -10,9 +10,9 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 1 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 },
+        "machine_extruder_end_code": { "default_value": ";END T1\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" },
         "machine_extruder_start_code": { "default_value": ";START T1\n;No temperature change\nG1 X0 Y77.5 F8000\nG92 E0\nM83\nG1 E50 F1200\nM82\nG92 E0\n" },
-        "machine_extruder_end_code": { "default_value": ";END T1\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" }
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
     }
-}
+}
diff --git a/resources/extruders/dagoma_sigma_pro_dual_extruder_right.def.json b/resources/extruders/dagoma_sigma_pro_dual_extruder_right.def.json
@@ -10,9 +10,9 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 },
+        "machine_extruder_end_code": { "default_value": ";END T0\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" },
         "machine_extruder_start_code": { "default_value": ";START T0\n;No temperature change\nG1 X0 Y77.5 F8000\nG92 E0\nM83\nG1 E50 F1200\nM82\nG92 E0\n" },
-        "machine_extruder_end_code": { "default_value": ";END T0\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" }
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
     }
-}
+}
diff --git a/resources/extruders/dagoma_sigma_pro_extruder.def.json b/resources/extruders/dagoma_sigma_pro_extruder.def.json
@@ -10,9 +10,9 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
-        "machine_nozzle_size": { "default_value": 0.4 },
-        "material_diameter": { "default_value": 1.75 },
+        "machine_extruder_end_code": { "default_value": ";END T0\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" },
         "machine_extruder_start_code": { "default_value": ";START T0\n;No temperature change\nG1 X0 Y77.5 F8000\nG92 E0\nM83\nG1 E50 F1200\nM82\nG92 E0\n" },
-        "machine_extruder_end_code": { "default_value": ";END T0\nG92 E0\nM83\nG1 E-55 F4700\nM82\nG92 E0\n" }
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
     }
-}
+}
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.1.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.1.inst.cfg
@@ -55,9 +55,9 @@ speed_wall_0 = 25
 speed_wall_x = 35.0
 speed_z_hop = 120
 support_enable = False
+support_structure = tree
 support_tree_angle = 55
 support_tree_top_rate = =30 if support_roof_enable else 10
-support_structure = tree
 switch_extruder_extra_prime_amount = 0
 switch_extruder_prime_speed = 20
 switch_extruder_retraction_amount = 80
@@ -71,3 +71,4 @@ wall_0_material_flow_layer_0 = 85
 wall_thickness = 0.8
 wall_transition_length = 0.4
 wall_x_material_flow_layer_0 = 90
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.2.inst.cfg
@@ -71,3 +71,4 @@ wall_0_material_flow_layer_0 = 85
 wall_thickness = 1.2
 wall_transition_length = 0.4
 wall_x_material_flow_layer_0 = 90
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.3.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.4_pla_h0.3.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.4.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.4.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.6.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_brass_0.8_pla_h0.6.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.1.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.1.inst.cfg
@@ -72,3 +72,4 @@ wall_0_material_flow_layer_0 = 85
 wall_thickness = 1.2
 wall_transition_length = 0.4
 wall_x_material_flow_layer_0 = 90
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.2.inst.cfg
@@ -72,3 +72,4 @@ wall_0_material_flow_layer_0 = 85
 wall_thickness = 1.2
 wall_transition_length = 0.4
 wall_x_material_flow_layer_0 = 90
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.3.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.4_pla_h0.3.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.4.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.4.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.6.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_brass_0.8_pla_h0.6.inst.cfg
@@ -12,3 +12,4 @@ variant = Brass 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.1.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.1.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.3.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.4_pla_h0.3.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.4.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.4.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.6.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_dual_steel_0.8_pla_h0.6.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.1.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.1.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.3.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.4_pla_h0.3.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.4mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.2.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.2.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.4.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.4.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.6.inst.cfg b/resources/quality/dagoma/dagoma_sigma_pro_steel_0.8_pla_h0.6.inst.cfg
@@ -12,3 +12,4 @@ variant = Steel 0.8mm
 weight = 1
 
 [values]
+
diff --git a/resources/variants/dagoma/dagoma_sigma_pro_brass_0.8.inst.cfg b/resources/variants/dagoma/dagoma_sigma_pro_brass_0.8.inst.cfg
@@ -11,3 +11,4 @@ type = variant
 [values]
 machine_nozzle_id = Brass 0.8mm
 machine_nozzle_size = 0.8
+
diff --git a/resources/variants/dagoma/dagoma_sigma_pro_dual_brass_0.8.inst.cfg b/resources/variants/dagoma/dagoma_sigma_pro_dual_brass_0.8.inst.cfg
@@ -11,3 +11,4 @@ type = variant
 [values]
 machine_nozzle_id = Brass 0.8mm
 machine_nozzle_size = 0.8
+
diff --git a/resources/variants/dagoma/dagoma_sigma_pro_dual_steel_0.8.inst.cfg b/resources/variants/dagoma/dagoma_sigma_pro_dual_steel_0.8.inst.cfg
@@ -11,3 +11,4 @@ type = variant
 [values]
 machine_nozzle_id = Steel 0.8mm
 machine_nozzle_size = 0.8
+
diff --git a/resources/variants/dagoma/dagoma_sigma_pro_steel_0.8.inst.cfg b/resources/variants/dagoma/dagoma_sigma_pro_steel_0.8.inst.cfg
@@ -11,3 +11,4 @@ type = variant
 [values]
 machine_nozzle_id = Steel 0.8mm
 machine_nozzle_size = 0.8
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,3 +71,4 @@ wall_0_material_flow_layer_0 = 85
		wall_thickness = 1.2
		wall_transition_length = 0.4
		wall_x_material_flow_layer_0 = 90
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ variant = Brass 0.4mm
		weight = 1

		[values]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ variant = Brass 0.8mm
		weight = 1

		[values]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,3 +72,4 @@ wall_0_material_flow_layer_0 = 85
		wall_thickness = 1.2
		wall_transition_length = 0.4
		wall_x_material_flow_layer_0 = 90
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ variant = Steel 0.4mm
		weight = 1

		[values]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ variant = Steel 0.8mm
		weight = 1

		[values]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ type = variant
		[values]
		machine_nozzle_id = Brass 0.8mm
		machine_nozzle_size = 0.8