Browse Source

Rename CORE_AXIS_3 to NORMAL_AXIS

Scott Lahteine 8 years ago
parent
commit
0e55c06f7d
2 changed files with 5 additions and 5 deletions
  1. 3
    3
      Marlin/Conditionals.h
  2. 2
    2
      Marlin/temperature.h

+ 3
- 3
Marlin/Conditionals.h View File

317
   #if ENABLED(COREXY)
317
   #if ENABLED(COREXY)
318
     #define CORE_AXIS_1 A_AXIS // XY from A + B
318
     #define CORE_AXIS_1 A_AXIS // XY from A + B
319
     #define CORE_AXIS_2 B_AXIS
319
     #define CORE_AXIS_2 B_AXIS
320
-    #define CORE_AXIS_3 Z_AXIS // normal axis
320
+    #define NORMAL_AXIS Z_AXIS
321
   #elif ENABLED(COREXZ)
321
   #elif ENABLED(COREXZ)
322
     #define CORE_AXIS_1 A_AXIS // XZ from A + C
322
     #define CORE_AXIS_1 A_AXIS // XZ from A + C
323
     #define CORE_AXIS_2 C_AXIS
323
     #define CORE_AXIS_2 C_AXIS
324
-    #define CORE_AXIS_3 Y_AXIS // normal axis
324
+    #define NORMAL_AXIS Y_AXIS
325
   #elif ENABLED(COREYZ)
325
   #elif ENABLED(COREYZ)
326
     #define CORE_AXIS_1 B_AXIS // YZ from B + C
326
     #define CORE_AXIS_1 B_AXIS // YZ from B + C
327
     #define CORE_AXIS_2 C_AXIS
327
     #define CORE_AXIS_2 C_AXIS
328
-    #define CORE_AXIS_3 X_AXIS // normal axis
328
+    #define NORMAL_AXIS X_AXIS
329
   #endif
329
   #endif
330
 
330
 
331
   /**
331
   /**

+ 2
- 2
Marlin/temperature.h View File

317
                 babystepsTodo[CORE_AXIS_1] += distance * 2;
317
                 babystepsTodo[CORE_AXIS_1] += distance * 2;
318
                 babystepsTodo[CORE_AXIS_2] -= distance * 2;
318
                 babystepsTodo[CORE_AXIS_2] -= distance * 2;
319
                 break;
319
                 break;
320
-              case CORE_AXIS_3: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
321
-                babystepsTodo[CORE_AXIS_3] += distance;
320
+              case NORMAL_AXIS: // Z on CoreXY, Y on CoreXZ, X on CoreYZ
321
+                babystepsTodo[NORMAL_AXIS] += distance;
322
                 break;
322
                 break;
323
             }
323
             }
324
           #elif ENABLED(COREXZ) || ENABLED(COREYZ)
324
           #elif ENABLED(COREXZ) || ENABLED(COREYZ)

Loading…
Cancel
Save