From fb7930e52492f1fd44037d6cc6019aba62db4651 Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Fri, 25 Nov 2022 10:40:41 +0100 Subject: [PATCH 1/5] added machine config file and extruder config file of the biomaterial,paste and ceramic printer opensource machine project of FabLab Barcelona --- .../fablabbcn_pasteprinter.def.json | 79 +++++++++++++++++++ resources/extruders/fablabbcn_0.def.json | 15 ++++ 2 files changed, 94 insertions(+) create mode 100644 resources/definitions/fablabbcn_pasteprinter.def.json create mode 100644 resources/extruders/fablabbcn_0.def.json diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json new file mode 100644 index 0000000000..01cbd350d6 --- /dev/null +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -0,0 +1,79 @@ +{ + "version": 2, + "name": "PastePrinter", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "eduardo_chamorro", + "manufacturer": "FablabBcn", + "file_formats": "text/x-gcode", + "machine_extruder_trains": + { + "0": "fablabbcn_0" + + }, + "first_start_actions": ["MachineSettingsAction"] + }, + "overrides": { + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": ";HEADER;\nG21; Set to metric [change to G20 if you want Imperial]\nG91;Force coordinates to be absolute relative to the origin \nG1 Z10 F1000;\nG90; Force coordinates to be absolute relative to the origin\nG28 X; Home X axis\nG28 Y; Home Y axis\nG28 Z; Home Z axis\nM302 P1; Disable Cold Extrusion Checking\nG92 E0; Reset extruder to [0] zero end of cleaning run\nG91; Force coordinates to be absolute relative to the origin\nG1 Z10 F1000;\nG90;\nT0;\nM117 Printing...;ENDHEADER"}, + "machine_end_gcode": { + "default_value": ";FOOTER\nG91; relative positioning\nM107; turn off layer fan\nG1 Z50 F1000\nM400;Wait finish move\nG90; absolute positioning\nG1 X235 Y235\n;ENDFOOTER" + }, + "machine_width": {"default_value": 235 }, + "machine_depth": {"default_value": 235 }, + "machine_height": {"default_value": 235 }, + + "machine_nozzle_size":{"default_value": 3.0}, + "machine_nozzle_size":{"settable_per_extruder": false}, + + "material_diameter":{"default_value": 1.75}, + + "has_materials":{"default_value": false}, + + "material_bed_temp_wait":{"default_value": false}, + "material_print_temp_wait":{"default_value": false}, + "material_print_temp_prepend":{"default_value": false}, + "material_bed_temp_prepend":{"default_value": false}, + "machine_heated_bed": {"default_value": false}, + + "machine_nozzle_temp_enabled":{"default_value": true}, + + "machine_max_jerk_xy":{"default_value": 50.0}, + "machine_max_jerk_z":{"default_value": 50.0}, + "machine_max_jerk_e":{"default_value": 50.0}, + "layer_height":{"default_value": 1.5}, + "layer_height_0":{"default_value": 1.5}, + + "line_width":{"default_value":"machine_nozzle_size"}, + + + "wall_thickness":{"default_value": "machine_nozzle_size"}, + "wall_line_count":{"default_value": 1}, + "wall_line_width":{"default_value":"machine_nozzle_size"}, + "wall_line_width_0":{"default_value":"machine_nozzle_size"}, + "wall_line_width_x":{"default_value": "machine_nozzle_size"}, + + "skin_line_width":{"default_value":"machine_nozzle_size"}, + "infill_line_width":{"default_value": "machine_nozzle_size"}, + "roofing_line_width":{"default_value": "machine_nozzle_size"}, + "roofing_pattern":{"default_value": "concentric"}, + + "material_diameter": {"default_value": 1.75 }, + "speed_print":{"default_value": 15 }, + "retraction_enable":{"default_value": false }, + + "adhesion_type":{"default_value": "skirt" }, + "infill_pattern":{"default_value": "zigzag" }, + "top_layers":{"default_value": 2 }, + "bottom_layers":{"default_value": 2 }, + "top_bottom_pattern":{"default_value": "concentric" } + + } +} diff --git a/resources/extruders/fablabbcn_0.def.json b/resources/extruders/fablabbcn_0.def.json new file mode 100644 index 0000000000..c3b35bae2a --- /dev/null +++ b/resources/extruders/fablabbcn_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "fablabbcn_pasteprinter", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 3.0 }, + "material_diameter": { "default_value": 1.75 } + } +} From 6460960ea78424dc1dcaa49f39093e2c0cbf336b Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 11:41:22 +0100 Subject: [PATCH 2/5] updates to profile to match lintern code hightlights --- resources/definitions/fablabbcn_pasteprinter.def.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 01cbd350d6..3397903ca3 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -15,9 +15,6 @@ "first_start_actions": ["MachineSettingsAction"] }, "overrides": { - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, "machine_always_write_active_tool": { "default_value": true }, @@ -41,9 +38,6 @@ "material_print_temp_wait":{"default_value": false}, "material_print_temp_prepend":{"default_value": false}, "material_bed_temp_prepend":{"default_value": false}, - "machine_heated_bed": {"default_value": false}, - - "machine_nozzle_temp_enabled":{"default_value": true}, "machine_max_jerk_xy":{"default_value": 50.0}, "machine_max_jerk_z":{"default_value": 50.0}, @@ -51,8 +45,6 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - "line_width":{"default_value":"machine_nozzle_size"}, - "wall_thickness":{"default_value": "machine_nozzle_size"}, "wall_line_count":{"default_value": 1}, From 5cadb41b3ecf1925163d980e618858d793f11b4a Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 11:55:19 +0100 Subject: [PATCH 3/5] update machine definition to match lintern --- resources/definitions/fablabbcn_pasteprinter.def.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 3397903ca3..2bcfa70f3e 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -10,7 +10,6 @@ "machine_extruder_trains": { "0": "fablabbcn_0" - }, "first_start_actions": ["MachineSettingsAction"] }, @@ -45,16 +44,8 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - - "wall_thickness":{"default_value": "machine_nozzle_size"}, "wall_line_count":{"default_value": 1}, - "wall_line_width":{"default_value":"machine_nozzle_size"}, - "wall_line_width_0":{"default_value":"machine_nozzle_size"}, - "wall_line_width_x":{"default_value": "machine_nozzle_size"}, - "skin_line_width":{"default_value":"machine_nozzle_size"}, - "infill_line_width":{"default_value": "machine_nozzle_size"}, - "roofing_line_width":{"default_value": "machine_nozzle_size"}, "roofing_pattern":{"default_value": "concentric"}, "material_diameter": {"default_value": 1.75 }, @@ -63,8 +54,6 @@ "adhesion_type":{"default_value": "skirt" }, "infill_pattern":{"default_value": "zigzag" }, - "top_layers":{"default_value": 2 }, - "bottom_layers":{"default_value": 2 }, "top_bottom_pattern":{"default_value": "concentric" } } From 69eba9ffa2a65728b7d9c25fea9a30af6c6dc55c Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 12:07:40 +0100 Subject: [PATCH 4/5] more fixes on default values overrides --- resources/definitions/fablabbcn_pasteprinter.def.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index 2bcfa70f3e..fc765b0242 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -44,16 +44,11 @@ "layer_height":{"default_value": 1.5}, "layer_height_0":{"default_value": 1.5}, - "wall_line_count":{"default_value": 1}, - - "roofing_pattern":{"default_value": "concentric"}, - "material_diameter": {"default_value": 1.75 }, "speed_print":{"default_value": 15 }, "retraction_enable":{"default_value": false }, "adhesion_type":{"default_value": "skirt" }, - "infill_pattern":{"default_value": "zigzag" }, "top_bottom_pattern":{"default_value": "concentric" } } From 20c92c4f6bf435928c59ae6a0df56539d8e0eccc Mon Sep 17 00:00:00 2001 From: eduardo chamorro Date: Thu, 1 Dec 2022 12:19:39 +0100 Subject: [PATCH 5/5] erase overrider setting has materials --- .../fablabbcn_pasteprinter.def.json | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/resources/definitions/fablabbcn_pasteprinter.def.json b/resources/definitions/fablabbcn_pasteprinter.def.json index fc765b0242..7f3d3daab2 100644 --- a/resources/definitions/fablabbcn_pasteprinter.def.json +++ b/resources/definitions/fablabbcn_pasteprinter.def.json @@ -26,23 +26,21 @@ "machine_depth": {"default_value": 235 }, "machine_height": {"default_value": 235 }, - "machine_nozzle_size":{"default_value": 3.0}, - "machine_nozzle_size":{"settable_per_extruder": false}, + "machine_nozzle_size":{"default_value": 3.0 }, + "machine_nozzle_size":{"settable_per_extruder": false }, - "material_diameter":{"default_value": 1.75}, + "material_diameter":{"default_value": 1.75 }, - "has_materials":{"default_value": false}, + "material_bed_temp_wait":{"default_value": false }, + "material_print_temp_wait":{"default_value": false }, + "material_print_temp_prepend":{"default_value": false }, + "material_bed_temp_prepend":{"default_value": false }, - "material_bed_temp_wait":{"default_value": false}, - "material_print_temp_wait":{"default_value": false}, - "material_print_temp_prepend":{"default_value": false}, - "material_bed_temp_prepend":{"default_value": false}, - - "machine_max_jerk_xy":{"default_value": 50.0}, - "machine_max_jerk_z":{"default_value": 50.0}, - "machine_max_jerk_e":{"default_value": 50.0}, - "layer_height":{"default_value": 1.5}, - "layer_height_0":{"default_value": 1.5}, + "machine_max_jerk_xy":{"default_value": 50.0 }, + "machine_max_jerk_z":{"default_value": 50.0 }, + "machine_max_jerk_e":{"default_value": 50.0 }, + "layer_height":{"default_value": 1.5 }, + "layer_height_0":{"default_value": 1.5 }, "material_diameter": {"default_value": 1.75 }, "speed_print":{"default_value": 15 },