diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py index 238a13bf61..0428c0f5c2 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelection.py +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelection.py @@ -45,7 +45,7 @@ class UMOUpgradeSelection(MachineAction): def _createDefinitionChangesContainer(self, global_container_stack): # Create a definition_changes container to store the settings in and add it to the stack - definition_changes_container = UM.Settings.InstanceContainer(global_container_stack.getName() + "_settings") + definition_changes_container = UM.Settings.InstanceContainer.InstanceContainer(global_container_stack.getName() + "_settings") definition = global_container_stack.getBottom() definition_changes_container.setDefinition(definition) definition_changes_container.addMetaDataEntry("type", "definition_changes") diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 03b3b50a08..bb73622413 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -62,7 +62,7 @@ "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_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" + "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' if machine_heated_bed else 'M104 S0 ;extruder heater off\\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'" } } } diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json new file mode 100644 index 0000000000..3d1ca2d1a9 --- /dev/null +++ b/resources/definitions/vertex_k8400.def.json @@ -0,0 +1,84 @@ +{ + "id": "vertex_k8400", + "version": 2, + "name": "Vertex K8400", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Velleman", + "category": "Other", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform": "Vertex_build_panel.stl", + "platform_offset": [0, -2, 0], + "supports_usb_connection": true, + "supported_actions": ["MachineSettingsAction"] + }, + "overrides": { + "machine_name": { "default_value": "Vertex K8400" }, + "machine_heated_bed": { + "default_value": true + }, + "material_bed_temperature": { + "default_value": 0 + }, + "material_bed_temperature_layer_0": { + "default_value": 0 + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 190 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_disallowed_areas": { "default_value": [ + [[-100,100],[-100,80],[100,80],[100,100]] + ]}, + "machine_center_is_zero": { + "default_value": false + }, + "machine_nozzle_size": { + "default_value": 0.35 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_head_polygon": { + "default_value": [ + [-60, -18], + [-60, 40], + [18, 40], + [18, -18] + ] + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-60, -40], + [-60, 40], + [18, 40], + [18, -40] + ] + }, + "gantry_height": { + "default_value": 18 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 2 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 2 + }, + "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+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" + } + } +} \ No newline at end of file diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json new file mode 100644 index 0000000000..7b5efcee9c --- /dev/null +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -0,0 +1,92 @@ +{ + "id": "vertex_k8400_dual", + "version": 2, + "name": "Vertex K8400 Dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Velleman", + "category": "Other", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker2", + "platform": "Vertex_build_panel.stl", + "platform_offset": [0, -2, 0], + "machine_extruder_trains": { + "0": "vertex_k8400_dual_1st", + "1": "vertex_k8400_dual_2nd" + } + }, + "overrides": { + "machine_name": { "default_value": "Vertex K8400 Dual" }, + "machine_heated_bed": { + "default_value": true + }, + "material_bed_temperature": { + "default_value": 0 + }, + "material_bed_temperature_layer_0": { + "default_value": 0 + }, + "machine_width": { + "default_value": 223.7 + }, + "machine_height": { + "default_value": 190 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_disallowed_areas": { "default_value": [ + [[-111.85,100],[111.85,100],[-111.85,80],[111.85,80]] + ]}, + "machine_center_is_zero": { + "default_value": false + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": true + }, + "machine_nozzle_size": { + "default_value": 0.35 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_head_polygon": { + "default_value": [ + [-60, -18], + [-60, 40], + [18, 40], + [18, -18] + ] + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-60, -40], + [-60, 40], + [18, 40], + [18, -40] + ] + }, + "gantry_height": { + "default_value": 18 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 2 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 2 + }, + "machine_extruder_count": { + "default_value": 2 + }, + "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+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" + } + } +} \ No newline at end of file diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json new file mode 100644 index 0000000000..74a9c557a5 --- /dev/null +++ b/resources/extruders/vertex_k8400_dual_1st.def.json @@ -0,0 +1,26 @@ +{ + "id": "vertex_k8400_dual_1st", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "vertex_k8400_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 23.7 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json new file mode 100644 index 0000000000..ffa4b77a1e --- /dev/null +++ b/resources/extruders/vertex_k8400_dual_2nd.def.json @@ -0,0 +1,26 @@ +{ + "id": "vertex_k8400_dual_2nd", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "vertex_k8400_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/meshes/Vertex_build_panel.stl b/resources/meshes/Vertex_build_panel.stl new file mode 100644 index 0000000000..bb50da0625 Binary files /dev/null and b/resources/meshes/Vertex_build_panel.stl differ