From 9ca8582a5021ccd8759646b2e49fdf99f4026eab Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 3 Nov 2023 13:18:16 +0000 Subject: [PATCH] Applied printer-linter format --- .../definitions/ultimaker_methodx.def.json | 101 ++++----------- .../definitions/ultimaker_methodxl.def.json | 115 +++++------------- 2 files changed, 54 insertions(+), 162 deletions(-) diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index e0dfe1e6ee..605432e87e 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -83,93 +83,38 @@ }, "overrides": { - "machine_depth": { - "default_value": 236.48 - }, - "machine_width": { - "default_value": 283.3 - }, - "machine_height": { - "default_value": 196 - }, - "machine_name": { - "default_value": "Makerbot Method X" - }, - "machine_disallowed_areas": { + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { "default_value": [ [ - [ - -141.65, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - -79 - ], - [ - -141.65, - -79 - ] + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -79], + [-141.65, -79] ], [ - [ - -141.65, - 118.37 - ], - [ - 141.65, - 118.37 - ], - [ - 141.65, - 111 - ], - [ - -141.65, - 111 - ] + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 111], + [-141.65, 111] ], [ - [ - -141.65, - -118.11 - ], - [ - -75, - -118.11 - ], - [ - -75, - 118.37 - ], - [ - -141.65, - 118.37 - ] + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] ], [ - [ - 75, - -118.11 - ], - [ - 141.65, - -118.11 - ], - [ - 141.65, - 118.37 - ], - [ - 75, - 118.37 - ] + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] ] ] - } + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "Makerbot Method X" }, + "machine_width": { "default_value": 283.3 } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 94ee1b20c8..0af2879d36 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,94 +32,41 @@ }, "overrides": { - "machine_depth": { - "default_value": 320 + "machine_depth": { "default_value": 320 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-204, -160], + [204, -160], + [204, -152.5], + [-204, -152.5] + ], + [ + [-204, 160], + [204, 160], + [204, 152.5], + [-204, 152.5] + ], + [ + [-205, -160], + [-152.5, -160], + [-152.5, 160], + [-205, 160] + ], + [ + [152.5, -160], + [205, -160], + [205, 160], + [152.5, 160] + ] + ] }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "Makerbot Method XL" }, - "machine_width": { - "default_value": 410 - }, + "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, - "speed_travel": { - "value": 500 - }, - "machine_disallowed_areas": { - "default_value": [ - [ - [ - -204, - -160 - ], - [ - 204, - -160 - ], - [ - 204, - -152.5 - ], - [ - -204, - -152.5 - ] - ], - [ - [ - -204, - 160 - ], - [ - 204, - 160 - ], - [ - 204, - 152.5 - ], - [ - -204, - 152.5 - ] - ], - [ - [ - -205, - -160 - ], - [ - -152.5, - -160 - ], - [ - -152.5, - 160 - ], - [ - -205, - 160 - ] - ], - [ - [ - 152.5, - -160 - ], - [ - 205, - -160 - ], - [ - 205, - 160 - ], - [ - 152.5, - 160 - ] - ] - ] - } + "speed_travel": { "value": 500 } } } \ No newline at end of file