From 7651ebe5a495755328ddc7c088aeb9ae6539da8a Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 20 Jul 2024 19:36:33 +0000 Subject: [PATCH] Applied printer-linter format --- .../definitions/mingda_1000proplus.def.json | 14 +++++++------- resources/definitions/mingda_400d.def.json | 16 ++++++++-------- resources/definitions/mingda_600proplus.def.json | 16 ++++++++-------- .../definitions/mingda_base_extruder_0.def.json | 6 +++++- .../definitions/mingda_base_extruder_1.def.json | 6 +++++- .../mingda_base_400D_extruder_0.def.json | 11 ++++++----- .../mingda_base_400D_extruder_1.def.json | 11 ++++++----- .../extruders/mingda_base_extruder_1.def.json | 7 ++++--- .../mingda_base_plus_extruder_0.def.json | 7 ++++--- .../mingda_base_plus_extruder_1.def.json | 7 ++++--- .../mingda/mingda_1000proplus_0.4.inst.cfg | 1 - .../variants/mingda/mingda_400d_0.4.inst.cfg | 1 - .../mingda/mingda_600proplus_0.4.inst.cfg | 1 - .../mingda/mingda_magician_maxplus_0.4.inst.cfg | 1 - .../mingda/mingda_magician_proplus_0.4.inst.cfg | 1 - .../mingda/mingda_magician_xplus_0.4.inst.cfg | 1 - 16 files changed, 57 insertions(+), 50 deletions(-) diff --git a/resources/definitions/mingda_1000proplus.def.json b/resources/definitions/mingda_1000proplus.def.json index 000e0e5a86..19f15d22da 100644 --- a/resources/definitions/mingda_1000proplus.def.json +++ b/resources/definitions/mingda_1000proplus.def.json @@ -5,23 +5,23 @@ "metadata": { "visible": true, - "quality_definition": "mingda_base", - "preferred_variant_name": "0.4mm Nozzle", "machine_extruder_trains": { - "0": "mingda_base_plus_extruder_0", - "1": "mingda_base_plus_extruder_1" - } + "0": "mingda_base_plus_extruder_0", + "1": "mingda_base_plus_extruder_1" + }, + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "mingda_base" }, "overrides": { "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 1000 }, "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + "machine_extruder_count": { "default_value": 2 }, "machine_height": { "default_value": 1000 }, "machine_name": { "default_value": "Mingda 1000Pro+" }, "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; move z up little to prevent scratching of surface" }, - "machine_width": { "default_value": 1000 }, - "machine_extruder_count": {"default_value": 2} + "machine_width": { "default_value": 1000 } } } \ No newline at end of file diff --git a/resources/definitions/mingda_400d.def.json b/resources/definitions/mingda_400d.def.json index 2e0622241b..6c002a6cce 100644 --- a/resources/definitions/mingda_400d.def.json +++ b/resources/definitions/mingda_400d.def.json @@ -5,24 +5,24 @@ "metadata": { "visible": true, - "quality_definition": "mingda_base", - "preferred_variant_name": "0.4mm Nozzle", - "plarform": "mingda_400d_base.stl", "machine_extruder_trains": { - "0": "mingda_base_400D_extruder_0", - "1": "mingda_base_400D_extruder_1" - } + "0": "mingda_base_400D_extruder_0", + "1": "mingda_base_400D_extruder_1" + }, + "plarform": "mingda_400d_base.stl", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "mingda_base" }, "overrides": { "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 400 }, "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G28 X F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan\nM605 S1;" }, + "machine_extruder_count": { "default_value": 2 }, "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Mingda 400D" }, "machine_start_gcode": { "default_value": "G28 ; home all axes\nM605 S0; \nM420 S1;\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\nG1 E2 F200;\nG92 E0 \nG1 X54 Y20 Z0.3 F3000\n G1 X4 Y20 Z0.3 F500.0 E5 \n G1 X4 Y70.0 Z0.3 F500.0 E10 \n G1 X4 Y70.0 Z0.4 F3000.0 \n G1 X4 Y20 Z0.4 F500.0 E15 \n G1 X54 Y20 Z0.4 F500.0 E20\n G92 E0\n G1 Z5 E15 F200\n G92 E0\n G1 Z10 F1500 \n G4 S2\n G1 Z15 F1500" }, - "machine_width": { "default_value": 400 }, - "machine_extruder_count": {"default_value": 2} + "machine_width": { "default_value": 400 } } } \ No newline at end of file diff --git a/resources/definitions/mingda_600proplus.def.json b/resources/definitions/mingda_600proplus.def.json index cd4c53cc0a..6fe187b14f 100644 --- a/resources/definitions/mingda_600proplus.def.json +++ b/resources/definitions/mingda_600proplus.def.json @@ -5,24 +5,24 @@ "metadata": { "visible": true, - "quality_definition": "mingda_base", - "preferred_variant_name": "0.4mm Nozzle", - "plarform": "mingda_600proplus_base.stl", "machine_extruder_trains": { - "0": "mingda_base_plus_extruder_0", - "1": "mingda_base_plus_extruder_1" - } + "0": "mingda_base_plus_extruder_0", + "1": "mingda_base_plus_extruder_1" + }, + "plarform": "mingda_600proplus_base.stl", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "mingda_base" }, "overrides": { "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 600 }, "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + "machine_extruder_count": { "default_value": 2 }, "machine_height": { "default_value": 600 }, "machine_name": { "default_value": "Mingda 600Pro+" }, "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; move z up little to prevent scratching of surface" }, - "machine_width": { "default_value": 600 }, - "machine_extruder_count": {"default_value": 2} + "machine_width": { "default_value": 600 } } } \ No newline at end of file diff --git a/resources/definitions/mingda_base_extruder_0.def.json b/resources/definitions/mingda_base_extruder_0.def.json index 0c6c7eff4b..99355355ec 100644 --- a/resources/definitions/mingda_base_extruder_0.def.json +++ b/resources/definitions/mingda_base_extruder_0.def.json @@ -9,7 +9,11 @@ }, "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": 1}, + "extruder_nr": + { + "default_value": 0, + "maximum_value": 1 + }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, diff --git a/resources/definitions/mingda_base_extruder_1.def.json b/resources/definitions/mingda_base_extruder_1.def.json index 4a5a54729e..f94095e440 100644 --- a/resources/definitions/mingda_base_extruder_1.def.json +++ b/resources/definitions/mingda_base_extruder_1.def.json @@ -9,7 +9,11 @@ }, "overrides": { - "extruder_nr": { "default_value": 1, "maximum_value": 1}, + "extruder_nr": + { + "default_value": 1, + "maximum_value": 1 + }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, diff --git a/resources/extruders/mingda_base_400D_extruder_0.def.json b/resources/extruders/mingda_base_400D_extruder_0.def.json index f532ff084a..6644018c9d 100644 --- a/resources/extruders/mingda_base_400D_extruder_0.def.json +++ b/resources/extruders/mingda_base_400D_extruder_0.def.json @@ -9,17 +9,18 @@ }, "overrides": { - "extruder_nr": { + "extruder_nr": + { "default_value": 0, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "G1 X-61 F4800 \n M107 P0" }, "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_start_code": { "default_value": "M106 P0 F255" }, "machine_extruder_start_pos_abs": { "default_value": false }, - "machine_extruder_start_code": {"default_value": "M106 P0 F255"}, - "machine_extruder_end_code": {"default_value": "G1 X-61 F4800 \n M107 P0"}, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 } + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/mingda_base_400D_extruder_1.def.json b/resources/extruders/mingda_base_400D_extruder_1.def.json index b93723f416..909be1a7cd 100644 --- a/resources/extruders/mingda_base_400D_extruder_1.def.json +++ b/resources/extruders/mingda_base_400D_extruder_1.def.json @@ -9,17 +9,18 @@ }, "overrides": { - "extruder_nr": { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "G1 X461 F4800 \n M107 P1" }, "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_start_code": { "default_value": "M106 P1 F255" }, "machine_extruder_start_pos_abs": { "default_value": false }, - "machine_extruder_start_code": {"default_value": "M106 P1 F255"}, - "machine_extruder_end_code": {"default_value": "G1 X461 F4800 \n M107 P1"}, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 } + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/mingda_base_extruder_1.def.json b/resources/extruders/mingda_base_extruder_1.def.json index 63b6c4bce9..d6a49e62f1 100644 --- a/resources/extruders/mingda_base_extruder_1.def.json +++ b/resources/extruders/mingda_base_extruder_1.def.json @@ -9,13 +9,14 @@ }, "overrides": { - "extruder_nr": { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 } + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/mingda_base_plus_extruder_0.def.json b/resources/extruders/mingda_base_plus_extruder_0.def.json index 1d2511f575..f6e6c004a2 100644 --- a/resources/extruders/mingda_base_plus_extruder_0.def.json +++ b/resources/extruders/mingda_base_plus_extruder_0.def.json @@ -9,13 +9,14 @@ }, "overrides": { - "extruder_nr": { + "extruder_nr": + { "default_value": 0, "maximum_value": "3" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 } + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/mingda_base_plus_extruder_1.def.json b/resources/extruders/mingda_base_plus_extruder_1.def.json index 63b6c4bce9..d6a49e62f1 100644 --- a/resources/extruders/mingda_base_plus_extruder_1.def.json +++ b/resources/extruders/mingda_base_plus_extruder_1.def.json @@ -9,13 +9,14 @@ }, "overrides": { - "extruder_nr": { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 } + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/variants/mingda/mingda_1000proplus_0.4.inst.cfg b/resources/variants/mingda/mingda_1000proplus_0.4.inst.cfg index f3d199d258..0737b91bb9 100644 --- a/resources/variants/mingda/mingda_1000proplus_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_1000proplus_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 - diff --git a/resources/variants/mingda/mingda_400d_0.4.inst.cfg b/resources/variants/mingda/mingda_400d_0.4.inst.cfg index 43fe6c90e4..650aad8669 100644 --- a/resources/variants/mingda/mingda_400d_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_400d_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 - diff --git a/resources/variants/mingda/mingda_600proplus_0.4.inst.cfg b/resources/variants/mingda/mingda_600proplus_0.4.inst.cfg index dd76f3da97..119dda571b 100644 --- a/resources/variants/mingda/mingda_600proplus_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_600proplus_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 - diff --git a/resources/variants/mingda/mingda_magician_maxplus_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_maxplus_0.4.inst.cfg index 9d06207ee5..e534802bde 100644 --- a/resources/variants/mingda/mingda_magician_maxplus_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_maxplus_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 - diff --git a/resources/variants/mingda/mingda_magician_proplus_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_proplus_0.4.inst.cfg index cecf326d5e..30c3d56059 100644 --- a/resources/variants/mingda/mingda_magician_proplus_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_proplus_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 - diff --git a/resources/variants/mingda/mingda_magician_xplus_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_xplus_0.4.inst.cfg index c378b6bade..efe21e165d 100644 --- a/resources/variants/mingda/mingda_magician_xplus_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_xplus_0.4.inst.cfg @@ -11,4 +11,3 @@ type = variant [values] machine_nozzle_size = 0.4 -