bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Clear up HAS_WORKSPACE_OFFSET meaning

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-03 03:39:15 -05:00
parent 6e3caf23b6
commit 2c9586be0c
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/inc/Conditionals_post.h
View File

@ -1527,11 +1527,11 @@
// Updated G92 behavior shifts the workspace
#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
// The home offset also shifts the coordinate space
#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && DISABLED(DELTA))
// Either offset yields extra calculations on all moves
#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT || HAS_HOME_OFFSET)
// M206 doesn't apply to DELTA
#define HAS_M206_COMMAND (HAS_HOME_OFFSET && DISABLED(DELTA))
#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) && (IS_SCARA || IS_CARTESIAN))
// Cumulative offset to workspace to save some calculation
#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT && HAS_HOME_OFFSET)
// M206 sets the home offset for Cartesian machines
#define HAS_M206_COMMAND (HAS_HOME_OFFSET && !IS_SCARA)
// LCD timeout to status screen default is 15s
#ifndef LCD_TIMEOUT_TO_STATUS