Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos

Fix prime disallowed areas when center is zero
This commit is contained in:
awhiemstra 2017-01-12 10:28:53 +01:00 committed by GitHub
commit a2e00bd560
2 changed files with 24 additions and 10 deletions

View file

@ -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
},