SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Followup to _AXIS patch

Browse source
This commit is contained in:
Scott Lahteine 2018-05-13 10:40:45 -05:00
parent d9154ebdf6
commit ba4c32eec5
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/abl/abl.cpp
View file

@ -386,7 +386,7 @@ float bilinear_z_offset(const float raw[XYZ]) {
return; return;
} }
#define LINE_SEGMENT_END(A) (current_position[A ##_AXIS] + (destination[A ##_AXIS] - current_position[A ##_AXIS]) * normalized_dist) #define LINE_SEGMENT_END(A) (current_position[_AXIS(A)] + (destination[_AXIS(A)] - current_position[_AXIS(A)]) * normalized_dist)
float normalized_dist, end[XYZE]; float normalized_dist, end[XYZE];
const int8_t gcx = MAX(cx1, cx2), gcy = MAX(cy1, cy2); const int8_t gcx = MAX(cx1, cx2), gcy = MAX(cy1, cy2);

2
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp
View file

@ -73,7 +73,7 @@
return; return;
} }
#define MBL_SEGMENT_END(A) (current_position[A ##_AXIS] + (destination[A ##_AXIS] - current_position[A ##_AXIS]) * normalized_dist) #define MBL_SEGMENT_END(A) (current_position[_AXIS(A)] + (destination[_AXIS(A)] - current_position[_AXIS(A)]) * normalized_dist)
float normalized_dist, end[XYZE]; float normalized_dist, end[XYZE];
const int8_t gcx = MAX(cx1, cx2), gcy = MAX(cy1, cy2); const int8_t gcx = MAX(cx1, cx2), gcy = MAX(cy1, cy2);

2
Marlin/src/module/endstops.cpp
View file

@ -208,7 +208,7 @@ void Endstops::report_state() {
#endif #endif
#define _ENDSTOP_HIT_ECHO(A,C) do{ \ #define _ENDSTOP_HIT_ECHO(A,C) do{ \
SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", stepper.triggered_position_mm(A ##_AXIS)); \ SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", stepper.triggered_position_mm(_AXIS(A))); \
_SET_STOP_CHAR(A,C); }while(0) _SET_STOP_CHAR(A,C); }while(0)
#define _ENDSTOP_HIT_TEST(A,C) \ #define _ENDSTOP_HIT_TEST(A,C) \

12
Marlin/src/module/stepper.cpp
View file

@ -287,14 +287,14 @@ void Stepper::wake_up() {
*/ */
void Stepper::set_directions() { void Stepper::set_directions() {
#define SET_STEP_DIR(AXIS) \ #define SET_STEP_DIR(A) \
if (motor_direction(AXIS ##_AXIS)) { \ if (motor_direction(_AXIS(A))) { \
AXIS ##_APPLY_DIR(INVERT_## AXIS ##_DIR, false); \ A##_APPLY_DIR(INVERT_## A##_DIR, false); \
count_direction[AXIS ##_AXIS] = -1; \ count_direction[_AXIS(A)] = -1; \
} \ } \
else { \ else { \
AXIS ##_APPLY_DIR(!INVERT_## AXIS ##_DIR, false); \ A##_APPLY_DIR(!INVERT_## A##_DIR, false); \
count_direction[AXIS ##_AXIS] = 1; \ count_direction[_AXIS(A)] = 1; \
} }
#if HAS_X_DIR #if HAS_X_DIR