From 1226b2e78eb1f97ef4183c15ac8c6e32bd20e58a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 11 Jan 2017 18:05:27 +0100 Subject: [PATCH] Fix the min/max values for prime(tower) positions when center_is_zero --- resources/definitions/fdmprinter.def.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c87a2f9b9e..6627754274 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3128,8 +3128,8 @@ "type": "float", "unit": "mm", "default_value": 0, - "minimum_value_warning": "0", - "maximum_value_warning": "machine_width", + "minimum_value_warning": "machine_width / -2 if machine_center_is_zero else 0", + "maximum_value_warning": "machine_width / 2 if machine_center_is_zero else machine_width", "settable_per_mesh": false, "settable_per_extruder": true, "enabled": false @@ -3141,8 +3141,8 @@ "type": "float", "unit": "mm", "default_value": 0, - "minimum_value_warning": "0", - "maximum_value_warning": "machine_depth", + "minimum_value_warning": "machine_depth / -2 if machine_center_is_zero else 0", + "maximum_value_warning": "machine_depth / 2 if machine_center_is_zero else machine_depth", "settable_per_mesh": false, "settable_per_extruder": true, "enabled": false @@ -3791,8 +3791,8 @@ "default_value": 200, "minimum_value_warning": "-1000", "maximum_value_warning": "1000", - "maximum_value": "machine_width", - "minimum_value": "resolveOrValue('prime_tower_size')", + "maximum_value": "machine_width / 2 if machine_center_is_zero else machine_width", + "minimum_value": "resolveOrValue('prime_tower_size') - machine_width / 2 if machine_center_is_zero else resolveOrValue('prime_tower_size')", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -3808,6 +3808,8 @@ "maximum_value_warning": "1000", "maximum_value": "machine_depth - resolveOrValue('prime_tower_size')", "minimum_value": "0", + "maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')", + "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": false },