From b635b075690938f85a2b63071c91575d36352d28 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 09:47:15 +0200 Subject: [PATCH 01/11] Translate definition for Ultimaker 2 Extended Contributes to issue CURA-1278. --- .../definitions/ultimaker2_extended.def.json | 20 +++++++++++++++++++ resources/machines/ultimaker2_extended.json | 16 --------------- 2 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 resources/definitions/ultimaker2_extended.def.json delete mode 100644 resources/machines/ultimaker2_extended.json diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json new file mode 100644 index 0000000000..1d7ef8bbd2 --- /dev/null +++ b/resources/definitions/ultimaker2_extended.def.json @@ -0,0 +1,20 @@ +{ + "id": "ultimaker2_extended", + "version": 2, + "name": "Ultimaker 2 Extended", + "inherits": "ultimaker2", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2.png", + "platform": "ultimaker2_platform.obj", + "platform_texture": "Ultimaker2Extendedbackplate.png" + }, + + "overrides": { + "machine_height": { + "default": 315 + } + } +} diff --git a/resources/machines/ultimaker2_extended.json b/resources/machines/ultimaker2_extended.json deleted file mode 100644 index 0cd5ff0002..0000000000 --- a/resources/machines/ultimaker2_extended.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "ultimaker2_extended", - "version": 1, - "name": "Ultimaker 2 Extended", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "icon": "icon_ultimaker2.png", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Extendedbackplate.png", - "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", - - "machine_settings": { - "machine_height": { "default": 315 } - } -} From 34632a762a44512ef409eb0f11d339b925723b15 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 09:48:44 +0200 Subject: [PATCH 02/11] Use default_value instead of default Forgot this again. Good morning Ghostkeeper. Contributes to issue CURA-1278. --- resources/definitions/ultimaker2_extended.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 1d7ef8bbd2..361132ea95 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -14,7 +14,7 @@ "overrides": { "machine_height": { - "default": 315 + "default_value": 315 } } } From a7f93b2a922dce298fca3894e57aa6368c955939 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 09:50:04 +0200 Subject: [PATCH 03/11] Add category to metadata Also forgot that. Good morning, Ghost. Contributes to issue CURA-1278. --- resources/definitions/ultimaker2_extended.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 361132ea95..e3c7d1fd01 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -6,6 +6,7 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker", + "category": "Ultimaker", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "ultimaker2_platform.obj", From 4947dfffb8e27e8c70c6f14f9c10cb6649557f03 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 09:52:54 +0200 Subject: [PATCH 04/11] Translate definition for Ultimaker 2 Extended+ It remains to be seen what we do with the variants of this machine and consequently the visibility of this machine. Contributes to issue CURA-1278. --- .../ultimaker2_extended_plus.def.json | 30 +++++++++++++++++++ .../machines/ultimaker2_extended_plus.json | 19 ------------ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 resources/definitions/ultimaker2_extended_plus.def.json delete mode 100644 resources/machines/ultimaker2_extended_plus.json diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json new file mode 100644 index 0000000000..5283209745 --- /dev/null +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -0,0 +1,30 @@ +{ + "id": "ultimaker2_extended_plus_base", + "version": 2, + "name": "Ultimaker 2 Extended+", + "inherits": "ultimaker2plus", + "visible": false, + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "category": "Ultimaker", + "file_formats": "text/x-gcode", + "platform": "ultimaker2_platform.obj", + "platform_texture": "Ultimaker2ExtendedPlusbackplate.png" + }, + + "overrides": { + "machine_height": { + "default_value": 313 + }, + "machine_show_variants": { + "default_value": true + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + } + } +} diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json deleted file mode 100644 index 318361a894..0000000000 --- a/resources/machines/ultimaker2_extended_plus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_extended_plus_base", - "version": 1, - "name": "Ultimaker 2 Extended+", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2plus.json", - - "machine_settings": { - "machine_height": { "default": 313 }, - "machine_show_variants": { "default": true }, - "machine_nozzle_head_distance": { "default": 5 }, - "machine_nozzle_expansion_angle": { "default": 45 } - } -} From d0c9b964167678c05efcb5f5c7f9cb0a9beb4d07 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 09:57:25 +0200 Subject: [PATCH 05/11] Translate definition for Ultimaker 2 Go Contributes to issue CURA-1278. --- resources/definitions/ultimaker2_go.def.json | 41 ++++++++++++++++++++ resources/machines/ultimaker2_go.json | 26 ------------- 2 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 resources/definitions/ultimaker2_go.def.json delete mode 100644 resources/machines/ultimaker2_go.json diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json new file mode 100644 index 0000000000..e439006170 --- /dev/null +++ b/resources/definitions/ultimaker2_go.def.json @@ -0,0 +1,41 @@ +{ + "id": "ultimaker2_go", + "version": 2, + "name": "Ultimaker 2 Go", + "inherits": "ultimaker2", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "category": "Ultimaker", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2.png", + "platform": "ultimaker2go_platform.obj", + "platform_texture": "Ultimaker2Gobackplate.png" + }, + + "overrides": { + "machine_width": { + "default_value": 120 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 115 + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_disallowed_areas": { + "default_value": [ + [[-60, 60], [-33, 60], [-35, 52], [-60, 52]], + [[ 60, 60], [ 60, 52], [ 35, 52], [ 33, 60]], + [[-60, -60], [-60, -52], [-35, -52], [-33, -60]], + [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] + ] + }, + "machine_platform_offset": { + "default_value": [0, 0, 0] + } + } +} diff --git a/resources/machines/ultimaker2_go.json b/resources/machines/ultimaker2_go.json deleted file mode 100644 index cc2cde09d7..0000000000 --- a/resources/machines/ultimaker2_go.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "id": "ultimaker2_go", - "version": 1, - "name": "Ultimaker 2 Go", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "icon": "icon_ultimaker2.png", - "platform": "ultimaker2go_platform.obj", - "platform_texture": "Ultimaker2Gobackplate.png", - "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", - - "overrides": { - "machine_width": { "default": 120 }, - "machine_depth": { "default": 120 }, - "machine_height": { "default": 115 }, - "machine_heated_bed": { "default": false }, - "machine_disallowed_areas": { "default": [ - [[-60.0, 60.0], [-33.0, 60.0], [-35.0, 52.0], [-60.0, 52.0]], - [[ 60.0, 60.0], [ 60.0, 52.0], [ 35.0, 52.0], [ 33.0, 60.0]], - [[-60.0, -60.0], [-60.0, -52.0], [-35.0, -52.0], [-33.0, -60.0]], - [[ 60.0, -60.0], [ 33.0, -60.0], [ 35.0, -52.0], [ 60.0, -52.0]] - ]}, - "machine_platform_offset": { "default": [0.0, 0.0, 0.0] } - } -} From 2b47fc738b3c5cf5af936ef793a5a0bbac6befbc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:16:54 +0200 Subject: [PATCH 06/11] Translate definition for Ultimaker 2+ I've translated the inherit functions as values. Contributes to issue CURA-1278. --- .../definitions/ultimaker2_plus.def.json | 71 +++++++++++++++++++ resources/machines/ultimaker2plus.json | 54 -------------- 2 files changed, 71 insertions(+), 54 deletions(-) create mode 100644 resources/definitions/ultimaker2_plus.def.json delete mode 100644 resources/machines/ultimaker2plus.json diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json new file mode 100644 index 0000000000..6a61d18d3c --- /dev/null +++ b/resources/definitions/ultimaker2_plus.def.json @@ -0,0 +1,71 @@ +{ + "id": "ultimaker2plus_base", + "version": 2, + "name": "Ultimaker 2+", + "inherits": "ultimaker2", + "visible": "false", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "category": "Ultimaker", + "file_formats": "text/x-gcode", + "platform": "ultimaker2_platform.obj", + "platform_texture": "Ultimaker2Plusbackplate.png" + }, + + "overrides": { + "speed_infill": { + "value": "speed_print" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "layer_height_0": { + "value": "round(machine_nozzle_size / 1.5, 2)" + }, + "line_width": { + "value": "round(machine_nozzle_size * 0.875, 2)" + }, + "speed_layer_0": { + "default_value": 20 + }, + "speed_support": { + "value": "speed_wall_0" + }, + "machine_height": { + "default_value": 203 + }, + "machine_show_variants": { + "default_value": true + }, + "gantry_height": { + "default_value": 52 + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + }, + "machine_heat_zone_length": { + "default_value": 20 + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -44, 14 ], + [ -44, -34 ], + [ 64, 14 ], + [ 64, -34 ] + ] + }, + "machine_disallowed_areas": { + "default_value": [ + [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], + [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], + [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], + [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] + ] + } + } +} diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json deleted file mode 100644 index cc86bd8ce3..0000000000 --- a/resources/machines/ultimaker2plus.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "id": "ultimaker2plus_base", - "version": 1, - "name": "Ultimaker 2+", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Plusbackplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", - - "overrides": { - "speed_infill": { "inherit_function": "speed_print" }, - "speed_wall_x": { "inherit_function": "speed_wall" }, - "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)" }, - "line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)" }, - "speed_layer_0": { "default": "20" }, - "speed_support": { "inherit_function": "speed_wall_0" }, - "machine_height": { "default": 203 }, - "machine_show_variants": { "default": true }, - "gantry_height": { "default": 52 }, - "machine_nozzle_head_distance": { "default": 5 }, - "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_heat_zone_length": { "default": 20 }, - "machine_head_with_fans_polygon": - { - "default": [ - [ - -44, - 14 - ], - [ - -44, - -34 - ], - [ - 64, - 14 - ], - [ - 64, - -34 - ] - ] - }, - "machine_disallowed_areas": { "default": [ - [[-115.0, 112.5], [ -78.0, 112.5], [ -80.0, 102.5], [-115.0, 102.5]], - [[ 115.0, 112.5], [ 115.0, 102.5], [ 105.0, 102.5], [ 103.0, 112.5]], - [[-115.0, -112.5], [-115.0, -104.5], [ -84.0, -104.5], [ -82.0, -112.5]], - [[ 115.0, -112.5], [ 108.0, -112.5], [ 110.0, -104.5], [ 115.0, -104.5]] - ]} - } -} From 7714d6f720b4cdeedce8fc4b934964c5c0d5f4bc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:21:30 +0200 Subject: [PATCH 07/11] Translate definition for Ultimaker Original Contributes to issue CURA-1278. --- .../definitions/ultimaker_original.def.json | 70 ++++++++++++++++ resources/machines/ultimaker_original.json | 83 ------------------- 2 files changed, 70 insertions(+), 83 deletions(-) create mode 100644 resources/definitions/ultimaker_original.def.json delete mode 100644 resources/machines/ultimaker_original.json diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json new file mode 100644 index 0000000000..8f47962be9 --- /dev/null +++ b/resources/definitions/ultimaker_original.def.json @@ -0,0 +1,70 @@ +{ + "id": "ultimaker_original", + "version": 2, + "name": "Ultimaker Original", + "inherits": "ultimaker", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker.png", + "platform": "ultimaker_platform.stl", + "pages": [ + "SelectUpgradedParts", + "UpgradeFirmware", + "UltimakerCheckup", + "BedLeveling" + ] + }, + + "overrides": { + "machine_width": { + "default": 205 + }, + "machine_height": { + "default": 200 + }, + "machine_depth": { + "default": 205 + }, + "machine_center_is_zero": { + "default": false + }, + "machine_nozzle_size": { + "default": 0.4 + }, + "machine_nozzle_heat_up_speed": { + "default": 2 + }, + "machine_nozzle_cool_down_speed": { + "default": 2 + }, + "machine_head_with_fans_polygon": + { + "default": [ + [ -75, 35 ], + [ -75, -18 ], + [ 18, 35 ], + [ 18, -18 ] + ] + }, + "gantry_height": { + "default": 55 + }, + "machine_use_extruder_offset_to_offset_coords": { + "default": true + }, + "machine_gcode_flavor": { + "default": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default": "G21 ;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 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + }, + "machine_end_gcode": { + "default": "M104 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 F9000 ;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_extruder_drive_upgrade": { + "default": false + } + } +} diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json deleted file mode 100644 index 3e694c1b8e..0000000000 --- a/resources/machines/ultimaker_original.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "id": "ultimaker_original", - "version": 1, - "name": "Ultimaker Original", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "icon": "icon_ultimaker.png", - "platform": "ultimaker_platform.stl", - "file_formats": "text/x-gcode", - "inherits": "ultimaker.json", - - "pages": [ - "SelectUpgradedParts", - "UpgradeFirmware", - "UltimakerCheckup", - "BedLeveling" - ], - - "machine_extruder_trains": { - "0": { - "machine_nozzle_heat_up_speed": { - "default": 2.0 - }, - "machine_nozzle_cool_down_speed": { - "default": 2.0 - }, - "machine_nozzle_tip_outer_diameter": { - "default": 1 - }, - "machine_nozzle_head_distance": { - "default": 3 - }, - "machine_nozzle_expansion_angle": { - "default": 45 - }, - "machine_heat_zone_length": { - "default": 16 - } - } - }, - "overrides": { - "machine_width": { "default": 205 }, - "machine_height": { "default": 200 }, - "machine_depth": { "default": 205 }, - "machine_center_is_zero": { "default": false }, - "machine_nozzle_size": { "default": 0.4 }, - "machine_nozzle_heat_up_speed": { "default": 2.0 }, - "machine_nozzle_cool_down_speed": { "default": 2.0 }, - "machine_head_with_fans_polygon": - { - "default": [ - [ - -75, - 35 - ], - [ - -75, - -18 - ], - [ - 18, - 35 - ], - [ - 18, - -18 - ] - ] - }, - "gantry_height": { "default": 55 }, - "machine_use_extruder_offset_to_offset_coords": { "default": true }, - "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default": "G21 ;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 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default": "M104 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 F9000 ;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_extruder_drive_upgrade": { "default": false } - } -} From 13726f1ec1444e1a5f0fc9bf35daee9060d3db31 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:24:18 +0200 Subject: [PATCH 08/11] Use default_value instead of default D'oh. Contributes to issue CURA-1278. --- .../definitions/ultimaker_original.def.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 8f47962be9..cd2fac4599 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -19,29 +19,29 @@ "overrides": { "machine_width": { - "default": 205 + "default_value": 205 }, "machine_height": { - "default": 200 + "default_value": 200 }, "machine_depth": { - "default": 205 + "default_value": 205 }, "machine_center_is_zero": { - "default": false + "default_value": false }, "machine_nozzle_size": { - "default": 0.4 + "default_value": 0.4 }, "machine_nozzle_heat_up_speed": { - "default": 2 + "default_value": 2 }, "machine_nozzle_cool_down_speed": { - "default": 2 + "default_value": 2 }, "machine_head_with_fans_polygon": { - "default": [ + "default_value": [ [ -75, 35 ], [ -75, -18 ], [ 18, 35 ], @@ -49,22 +49,22 @@ ] }, "gantry_height": { - "default": 55 + "default_value": 55 }, "machine_use_extruder_offset_to_offset_coords": { - "default": true + "default_value": true }, "machine_gcode_flavor": { - "default": "RepRap (Marlin/Sprinter)" + "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default": "G21 ;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 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + "default_value": "G21 ;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 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { - "default": "M104 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 F9000 ;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" + "default_value": "M104 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 F9000 ;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_extruder_drive_upgrade": { - "default": false + "default_value": false } } } From 39907c23db19c16f1922ccdc484a1477369c60c7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:25:03 +0200 Subject: [PATCH 09/11] Translate definition for Ultimaker Original+ Contributes to issue CURA-1278. --- .../ultimaker_original_plus.def.json | 26 +++++++++++++++++++ .../machines/ultimaker_original_plus.json | 22 ---------------- 2 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 resources/definitions/ultimaker_original_plus.def.json delete mode 100644 resources/machines/ultimaker_original_plus.json diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json new file mode 100644 index 0000000000..830050beb0 --- /dev/null +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -0,0 +1,26 @@ +{ + "id": "ultimaker_original_plus", + "version": 2, + "name": "Ultimaker Original+", + "inherits": "ultimaker_original", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker", + "category": "Ultimaker", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker.png", + "platform": "ultimaker2_platform.obj", + "platform_texture": "UltimakerPlusbackplate.png", + "pages": [ + "UpgradeFirmware", + "UltimakerCheckup", + "BedLeveling" + ] + }, + + "overrides": { + "machine_heated_bed": { + "default_value": true + } + } +} diff --git a/resources/machines/ultimaker_original_plus.json b/resources/machines/ultimaker_original_plus.json deleted file mode 100644 index 07c5a04549..0000000000 --- a/resources/machines/ultimaker_original_plus.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ultimaker_original_plus", - "version": 1, - "name": "Ultimaker Original+", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "icon": "icon_ultimaker.png", - "platform": "ultimaker2_platform.obj", - "platform_texture": "UltimakerPlusbackplate.png", - "file_formats": "text/x-gcode", - "inherits": "ultimaker_original.json", - - "pages": [ - "UpgradeFirmware", - "UltimakerCheckup", - "BedLeveling" - ], - - "overrides": { - "machine_heated_bed": { "default": true } - } -} From 07fea431c7946d0e555c36606390d2c7f5ff6e40 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:28:23 +0200 Subject: [PATCH 10/11] Translate definition for Uniqbot One Contributes to issue CURA-1278. --- resources/definitions/uniqbot_one.def.json | 55 ++++++++++++++++++++++ resources/machines/uniqbot_one.json | 31 ------------ 2 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 resources/definitions/uniqbot_one.def.json delete mode 100644 resources/machines/uniqbot_one.json diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json new file mode 100644 index 0000000000..ee536edfb0 --- /dev/null +++ b/resources/definitions/uniqbot_one.def.json @@ -0,0 +1,55 @@ +{ + "id": "uniqbot_one", + "version": 2, + "name": "Uniqbot", + "inherits": "fdmprinter", + "metadata": { + "author": "Unimatech", + "manufacturer": "Unimatech", + "category": "Other", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2.png" + }, + + "overrides": { + "machine_heated_bed": { + "default_value": false + }, + "machine_width": { + "default_value": 140 + }, + "machine_height": { + "default_value": 120 + }, + "machine_depth": { + "default_value": 160 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_nozzle_size": { + "default_value": 0.5 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 2 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 2 + }, + "machine_nozzle_gantry_distance": { + "default_value": 55 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G21 ;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 F9000 ;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 F9000\n;Put printing message on LCD screen\nM117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 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+5 E-5 X-20 Y-20 F9000 ;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" + } + } +} \ No newline at end of file diff --git a/resources/machines/uniqbot_one.json b/resources/machines/uniqbot_one.json deleted file mode 100644 index f07dae9b24..0000000000 --- a/resources/machines/uniqbot_one.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "id": "uniqbot_one", - "version": 1, - "name": "Uniqbot", - "manufacturer": "Unimatech", - "author": "Unimatech", - "icon": "icon_ultimaker2.png", - "file_formats": "text/x-gcode", - "inherits": "fdmprinter.json", - - "overrides": { - "machine_heated_bed": { "default": false }, - "machine_width": { "default": 140 }, - "machine_height": { "default": 120 }, - "machine_depth": { "default": 160 }, - "machine_center_is_zero": { "default": false }, - "machine_nozzle_size": { "default": 0.5 }, - "material_diameter": { "default": 1.75 }, - "machine_nozzle_heat_up_speed": { "default": 2.0 }, - "machine_nozzle_cool_down_speed": { "default": 2.0 }, - "machine_nozzle_gantry_distance": { "default": 55 }, - "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default": "G21 ;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 F9000 ;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 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default": "M104 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+5 E-5 X-20 Y-20 F9000 ;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" - } - } -} From 4e3e466a11e8c063cf64cc4426c19fa4a36276e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 18 May 2016 10:34:28 +0200 Subject: [PATCH 11/11] Move platform offset to metadata Also removed the setting from fdmprinter just to be clear. Contributes to issue CURA-1278. --- resources/definitions/bq_witbox_2.def.json | 6 ++---- resources/definitions/innovo_inventor.def.json | 6 ++---- resources/definitions/maker_starter.def.json | 5 +---- resources/definitions/ultimaker2.def.json | 6 ++---- resources/definitions/ultimaker2_go.def.json | 6 ++---- resources/machines/fdmprinter.json | 9 --------- 6 files changed, 9 insertions(+), 29 deletions(-) diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index a98a8b909d..b9d9b497cd 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -9,7 +9,8 @@ "manufacturer": "BQ", "category": "Other", "file_formats": "text/x-gcode", - "platform": "bq_witbox_platform.stl" + "platform": "bq_witbox_platform.stl", + "platform_offset": [0, -145, -38] }, "overrides": { @@ -37,9 +38,6 @@ "machine_gcode_flavor": { "default_value": "RepRap" }, - "machine_platform_offset": { - "default_value": [0, -145, -38] - }, "material_print_temperature": { "default_value": 210 }, diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index d40256813b..cd63423094 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -9,7 +9,8 @@ "manufacturer": "Innovo", "category": "Other", "file_formats": "text/x-gcode", - "platform": "inventor_platform.stl" + "platform": "inventor_platform.stl", + "platform_offset": [-180, -0.25, 160] }, "overrides": { @@ -61,9 +62,6 @@ "machine_end_gcode": { "default_value": "M104 S0\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, - "machine_platform_offset": { - "default_value": [-180, -0.25, 160] - }, "layer_height": { "default_value": 0.15 }, diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index 797b57f771..24033d8968 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -4,9 +4,9 @@ "name": "3DMaker Starter", "inherits": "fdmprinter", "metadata": { - "visible": true, "author": "tvlgiao", "manufacturer": "3DMaker", + "category": "Other", "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj", "icon": "icon_ultimaker2.png", "platform": "makerstarter_platform.stl" @@ -58,9 +58,6 @@ "machine_disallowed_areas": { "default_value": [] }, - "machine_platform_offset": { - "default_value": [0, 0, 0] - }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index ae35858730..606d51c545 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -10,7 +10,8 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png" + "platform_texture": "Ultimaker2backplate.png", + "platform_offset": [9, 0, 0] }, "overrides": { "machine_start_gcode" : { @@ -69,9 +70,6 @@ [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] ]}, - "machine_platform_offset": { - "default_value": [9, 0, 0] - }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index e439006170..7bedb70add 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -10,7 +10,8 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker2.png", "platform": "ultimaker2go_platform.obj", - "platform_texture": "Ultimaker2Gobackplate.png" + "platform_texture": "Ultimaker2Gobackplate.png", + "platform_offset": [0, 0, 0] }, "overrides": { @@ -34,8 +35,5 @@ [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] ] }, - "machine_platform_offset": { - "default_value": [0, 0, 0] - } } } diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 2751c69db2..955bb36c5a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -121,15 +121,6 @@ "default": [], "global_only": true }, - "machine_platform_offset": { - "description": "Where to display the platform mesh.", - "default": [ - 0, - 0, - 0 - ], - "global_only": true - }, "machine_head_polygon": { "description": "A 2D silhouette of the print head (fan caps excluded).", "type": "polygon",