diff options
author | Jaime van Kessel <nallath@gmail.com> | 2016-12-14 12:01:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 12:01:02 +0300 |
commit | ad27618d57d59c919e46c368d2efe791d7c58109 (patch) | |
tree | 7530b0161671c377bd42e6a8e9fa201189db6204 /resources | |
parent | 6d50287c42e174d6cb99ce5c98bdb07215b23db9 (diff) | |
parent | 655850e7b985abe1509d0404266252e184362a7d (diff) |
Merge pull request #1240 from fieldOfView/fix_delta_printer_shapes
Add machine_shape to delta printer definitions
Diffstat (limited to 'resources')
-rw-r--r-- | resources/definitions/deltabot.def.json | 3 | ||||
-rw-r--r-- | resources/definitions/kossel_mini.def.json | 17 | ||||
-rw-r--r-- | resources/definitions/kossel_pro.def.json | 7 |
3 files changed, 10 insertions, 17 deletions
diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 5d36857e9e..1132f7e7bb 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -30,6 +30,7 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 150 }, "machine_width": { "default_value": 150 }, - "machine_name": { "default_value": "DeltaBot style" } + "machine_name": { "default_value": "DeltaBot style" }, + "machine_shape": { "default_value": "elliptic"} } } diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index 1b79d61a91..78ee3aac1e 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -10,7 +10,8 @@ "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "kossel_platform.stl" + "platform": "kossel_platform.stl", + "platform_offset": [0, -0.25, 0] }, "overrides": { @@ -50,18 +51,8 @@ "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\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_disallowed_areas": { - "default_value": [ - [[-34, -85], [ -85, -85], [-70, -70]], - [[-85, -85], [-85, -34], [-70, -70]], - [[34, -85], [ 85, -85], [70, -70]], - [[85, -85], [85, -34], [70, -70]], - [[-34, 85], [ -85, 85], [-70, 70]], - [[-85, 85], [-85, 34], [-70, 70]], - [[34, 85], [ 85, 85], [70, 70]], - [[85, 85], [85, 34], [70, 70]] - ] + "machine_shape": { + "default_value": "elliptic" } - } } diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index f8df616bf2..a0774b3a06 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -10,7 +10,8 @@ "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", - "platform": "kossel_pro_build_platform.stl" + "platform": "kossel_pro_build_platform.stl", + "platform_offset": [0, -0.25, 0] }, "overrides": { "machine_heated_bed": { @@ -49,8 +50,8 @@ "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG28 ; home all axes\nM84 ; disable motors\n" }, - "machine_disallowed_areas": { - "default_value": [[[125.0, 125.0], [125.0, 0.0], [120.741, 32.352]], [[-125.0, 125.0], [-125.0, 0.0], [-120.741, 32.352]], [[125.0, -125.0], [125.0, -0.0], [120.741, -32.352]], [[-125.0, -125.0], [-125.0, -0.0], [-120.741, -32.352]], [[125.0, 125.0], [120.741, 32.352], [108.253, 62.5]], [[-125.0, 125.0], [-120.741, 32.352], [-108.253, 62.5]], [[125.0, -125.0], [120.741, -32.352], [108.253, -62.5]], [[-125.0, -125.0], [-120.741, -32.352], [-108.253, -62.5]], [[125.0, 125.0], [108.253, 62.5], [88.388, 88.388]], [[-125.0, 125.0], [-108.253, 62.5], [-88.388, 88.388]], [[125.0, -125.0], [108.253, -62.5], [88.388, -88.388]], [[-125.0, -125.0], [-108.253, -62.5], [-88.388, -88.388]], [[125.0, 125.0], [88.388, 88.388], [62.5, 108.253]], [[-125.0, 125.0], [-88.388, 88.388], [-62.5, 108.253]], [[125.0, -125.0], [88.388, -88.388], [62.5, -108.253]], [[-125.0, -125.0], [-88.388, -88.388], [-62.5, -108.253]], [[125.0, 125.0], [62.5, 108.253], [32.352, 120.741]], [[-125.0, 125.0], [-62.5, 108.253], [-32.352, 120.741]], [[125.0, -125.0], [62.5, -108.253], [32.352, -120.741]], [[-125.0, -125.0], [-62.5, -108.253], [-32.352, -120.741]], [[125.0, 125.0], [32.352, 120.741], [0.0, 125.0]], [[-125.0, 125.0], [-32.352, 120.741], [-0.0, 125.0]], [[125.0, -125.0], [32.352, -120.741], [0.0, -125.0]], [[-125.0, -125.0], [-32.352, -120.741], [-0.0, -125.0]]] + "machine_shape": { + "default_value": "elliptic" } } }
\ No newline at end of file |