Skip to content

Commit

Permalink
Rename CORE_AXIS_3 to NORMAL_AXIS
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed May 23, 2016
1 parent 5172d4b commit 0e55c06
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Marlin/Conditionals.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,15 @@
#if ENABLED(COREXY)
#define CORE_AXIS_1 A_AXIS // XY from A + B
#define CORE_AXIS_2 B_AXIS
#define CORE_AXIS_3 Z_AXIS // normal axis
#define NORMAL_AXIS Z_AXIS
#elif ENABLED(COREXZ)
#define CORE_AXIS_1 A_AXIS // XZ from A + C
#define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 Y_AXIS // normal axis
#define NORMAL_AXIS Y_AXIS
#elif ENABLED(COREYZ)
#define CORE_AXIS_1 B_AXIS // YZ from B + C
#define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 X_AXIS // normal axis
#define NORMAL_AXIS X_AXIS
#endif

/**
Expand Down
4 changes: 2 additions & 2 deletions Marlin/temperature.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ class Temperature {
babystepsTodo[CORE_AXIS_1] += distance * 2;
babystepsTodo[CORE_AXIS_2] -= distance * 2;
break;
case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
babystepsTodo[CORE_AXIS_3] += distance;
case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
babystepsTodo[NORMAL_AXIS] += distance;
break;
}
#elif ENABLED(COREXZ) || ENABLED(COREYZ)
Expand Down

0 comments on commit 0e55c06

Please sign in to comment.