From 33e3dea2130bd765442015540e921bdb488bee2e Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 15 Jan 2017 03:41:07 +0100 Subject: [PATCH 1/7] Create renkforce_rf100.def.json --- .../definitions/renkforce_rf100.def.json | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 resources/definitions/renkforce_rf100.def.json diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json new file mode 100644 index 0000000000..8e7086836a --- /dev/null +++ b/resources/definitions/renkforce_rf100.def.json @@ -0,0 +1,87 @@ +{ + "id": "RF100", + "version": 2, + "name": "Renkforce RF100", + "inherits": "fdmprinter", + "metadata": { + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", + "category": "Other", + "file_formats": "text/x-gcode", + "manufacturer": "Renkforce", + "platform_offset": [0, 0, 0], + "visible": true + }, + + "overrides": { + "adhesion_type": { + "default_value": "skirt" + }, + "bottom_thickness": { + "default_value": 0 + }, + "infill_sparse_density": { + "default_value": 15 + }, + "machine_depth": { + "default_value": 100 + }, + "machine_end_gcode": { + "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_height": { + "default_value": 100 + }, + "machine_name": { + "default_value": "Renkforce RF100" + }, + "machine_start_gcode": { + "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing..." + }, + "machine_width": { + "default_value": 100 + }, + "material_diameter": { + "default_value": 1.75 + }, + "retraction_amount": { + "default_value": 2 + }, + "speed_layer_0": { + "default_value": 30 + }, + "speed_topbottom": { + "default_value": 30 + }, + "speed_travel": { + "default_value": 50 + }, + "speed_wall_0": { + "default_value": 25 + }, + "speed_wall_x": { + "default_value": 35 + }, + "support_xy_distance": { + "default_value": 0 + }, + "support_z_distance": { + "default_value": 0.1 + }, + "top_thickness": { + "default_value": 0.5 + } + }, + + "categories": { + "material": { + "settings": { + "material_bed_temperature": { + "visible": false + } + } + } + } +} From 86c631de265c96a81c0ed6066b958ad0705dc6c4 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 15 Jan 2017 12:27:02 +0100 Subject: [PATCH 2/7] Carry over all settings from ini and correct brand spelling --- .../definitions/renkforce_rf100.def.json | 192 ++++++++++++++++-- 1 file changed, 180 insertions(+), 12 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 8e7086836a..c8313c64d0 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -1,13 +1,13 @@ { "id": "RF100", "version": 2, - "name": "Renkforce RF100", + "name": "renkforce RF100", "inherits": "fdmprinter", "metadata": { "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", "category": "Other", "file_formats": "text/x-gcode", - "manufacturer": "Renkforce", + "manufacturer": "renkforce", "platform_offset": [0, 0, 0], "visible": true }, @@ -17,10 +17,52 @@ "default_value": "skirt" }, "bottom_thickness": { - "default_value": 0 + "default_value": 0.5 + }, + "brim_line_count": { + "default_value": 20.0 + }, + "cool_fan_enabled": { + "default_value": true + }, + "cool_fan_full_at_height": { + "default_value": 0.5 + }, + "cool_fan_speed_max": { + "default_value": 100.0 + }, + "cool_fan_speed_min": { + "default_value": 100.0 + }, + "cool_lift_head": { + "default_value": true + }, + "cool_min_layer_time": { + "default_value": 5.0 + }, + "cool_min_speed": { + "default_value": 10.0 + }, + "infill_before_walls": { + "default_value": 1.0 + }, + "infill_overlap": { + "default_value": 15.0 }, "infill_sparse_density": { - "default_value": 15 + "default_value": 15.0 + }, + "layer_0_z_overlap": { + "default_value": 0.22 + }, + "layer_height": { + "default_value": 0.1 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "line_width": { + "default_value": 0.4 }, "machine_depth": { "default_value": 100 @@ -35,7 +77,10 @@ "default_value": 100 }, "machine_name": { - "default_value": "Renkforce RF100" + "default_value": "renkforce RF100" + }, + "machine_nozzle_size": { + "default_value": 0.4 }, "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing..." @@ -43,35 +88,158 @@ "machine_width": { "default_value": 100 }, + "magic_mesh_surface_mode": { + "default_value": "surface" + }, + "magic_spiralize": { + "default_value": true + }, + "material_bed_temperature": { + "default_value": 70.0 + }, "material_diameter": { "default_value": 1.75 }, + "material_flow": { + "default_value": 100.0 + }, + "material_print_temperature": { + "default_value": 210.0 + }, + "meshfix_extensive_stitching": { + "default_value": true + }, + "meshfix_keep_open_polygons": { + "default_value": true + }, + "meshfix_union_all": { + "default_value": true + }, + "meshfix_union_all_remove_holes": { + "default_value": true + }, + "ooze_shield_enabled": { + "default_value": true + }, + "prime_tower_enable": { + "default_value": true + }, + "prime_tower_size": { + "default_value": 12.24744871391589 + }, + "raft_airgap": { + "default_value": 0.22 + }, + "raft_base_line_spacing": { + "default_value": 3.0 + }, + "raft_base_line_width": { + "default_value": 1.0 + }, + "raft_base_thickness": { + "default_value": 0.3 + }, + "raft_interface_line_spacing": { + "default_value": 3.0 + }, + "raft_interface_line_width": { + "default_value": 0.4 + }, + "raft_interface_thickness": { + "default_value": 0.27 + }, + "raft_margin": { + "default_value": 5.0 + }, + "raft_surface_layers": { + "default_value": 2.0 + }, + "raft_surface_line_spacing": { + "default_value": 3.0 + }, + "raft_surface_line_width": { + "default_value": 0.4 + }, + "raft_surface_thickness": { + "default_value": 0.27 + }, "retraction_amount": { - "default_value": 2 + "default_value": 2.0 + }, + "retraction_combing": { + "default_value": "all" + }, + "retraction_enable": { + "default_value": true + }, + "retraction_hop_enabled": { + "default_value": 1.0 + }, + "retraction_min_travel": { + "default_value": 1.5 + }, + "retraction_speed": { + "default_value": 40.0 + }, + "skin_overlap": { + "default_value": 15.0 + }, + "skirt_brim_minimal_length": { + "default_value": 150.0 + }, + "skirt_gap": { + "default_value": 3.0 + }, + "skirt_line_count": { + "default_value": 1.0 + }, + "speed_infill": { + "default_value": 50.0 }, "speed_layer_0": { - "default_value": 30 + "default_value": 30.0 + }, + "speed_print": { + "default_value": 50.0 }, "speed_topbottom": { - "default_value": 30 + "default_value": 30.0 }, "speed_travel": { - "default_value": 50 + "default_value": 50.0 }, "speed_wall_0": { - "default_value": 25 + "default_value": 25.0 }, "speed_wall_x": { - "default_value": 35 + "default_value": 35.0 + }, + "support_angle": { + "default_value": 60.0 + }, + "support_enable": { + "default_value": 0.0 + }, + "support_infill_rate": { + "default_value": 15.0 + }, + "support_pattern": { + "default_value": "lines" + }, + "support_type": { + "default_value": "everywhere" }, "support_xy_distance": { - "default_value": 0 + "default_value": 0.5 }, "support_z_distance": { "default_value": 0.1 }, "top_thickness": { "default_value": 0.5 + }, + "wall_thickness": { + "default_value": 0.8 } }, From 19dcb3f23023470609eb7b817479743d47653ecc Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 15 Jan 2017 15:04:57 +0100 Subject: [PATCH 3/7] Remove magic_mesh_surface_mode and magic_spiralize --- resources/definitions/renkforce_rf100.def.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index c8313c64d0..04190fd648 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -88,12 +88,6 @@ "machine_width": { "default_value": 100 }, - "magic_mesh_surface_mode": { - "default_value": "surface" - }, - "magic_spiralize": { - "default_value": true - }, "material_bed_temperature": { "default_value": 70.0 }, From 6d05252dce0bca837ab3e0cf0b962e382604c8e3 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 21 Jan 2017 13:01:47 +0100 Subject: [PATCH 4/7] Fix "Unable to slice with the current settings. The following settings have errors: Prime Tower X Position, Prime Tower Y Position." --- resources/definitions/renkforce_rf100.def.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 04190fd648..4660631f50 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -115,12 +115,6 @@ "ooze_shield_enabled": { "default_value": true }, - "prime_tower_enable": { - "default_value": true - }, - "prime_tower_size": { - "default_value": 12.24744871391589 - }, "raft_airgap": { "default_value": 0.22 }, From 90648bc756af5cf68f8169d8e2218b801a506a83 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 21 Jan 2017 15:27:39 +0100 Subject: [PATCH 5/7] Remove meshfix_* so that http://www.thingiverse.com/thing:692523 can be sliced --- resources/definitions/renkforce_rf100.def.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 4660631f50..1f76ffc06b 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -100,18 +100,6 @@ "material_print_temperature": { "default_value": 210.0 }, - "meshfix_extensive_stitching": { - "default_value": true - }, - "meshfix_keep_open_polygons": { - "default_value": true - }, - "meshfix_union_all": { - "default_value": true - }, - "meshfix_union_all_remove_holes": { - "default_value": true - }, "ooze_shield_enabled": { "default_value": true }, From eaa8cbb1601758651b0f48cf4b7c7311a220e5f1 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 22 Jan 2017 22:56:59 +0100 Subject: [PATCH 6/7] Changes as suggested by @Ghostkeeper in https://github.com/Ultimaker/Cura/pull/1350#pullrequestreview-17836965 --- .../definitions/renkforce_rf100.def.json | 38 +++---------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 1f76ffc06b..3b17848476 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -1,14 +1,13 @@ { "id": "RF100", "version": 2, - "name": "renkforce RF100", + "name": "Renkforce RF100", "inherits": "fdmprinter", "metadata": { "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", "category": "Other", "file_formats": "text/x-gcode", - "manufacturer": "renkforce", - "platform_offset": [0, 0, 0], + "manufacturer": "Renkforce", "visible": true }, @@ -17,7 +16,7 @@ "default_value": "skirt" }, "bottom_thickness": { - "default_value": 0.5 + "value": 0.5 }, "brim_line_count": { "default_value": 20.0 @@ -44,26 +43,17 @@ "default_value": 10.0 }, "infill_before_walls": { - "default_value": 1.0 + "default_value": true }, "infill_overlap": { "default_value": 15.0 }, - "infill_sparse_density": { - "default_value": 15.0 - }, "layer_0_z_overlap": { "default_value": 0.22 }, - "layer_height": { - "default_value": 0.1 - }, "layer_height_0": { "default_value": 0.3 }, - "line_width": { - "default_value": 0.4 - }, "machine_depth": { "default_value": 100 }, @@ -77,10 +67,7 @@ "default_value": 100 }, "machine_name": { - "default_value": "renkforce RF100" - }, - "machine_nozzle_size": { - "default_value": 0.4 + "default_value": "Renkforce RF100" }, "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing..." @@ -89,14 +76,11 @@ "default_value": 100 }, "material_bed_temperature": { - "default_value": 70.0 + "visible": false }, "material_diameter": { "default_value": 1.75 }, - "material_flow": { - "default_value": 100.0 - }, "material_print_temperature": { "default_value": 210.0 }, @@ -217,15 +201,5 @@ "wall_thickness": { "default_value": 0.8 } - }, - - "categories": { - "material": { - "settings": { - "material_bed_temperature": { - "visible": false - } - } - } } } From e7cad12bf612fbf4c8c78d87cab8ab896776ca9f Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 23 Jan 2017 00:26:53 +0000 Subject: [PATCH 7/7] Replace default_value by value, and convert the content to a string that evaluates to the same value in Python As per https://github.com/Ultimaker/Cura/issues/1316#issuecomment-274371670 --- .../definitions/renkforce_rf100.def.json | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 3b17848476..7a350c3d5e 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -13,193 +13,193 @@ "overrides": { "adhesion_type": { - "default_value": "skirt" + "value": "skirt" }, "bottom_thickness": { - "value": 0.5 + "value": "0.5" }, "brim_line_count": { - "default_value": 20.0 + "value": "20.0" }, "cool_fan_enabled": { - "default_value": true + "value": "True" }, "cool_fan_full_at_height": { - "default_value": 0.5 + "value": "0.5" }, "cool_fan_speed_max": { - "default_value": 100.0 + "value": "100.0" }, "cool_fan_speed_min": { - "default_value": 100.0 + "value": "100.0" }, "cool_lift_head": { - "default_value": true + "value": "True" }, "cool_min_layer_time": { - "default_value": 5.0 + "value": "5.0" }, "cool_min_speed": { - "default_value": 10.0 + "value": "10.0" }, "infill_before_walls": { - "default_value": true + "value": "True" }, "infill_overlap": { - "default_value": 15.0 + "value": "15.0" }, "layer_0_z_overlap": { - "default_value": 0.22 + "value": "0.22" }, "layer_height_0": { - "default_value": 0.3 + "value": "0.3" }, "machine_depth": { - "default_value": 100 + "value": "100" }, "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" + "value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" + "value": "RepRap (Marlin/Sprinter)" }, "machine_height": { - "default_value": 100 + "value": "100" }, "machine_name": { - "default_value": "Renkforce RF100" + "value": "Renkforce RF100" }, "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing..." + "value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing..." }, "machine_width": { - "default_value": 100 + "value": "100" }, "material_bed_temperature": { - "visible": false + "visible": "False" }, "material_diameter": { - "default_value": 1.75 + "value": "1.75" }, "material_print_temperature": { - "default_value": 210.0 + "value": "210.0" }, "ooze_shield_enabled": { - "default_value": true + "value": "True" }, "raft_airgap": { - "default_value": 0.22 + "value": "0.22" }, "raft_base_line_spacing": { - "default_value": 3.0 + "value": "3.0" }, "raft_base_line_width": { - "default_value": 1.0 + "value": "1.0" }, "raft_base_thickness": { - "default_value": 0.3 + "value": "0.3" }, "raft_interface_line_spacing": { - "default_value": 3.0 + "value": "3.0" }, "raft_interface_line_width": { - "default_value": 0.4 + "value": "0.4" }, "raft_interface_thickness": { - "default_value": 0.27 + "value": "0.27" }, "raft_margin": { - "default_value": 5.0 + "value": "5.0" }, "raft_surface_layers": { - "default_value": 2.0 + "value": "2.0" }, "raft_surface_line_spacing": { - "default_value": 3.0 + "value": "3.0" }, "raft_surface_line_width": { - "default_value": 0.4 + "value": "0.4" }, "raft_surface_thickness": { - "default_value": 0.27 + "value": "0.27" }, "retraction_amount": { - "default_value": 2.0 + "value": "2.0" }, "retraction_combing": { - "default_value": "all" + "value": "all" }, "retraction_enable": { - "default_value": true + "value": "True" }, "retraction_hop_enabled": { - "default_value": 1.0 + "value": "1.0" }, "retraction_min_travel": { - "default_value": 1.5 + "value": "1.5" }, "retraction_speed": { - "default_value": 40.0 + "value": "40.0" }, "skin_overlap": { - "default_value": 15.0 + "value": "15.0" }, "skirt_brim_minimal_length": { - "default_value": 150.0 + "value": "150.0" }, "skirt_gap": { - "default_value": 3.0 + "value": "3.0" }, "skirt_line_count": { - "default_value": 1.0 + "value": "1.0" }, "speed_infill": { - "default_value": 50.0 + "value": "50.0" }, "speed_layer_0": { - "default_value": 30.0 + "value": "30.0" }, "speed_print": { - "default_value": 50.0 + "value": "50.0" }, "speed_topbottom": { - "default_value": 30.0 + "value": "30.0" }, "speed_travel": { - "default_value": 50.0 + "value": "50.0" }, "speed_wall_0": { - "default_value": 25.0 + "value": "25.0" }, "speed_wall_x": { - "default_value": 35.0 + "value": "35.0" }, "support_angle": { - "default_value": 60.0 + "value": "60.0" }, "support_enable": { - "default_value": 0.0 + "value": "False" }, "support_infill_rate": { - "default_value": 15.0 + "value": "15.0" }, "support_pattern": { - "default_value": "lines" + "value": "lines" }, "support_type": { - "default_value": "everywhere" + "value": "everywhere" }, "support_xy_distance": { - "default_value": 0.5 + "value": "0.5" }, "support_z_distance": { - "default_value": 0.1 + "value": "0.1" }, "top_thickness": { - "default_value": 0.5 + "value": "0.5" }, "wall_thickness": { - "default_value": 0.8 + "value": "0.8" } } }