From 2eb21e1d37bb3471f688073872910c1463e5a2da Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Wed, 26 Aug 2015 15:55:48 -0500 Subject: [PATCH 1/9] Create innovo-inventor.json This is a custom machine profile for the Innovo Inventor. --- resources/settings/innovo-inventor.json | 63 +++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 resources/settings/innovo-inventor.json diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json new file mode 100644 index 0000000000..1160e9731d --- /dev/null +++ b/resources/settings/innovo-inventor.json @@ -0,0 +1,63 @@ +{ + "id": "innovo-inventor", + "name": "Innovo INVENTOR", + "icon": "icon_ultimaker.png", + "platform": "", + "inherits": "fdmprinter.json", + "machine_settings": { + "machine_width": { + "default": 340 + }, + "machine_height": { + "default": 290 + }, + "machine_depth": { + "default": 300 + }, + "machine_center_is_zero": { + "default": false + }, + "machine_nozzle_size": { + "default": 0.4 + }, + "machine_head_shape_min_x": { + "default": 43.7 + }, + "machine_head_shape_min_y": { + "default": 19.2 + }, + "machine_head_shape_max_x": { + "default": 43.7 + }, + "machine_head_shape_max_y": { + "default": 55 + }, + "machine_nozzle_gantry_distance": { + "default": 82.3 + }, + "machine_nozzle_offset_x_1": { + "default": 0 + }, + "machine_nozzle_offset_y_1": { + "default": 15 + }, + "machine_gcode_flavor": { + "default": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" + }, + "machine_end_gcode": { + "default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" + } + }, + "categories": { + "material": { + "settings": { + "material_bed_temperature": { + "visible": false + } + } + } + } +} From 8033f7b8e538b38a2b4db50a317398f2c2a030e8 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Thu, 27 Aug 2015 12:40:33 -0500 Subject: [PATCH 2/9] Update innovo-inventor.json Updated overrides and cleaned up machine settings. --- resources/settings/innovo-inventor.json | 80 ++++++++++--------------- 1 file changed, 33 insertions(+), 47 deletions(-) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 1160e9731d..360083388b 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -5,45 +5,21 @@ "platform": "", "inherits": "fdmprinter.json", "machine_settings": { - "machine_width": { - "default": 340 - }, - "machine_height": { - "default": 290 - }, - "machine_depth": { - "default": 300 - }, - "machine_center_is_zero": { - "default": false - }, - "machine_nozzle_size": { - "default": 0.4 - }, - "machine_head_shape_min_x": { - "default": 43.7 - }, - "machine_head_shape_min_y": { - "default": 19.2 - }, - "machine_head_shape_max_x": { - "default": 43.7 - }, - "machine_head_shape_max_y": { - "default": 55 - }, - "machine_nozzle_gantry_distance": { - "default": 82.3 - }, - "machine_nozzle_offset_x_1": { - "default": 0 - }, - "machine_nozzle_offset_y_1": { - "default": 15 - }, - "machine_gcode_flavor": { - "default": "RepRap (Marlin/Sprinter)" - }, + + "machine_width": {"default": 340}, + "machine_height": {"default": 290}, + "machine_depth": {"default": 300}, + "machine_center_is_zero": {"default": false}, + "machine_nozzle_size": {"default": 0.4}, + "machine_head_shape_min_x": {"default": 43.7}, + "machine_head_shape_min_y": {"default": 19.2}, + "machine_head_shape_max_x": {"default": 43.7}, + "machine_head_shape_max_y": {"default": 55}, + "machine_nozzle_gantry_distance": {"default": 82.3}, + "machine_nozzle_offset_x_1": {"default": 0}, + "machine_nozzle_offset_y_1": {"default": 15}, + "machine_gcode_flavor": {"default": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": { "default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, @@ -51,13 +27,23 @@ "default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" } }, - "categories": { - "material": { - "settings": { - "material_bed_temperature": { - "visible": false - } - } + "overrides": { + "layer_height": { "default": 0.15 }, + "shell_thickness": { "default": 0.8}, + "wall_thickness": { "default": 0.8 }, + "top_bottom_thickness": { "default": 0.3, "visible": true }, + "material_print_temperature": { "default": 215, "visible": true }, + "material_bed_temperature": { "default": 60, "visible": true }, + "material_diameter": { "default": 1.75, "visible": true }, + "retraction_enable": { "default": true, "always_visible": true}, + "retraction_speed": { "default": 50.0, "visible": false }, + "retraction_amount": { "default": 2.5, "visible": false }, + "retraction_hop": { "default": 0.075, "visible": false }, + "speed_print": { "default": 60.0, "visible": true}, + "speed_infill": { "default": 100.0, "visible": true }, + "speed_topbottom": { "default": 30.0, "visible": true }, + "speed_travel": { "default": 150.0, "visible": true }, + "speed_layer_0": { "min_value": 0.1, "default": 30.0, "visible": true }, + "infill_overlap": { "default": 10.0 }, } - } } From 34f474a82ddb1be465b04add35fec165fe5da5c0 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Thu, 27 Aug 2015 12:47:38 -0500 Subject: [PATCH 3/9] Update innovo-inventor.json added Version --- resources/settings/innovo-inventor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 360083388b..9f549b21f3 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -1,6 +1,7 @@ { "id": "innovo-inventor", "name": "Innovo INVENTOR", + "version": 1, "icon": "icon_ultimaker.png", "platform": "", "inherits": "fdmprinter.json", From 99ff043596593db6f9c741272e7996093509de95 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Thu, 27 Aug 2015 12:48:50 -0500 Subject: [PATCH 4/9] Update innovo-inventor.json added manufacturer and author --- resources/settings/innovo-inventor.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 9f549b21f3..ab850eee16 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -1,6 +1,8 @@ { "id": "innovo-inventor", "name": "Innovo INVENTOR", + "manufacturer": "INNOVO", + "author": "AR", "version": 1, "icon": "icon_ultimaker.png", "platform": "", From 566558a564c908ebc8ba741c343cd10a0811e7f6 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Mon, 7 Sep 2015 13:38:24 -0500 Subject: [PATCH 5/9] Updated to have 4 space indents Updated all lines to include 4 space indents instead of 2. --- resources/settings/innovo-inventor.json | 57 +++++++++++-------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index ab850eee16..79434a3b5d 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -1,36 +1,31 @@ { - "id": "innovo-inventor", - "name": "Innovo INVENTOR", - "manufacturer": "INNOVO", - "author": "AR", - "version": 1, - "icon": "icon_ultimaker.png", - "platform": "", - "inherits": "fdmprinter.json", - "machine_settings": { - - "machine_width": {"default": 340}, - "machine_height": {"default": 290}, - "machine_depth": {"default": 300}, - "machine_center_is_zero": {"default": false}, - "machine_nozzle_size": {"default": 0.4}, - "machine_head_shape_min_x": {"default": 43.7}, - "machine_head_shape_min_y": {"default": 19.2}, - "machine_head_shape_max_x": {"default": 43.7}, - "machine_head_shape_max_y": {"default": 55}, - "machine_nozzle_gantry_distance": {"default": 82.3}, - "machine_nozzle_offset_x_1": {"default": 0}, - "machine_nozzle_offset_y_1": {"default": 15}, - "machine_gcode_flavor": {"default": "RepRap (Marlin/Sprinter)"}, - - "machine_start_gcode": { - "default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" + "id": "innovo-inventor", + "name": "Innovo INVENTOR", + "manufacturer": "INNOVO", + "author": "AR", + "version": 1, + "icon": "icon_ultimaker.png", + "platform": "", + "inherits": "fdmprinter.json", + "machine_settings": { + "machine_width": {"default": 340}, + "machine_height": {"default": 290}, + "machine_depth": {"default": 300}, + "machine_center_is_zero": {"default": false}, + "machine_nozzle_size": {"default": 0.4}, + "machine_head_shape_min_x": {"default": 43.7}, + "machine_head_shape_min_y": {"default": 19.2}, + "machine_head_shape_max_x": {"default": 43.7}, + "machine_head_shape_max_y": {"default": 55}, + "machine_nozzle_gantry_distance": {"default": 82.3}, + "machine_nozzle_offset_x_1": {"default": 0}, + "machine_nozzle_offset_y_1": {"default": 15}, + "machine_gcode_flavor": {"default": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": {"default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position}, + "machine_end_gcode": {"default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"}, }, - "machine_end_gcode": { - "default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" - } - }, - "overrides": { + + "overrides": { "layer_height": { "default": 0.15 }, "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8 }, From 49a29857d899e8d75eef88fa9fc7e03cb75a76a4 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Mon, 7 Sep 2015 16:23:23 -0500 Subject: [PATCH 6/9] Update innovo-inventor.json --- resources/settings/innovo-inventor.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 79434a3b5d..84b8ac2b8b 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -4,8 +4,9 @@ "manufacturer": "INNOVO", "author": "AR", "version": 1, - "icon": "icon_ultimaker.png", - "platform": "", + "icon": "", + "platform": "inventor_platform.obj", + "platform_texture": "", "inherits": "fdmprinter.json", "machine_settings": { "machine_width": {"default": 340}, From 3cbd32e0753efc482093916d84024907a8a17b74 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Mon, 7 Sep 2015 16:51:24 -0500 Subject: [PATCH 7/9] Update innovo-inventor.json changed obj to stl format. --- resources/settings/innovo-inventor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 84b8ac2b8b..022c9fc306 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -5,7 +5,7 @@ "author": "AR", "version": 1, "icon": "", - "platform": "inventor_platform.obj", + "platform": "inventor_platform.stl", "platform_texture": "", "inherits": "fdmprinter.json", "machine_settings": { From ff0e7429108ef12eea5db82c5efc9c5f7fc60db7 Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Tue, 8 Sep 2015 18:31:16 -0500 Subject: [PATCH 8/9] Fixed syntax fixed syntax, double checked with JSONLint Validator --- resources/settings/innovo-inventor.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index 022c9fc306..f16e4f7943 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -22,8 +22,8 @@ "machine_nozzle_offset_x_1": {"default": 0}, "machine_nozzle_offset_y_1": {"default": 15}, "machine_gcode_flavor": {"default": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position}, - "machine_end_gcode": {"default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"}, + "machine_start_gcode": {"default": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position"}, + "machine_end_gcode": {"default": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors"} }, "overrides": { @@ -43,6 +43,6 @@ "speed_topbottom": { "default": 30.0, "visible": true }, "speed_travel": { "default": 150.0, "visible": true }, "speed_layer_0": { "min_value": 0.1, "default": 30.0, "visible": true }, - "infill_overlap": { "default": 10.0 }, + "infill_overlap": { "default": 10.0 } } } From f18ec756da6bfe3a1e77e902eb30cc101f72beac Mon Sep 17 00:00:00 2001 From: adamarumjahn Date: Fri, 25 Sep 2015 14:29:49 -0500 Subject: [PATCH 9/9] Update innovo-inventor.json Added "machine_heated_bed": { "default": true } to agree with "material_bed_temperature": { "default": 60, "visible": true }, statement --- resources/settings/innovo-inventor.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/settings/innovo-inventor.json b/resources/settings/innovo-inventor.json index f16e4f7943..c7259bb1fc 100644 --- a/resources/settings/innovo-inventor.json +++ b/resources/settings/innovo-inventor.json @@ -12,6 +12,7 @@ "machine_width": {"default": 340}, "machine_height": {"default": 290}, "machine_depth": {"default": 300}, + "machine_heated_bed": { "default": true } "machine_center_is_zero": {"default": false}, "machine_nozzle_size": {"default": 0.4}, "machine_head_shape_min_x": {"default": 43.7},