diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 35cdf2256f..6aae7644b5 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -52,20 +52,20 @@ "machine_head_polygon": { "default": [ [ - -10, - 10 + -1, + 1 ], [ - 10, - 10 + -1, + -1 ], [ - 10, - -10 + 1, + -1 ], [ - -10, - -10 + 1, + 1 ] ] }, diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json index 0e42d73688..598a9327c1 100644 --- a/resources/settings/ultimaker2.json +++ b/resources/settings/ultimaker2.json @@ -47,14 +47,30 @@ "machine_height": { "default": 205 }, "machine_heated_bed": { "default": true }, - + "machine_head_with_fans_polygon": + { + "default": [ + [ + -40, + 30 + ], + [ + -40, + -10 + ], + [ + 60, + -10 + ], + [ + 60, + 30 + ] + ] + }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, - "machine_head_shape_min_x": { "default": 40 }, - "machine_head_shape_min_y": { "default": 10 }, - "machine_head_shape_max_x": { "default": 60 }, - "machine_head_shape_max_y": { "default": 30 }, - "machine_nozzle_gantry_distance": { "default": 55 }, + "gantry_height": { "default": 55 }, "machine_use_extruder_offset_to_offset_coords": { "default": true }, "machine_gcode_flavor": { "default": "UltiGCode" }, "machine_disallowed_areas": { "default": [ diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json index 5dde73fcf7..9b34404c54 100644 --- a/resources/settings/ultimaker_original.json +++ b/resources/settings/ultimaker_original.json @@ -50,11 +50,28 @@ "machine_depth": { "default": 205 }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, - "machine_head_shape_min_x": { "default": 75 }, - "machine_head_shape_min_y": { "default": 18 }, - "machine_head_shape_max_x": { "default": 18 }, - "machine_head_shape_max_y": { "default": 35 }, - "machine_nozzle_gantry_distance": { "default": 55 }, + "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)" },