forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make LOGICAL and RAW position macros ternary-compatible

Browse Source
master
Scott Lahteine 8 years ago
parent 56dd15c0ad
commit ee50928eee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
Marlin/Marlin.h
Unescape View File

@ -294,8 +294,8 @@ void update_software_endstops(AxisEnum axis);
extern float soft_endstop_min[XYZ]; extern float soft_endstop_min[XYZ];
extern float soft_endstop_max[XYZ]; extern float soft_endstop_max[XYZ];
#define LOGICAL_POSITION(POS, AXIS) (POS + home_offset[AXIS] + position_shift[AXIS]) #define LOGICAL_POSITION(POS, AXIS) ((POS) + home_offset[AXIS] + position_shift[AXIS])
#define RAW_POSITION(POS, AXIS) (POS - home_offset[AXIS] - position_shift[AXIS]) #define RAW_POSITION(POS, AXIS) ((POS) - home_offset[AXIS] - position_shift[AXIS])
#define LOGICAL_X_POSITION(POS) LOGICAL_POSITION(POS, X_AXIS) #define LOGICAL_X_POSITION(POS) LOGICAL_POSITION(POS, X_AXIS)
#define LOGICAL_Y_POSITION(POS) LOGICAL_POSITION(POS, Y_AXIS) #define LOGICAL_Y_POSITION(POS) LOGICAL_POSITION(POS, Y_AXIS)
#define LOGICAL_Z_POSITION(POS) LOGICAL_POSITION(POS, Z_AXIS) #define LOGICAL_Z_POSITION(POS) LOGICAL_POSITION(POS, Z_AXIS)

Write Preview
Loading…
Cancel
Save