CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename CORE_AXIS_3 to NORMAL_AXIS

Browse Source
This commit is contained in:
Scott Lahteine 2016-05-20 13:32:30 -07:00
parent 5172d4ba40
commit 0e55c06f7d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Conditionals.h
View File

@ -317,15 +317,15 @@
#if ENABLED(COREXY) #if ENABLED(COREXY)
#define CORE_AXIS_1 A_AXIS // XY from A + B #define CORE_AXIS_1 A_AXIS // XY from A + B
#define CORE_AXIS_2 B_AXIS #define CORE_AXIS_2 B_AXIS
#define CORE_AXIS_3 Z_AXIS // normal axis #define NORMAL_AXIS Z_AXIS
#elif ENABLED(COREXZ) #elif ENABLED(COREXZ)
#define CORE_AXIS_1 A_AXIS // XZ from A + C #define CORE_AXIS_1 A_AXIS // XZ from A + C
#define CORE_AXIS_2 C_AXIS #define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 Y_AXIS // normal axis #define NORMAL_AXIS Y_AXIS
#elif ENABLED(COREYZ) #elif ENABLED(COREYZ)
#define CORE_AXIS_1 B_AXIS // YZ from B + C #define CORE_AXIS_1 B_AXIS // YZ from B + C
#define CORE_AXIS_2 C_AXIS #define CORE_AXIS_2 C_AXIS
#define CORE_AXIS_3 X_AXIS // normal axis #define NORMAL_AXIS X_AXIS
#endif #endif
/** /**

4
Marlin/temperature.h
View File

@ -317,8 +317,8 @@ class Temperature {
babystepsTodo[CORE_AXIS_1] += distance * 2; babystepsTodo[CORE_AXIS_1] += distance * 2;
babystepsTodo[CORE_AXIS_2] -= distance * 2; babystepsTodo[CORE_AXIS_2] -= distance * 2;
break; break;
case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ, X on CoreYZ case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
babystepsTodo[CORE_AXIS_3] += distance; babystepsTodo[NORMAL_AXIS] += distance;
break; break;
} }
#elif ENABLED(COREXZ) || ENABLED(COREYZ) #elif ENABLED(COREXZ) || ENABLED(COREYZ)