From 5d6d233eccf399f5a544cf3491b00a5d3f0d5f4a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 1 Apr 2017 15:08:15 +0200 Subject: [PATCH 01/11] Add definition for Peopoly Moai SLA printer --- resources/definitions/peopoly_moai.def.json | 49 +++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 resources/definitions/peopoly_moai.def.json diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json new file mode 100644 index 0000000000..668b11519b --- /dev/null +++ b/resources/definitions/peopoly_moai.def.json @@ -0,0 +1,49 @@ +{ + "id": "peopoly_moai", + "version": 2, + "name": "Moai", + "inherits": "ultimaker", + "metadata": { + "visible": true, + "author": "Aldo Hoeben", + "manufacturer": "Peopoly", + "category": "Other", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": false + }, + + "overrides": { + "machine_name": { "default_value": "Moai" }, + "machine_width": { + "default_value": 130 + }, + "machine_height": { + "default_value": 180 + }, + "machine_depth": { + "default_value": 130 + }, + "machine_nozzle_size": { + "default_value": 0.067 + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -20, 10 ], + [ -20, -10 ], + [ 10, 10 ], + [ 10, -10 ] + ] + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" + } + } +} From ae19a101fd3547c26f25ce18f061f10e844b2116 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 1 Apr 2017 15:10:05 +0200 Subject: [PATCH 02/11] Disable a number of features that are not compatible with SLA printing --- resources/definitions/peopoly_moai.def.json | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 668b11519b..bf84eee0a5 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -44,6 +44,42 @@ }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" + }, + + "print_sequence": { + "enabled": false + }, + "support_enable": { + "enabled": false + }, + "machine_nozzle_temp_enabled": { + "value": "False" + }, + "material_bed_temperature": { + "enabled": false + }, + "material_diameter": { + "enabled": false + }, + "cool_fan_enabled": { + "enabled": false, + "value": "False" + }, + "retraction_enable": { + "enabled": false, + "value": "False" + }, + "retract_at_layer_change": { + "enabled": false + }, + "cool_min_layer_time_fan_speed_max": { + "enabled": false + }, + "cool_fan_full_at_height": { + "enabled": false + }, + "cool_fan_full_layer": { + "enabled": false } } } From a904c383ea8c6854dce7c8a27883c1636cb92dbf Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 1 Apr 2017 15:29:01 +0200 Subject: [PATCH 03/11] Add Moai-specific "Normal" profile --- resources/definitions/peopoly_moai.def.json | 12 ++++++++-- .../peopoly_moai/peopoly_moai_normal.inst.cfg | 23 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index bf84eee0a5..b636ce26fc 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -46,6 +46,9 @@ "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" }, + "acceleration_enabled": { + "value": "False" + }, "print_sequence": { "enabled": false }, @@ -59,7 +62,8 @@ "enabled": false }, "material_diameter": { - "enabled": false + "enabled": false, + "value": "1.75" }, "cool_fan_enabled": { "enabled": false, @@ -68,7 +72,11 @@ "retraction_enable": { "enabled": false, "value": "False" - }, + }, + "retraction_combing": { + "enabled": false, + "value": "'off'" + }, "retract_at_layer_change": { "enabled": false }, diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg new file mode 100644 index 0000000000..6c52785671 --- /dev/null +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 2 +name = Normal Quality +definition = peopoly_moai + +[metadata] +type = quality +weight = 0 +quality_type = normal + +[values] +infill_sparse_density = 50 +layer_height_0 = 0.1 +top_bottom_thickness = 0.4 +wall_thickness = 0.4 +speed_layer_0 = 5 +speed_print = 100 +speed_slowdown_layers = 2 +speed_topbottom = 100 +speed_travel = 300 +speed_travel_layer_0 = 300 +speed_wall = 100 +speed_wall_x = 100 From a2a6fb47f9419a35340075a61612d0e773d9b2ab Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 1 Apr 2017 15:37:53 +0200 Subject: [PATCH 04/11] Silence some value warnings --- resources/definitions/peopoly_moai.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index b636ce26fc..62c8ec7c99 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -46,6 +46,19 @@ "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" }, + "layer_height": { + "maximum_value_warning": "0.5" + }, + "layer_height_0": { + "maximum_value_warning": "0.5" + }, + "top_bottom_thickness": { + "minimum_value_warning": "0.1" + }, + "infill_sparse_thickness": { + "maximum_value_warning": "0.5" + }, + "acceleration_enabled": { "value": "False" }, From 164d172e2eee25a64451ab6fb11fc184d77a8ecd Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 1 Apr 2017 15:47:42 +0200 Subject: [PATCH 05/11] Code style --- resources/definitions/peopoly_moai.def.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 62c8ec7c99..29a17f4829 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -5,7 +5,7 @@ "inherits": "ultimaker", "metadata": { "visible": true, - "author": "Aldo Hoeben", + "author": "fieldOfView", "manufacturer": "Peopoly", "category": "Other", "file_formats": "text/x-gcode", @@ -47,16 +47,16 @@ }, "layer_height": { - "maximum_value_warning": "0.5" + "maximum_value_warning": "0.5" }, "layer_height_0": { - "maximum_value_warning": "0.5" + "maximum_value_warning": "0.5" }, "top_bottom_thickness": { - "minimum_value_warning": "0.1" + "minimum_value_warning": "0.1" }, "infill_sparse_thickness": { - "maximum_value_warning": "0.5" + "maximum_value_warning": "0.5" }, "acceleration_enabled": { @@ -83,12 +83,12 @@ "value": "False" }, "retraction_enable": { - "enabled": false, + "enabled": false, "value": "False" }, "retraction_combing": { - "enabled": false, - "value": "'off'" + "enabled": false, + "value": "'off'" }, "retract_at_layer_change": { "enabled": false From a8fffd45a0b88a66d0b1ccfca56ebcd1020a86af Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 6 Apr 2017 12:00:49 +0200 Subject: [PATCH 06/11] Add High and Maximum Quality profiles --- .../peopoly_moai/peopoly_moai_high.inst.cfg | 24 +++++++++++++++++++ .../peopoly_moai/peopoly_moai_max.inst.cfg | 24 +++++++++++++++++++ .../peopoly_moai/peopoly_moai_normal.inst.cfg | 3 ++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg create mode 100644 resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg new file mode 100644 index 0000000000..789e383b19 --- /dev/null +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 2 +name = High Quality +definition = peopoly_moai + +[metadata] +type = quality +weight = 1 +quality_type = high + +[values] +infill_sparse_density = 70 +layer_height = 0.05 +layer_height_0 = 0.1 +top_bottom_thickness = 0.4 +wall_thickness = 0.4 +speed_layer_0 = 5 +speed_print = 150 +speed_slowdown_layers = 2 +speed_topbottom = 150 +speed_travel = 300 +speed_travel_layer_0 = 300 +speed_wall = 150 +speed_wall_x = 150 diff --git a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg new file mode 100644 index 0000000000..f622511715 --- /dev/null +++ b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 2 +name = Maximum Quality +definition = peopoly_moai + +[metadata] +type = quality +weight = 2 +quality_type = extra_high + +[values] +infill_sparse_density = 70 +layer_height = 0.025 +layer_height_0 = 0.1 +top_bottom_thickness = 0.4 +wall_thickness = 0.4 +speed_layer_0 = 5 +speed_print = 200 +speed_slowdown_layers = 2 +speed_topbottom = 200 +speed_travel = 300 +speed_travel_layer_0 = 300 +speed_wall = 200 +speed_wall_x = 200 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 6c52785671..890c73d7e6 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -9,7 +9,8 @@ weight = 0 quality_type = normal [values] -infill_sparse_density = 50 +infill_sparse_density = 70 +layer_height = 0.1 layer_height_0 = 0.1 top_bottom_thickness = 0.4 wall_thickness = 0.4 From b4698d9ec28164b2cd2cc6a76dc1d5cf10734095 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 6 Apr 2017 12:54:19 +0200 Subject: [PATCH 07/11] Adjust minimum/maximum warning values --- resources/definitions/peopoly_moai.def.json | 44 +++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 29a17f4829..63d7a4318b 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -1,7 +1,7 @@ { "id": "peopoly_moai", "version": 2, - "name": "Moai", + "name": "Peopoly Moai", "inherits": "ultimaker", "metadata": { "visible": true, @@ -46,11 +46,31 @@ "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" }, + "line_width": { + "minimum_value_warning": "machine_nozzle_size" + }, + "wall_line_width": { + "minimum_value_warning": "machine_nozzle_size" + }, + "wall_line_width_x": { + "minimum_value_warning": "machine_nozzle_size" + }, + "skin_line_width": { + "minimum_value_warning": "machine_nozzle_size" + }, + "infill_line_width": { + "minimum_value_warning": "machine_nozzle_size" + }, + "skirt_brim_line_width": { + "minimum_value_warning": "machine_nozzle_size" + }, "layer_height": { - "maximum_value_warning": "0.5" + "maximum_value_warning": "0.5", + "minimum_value_warning": "0.02" }, "layer_height_0": { - "maximum_value_warning": "0.5" + "maximum_value_warning": "0.5", + "minimum_value_warning": "0.02" }, "top_bottom_thickness": { "minimum_value_warning": "0.1" @@ -58,6 +78,24 @@ "infill_sparse_thickness": { "maximum_value_warning": "0.5" }, + "speed_print": { + "maximum_value_warning": "300" + }, + "speed_infill": { + "maximum_value_warning": "300" + }, + "speed_wall": { + "maximum_value_warning": "300" + }, + "speed_wall_0": { + "maximum_value_warning": "300" + }, + "speed_wall_x": { + "maximum_value_warning": "300" + }, + "speed_topbottom": { + "maximum_value_warning": "300" + }, "acceleration_enabled": { "value": "False" From 7adc904cf1dda62a5a4c2a471befc60c5eae3a2c Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 6 Apr 2017 13:17:24 +0200 Subject: [PATCH 08/11] Remove absolute value warnings by moving some values to the machine definition --- resources/definitions/peopoly_moai.def.json | 28 +++++++++++++++---- .../peopoly_moai/peopoly_moai_high.inst.cfg | 8 ------ .../peopoly_moai/peopoly_moai_max.inst.cfg | 8 ------ .../peopoly_moai/peopoly_moai_normal.inst.cfg | 8 ------ 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 63d7a4318b..5cff33a791 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -14,7 +14,9 @@ }, "overrides": { - "machine_name": { "default_value": "Moai" }, + "machine_name": { + "default_value": "Moai" + }, "machine_width": { "default_value": 130 }, @@ -70,7 +72,8 @@ }, "layer_height_0": { "maximum_value_warning": "0.5", - "minimum_value_warning": "0.02" + "minimum_value_warning": "0.02", + "value": "0.1" }, "top_bottom_thickness": { "minimum_value_warning": "0.1" @@ -85,16 +88,31 @@ "maximum_value_warning": "300" }, "speed_wall": { - "maximum_value_warning": "300" + "maximum_value_warning": "300", + "value": "speed_print" }, "speed_wall_0": { "maximum_value_warning": "300" }, "speed_wall_x": { - "maximum_value_warning": "300" + "maximum_value_warning": "300", + "value": "speed_print" }, "speed_topbottom": { - "maximum_value_warning": "300" + "maximum_value_warning": "300", + "value": "speed_print" + }, + "speed_travel": { + "value": "300" + }, + "speed_travel_layer_0": { + "value": "300" + }, + "speed_layer_0": { + "value": "5" + }, + "speed_slowdown_layers": { + "value": "2" }, "acceleration_enabled": { diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 789e383b19..27848d4301 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -11,14 +11,6 @@ quality_type = high [values] infill_sparse_density = 70 layer_height = 0.05 -layer_height_0 = 0.1 top_bottom_thickness = 0.4 wall_thickness = 0.4 -speed_layer_0 = 5 speed_print = 150 -speed_slowdown_layers = 2 -speed_topbottom = 150 -speed_travel = 300 -speed_travel_layer_0 = 300 -speed_wall = 150 -speed_wall_x = 150 diff --git a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg index f622511715..253070569f 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_max.inst.cfg @@ -11,14 +11,6 @@ quality_type = extra_high [values] infill_sparse_density = 70 layer_height = 0.025 -layer_height_0 = 0.1 top_bottom_thickness = 0.4 wall_thickness = 0.4 -speed_layer_0 = 5 speed_print = 200 -speed_slowdown_layers = 2 -speed_topbottom = 200 -speed_travel = 300 -speed_travel_layer_0 = 300 -speed_wall = 200 -speed_wall_x = 200 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 890c73d7e6..c4ff8360fa 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -11,14 +11,6 @@ quality_type = normal [values] infill_sparse_density = 70 layer_height = 0.1 -layer_height_0 = 0.1 top_bottom_thickness = 0.4 wall_thickness = 0.4 -speed_layer_0 = 5 speed_print = 100 -speed_slowdown_layers = 2 -speed_topbottom = 100 -speed_travel = 300 -speed_travel_layer_0 = 300 -speed_wall = 100 -speed_wall_x = 100 From f064500ed58d9a3dad9f11f94bdf895c601bc37f Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 10 Apr 2017 14:59:11 +0200 Subject: [PATCH 09/11] Don't inherit from Ultimaker printers --- resources/definitions/peopoly_moai.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 5cff33a791..01396f26b3 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -2,7 +2,6 @@ "id": "peopoly_moai", "version": 2, "name": "Peopoly Moai", - "inherits": "ultimaker", "metadata": { "visible": true, "author": "fieldOfView", From 24211624e618ec37446acfd1e3fcbd3165bc6d95 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 11 Apr 2017 10:34:52 +0200 Subject: [PATCH 10/11] Added inherits fdmprinter for Peopoly Moai. CURA-3665 --- resources/definitions/peopoly_moai.def.json | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 resources/definitions/peopoly_moai.def.json diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json old mode 100644 new mode 100755 index 01396f26b3..9c01ca95e4 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -2,6 +2,7 @@ "id": "peopoly_moai", "version": 2, "name": "Peopoly Moai", + "inherits": "fdmprinter", "metadata": { "visible": true, "author": "fieldOfView", From 4c1199d75cbfed12bb68f1cb787dbfff9181e3ea Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 11 Apr 2017 10:35:25 +0200 Subject: [PATCH 11/11] Revert permissions on file. CURA-3665 --- resources/definitions/peopoly_moai.def.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 resources/definitions/peopoly_moai.def.json diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json old mode 100755 new mode 100644