Browse Source

Lose the old HOMEAXIS macro

Scott Lahteine 7 years ago
parent
commit
90ba77ea0f
3 changed files with 11 additions and 12 deletions
  1. 8
    8
      Marlin/src/gcode/calibrate/G28.cpp
  2. 3
    3
      Marlin/src/module/delta.cpp
  3. 0
    1
      Marlin/src/module/motion.h

+ 8
- 8
Marlin/src/gcode/calibrate/G28.cpp View File

129
       #endif
129
       #endif
130
 
130
 
131
       do_blocking_move_to_xy(destination[X_AXIS], destination[Y_AXIS]);
131
       do_blocking_move_to_xy(destination[X_AXIS], destination[Y_AXIS]);
132
-      HOMEAXIS(Z);
132
+      homeaxis(Z_AXIS);
133
     }
133
     }
134
     else {
134
     else {
135
       LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
135
       LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
241
 
241
 
242
     #if Z_HOME_DIR > 0  // If homing away from BED do Z first
242
     #if Z_HOME_DIR > 0  // If homing away from BED do Z first
243
 
243
 
244
-      if (home_all || homeZ) HOMEAXIS(Z);
244
+      if (home_all || homeZ) homeaxis(Z_AXIS);
245
 
245
 
246
     #endif
246
     #endif
247
 
247
 
279
         #if ENABLED(CODEPENDENT_XY_HOMING)
279
         #if ENABLED(CODEPENDENT_XY_HOMING)
280
           || homeX
280
           || homeX
281
         #endif
281
         #endif
282
-      ) HOMEAXIS(Y);
282
+      ) homeaxis(Y_AXIS);
283
 
283
 
284
     #endif
284
     #endif
285
 
285
 
294
 
294
 
295
         // Always home the 2nd (right) extruder first
295
         // Always home the 2nd (right) extruder first
296
         active_extruder = 1;
296
         active_extruder = 1;
297
-        HOMEAXIS(X);
297
+        homeaxis(X_AXIS);
298
 
298
 
299
         // Remember this extruder's position for later tool change
299
         // Remember this extruder's position for later tool change
300
         inactive_extruder_x_pos = current_position[X_AXIS];
300
         inactive_extruder_x_pos = current_position[X_AXIS];
301
 
301
 
302
         // Home the 1st (left) extruder
302
         // Home the 1st (left) extruder
303
         active_extruder = 0;
303
         active_extruder = 0;
304
-        HOMEAXIS(X);
304
+        homeaxis(X_AXIS);
305
 
305
 
306
         // Consider the active extruder to be parked
306
         // Consider the active extruder to be parked
307
         COPY(raised_parked_position, current_position);
307
         COPY(raised_parked_position, current_position);
310
 
310
 
311
       #else
311
       #else
312
 
312
 
313
-        HOMEAXIS(X);
313
+        homeaxis(X_AXIS);
314
 
314
 
315
       #endif
315
       #endif
316
     }
316
     }
317
 
317
 
318
     // Home Y (after X)
318
     // Home Y (after X)
319
     #if DISABLED(HOME_Y_BEFORE_X)
319
     #if DISABLED(HOME_Y_BEFORE_X)
320
-      if (home_all || homeY) HOMEAXIS(Y);
320
+      if (home_all || homeY) homeaxis(Y_AXIS);
321
     #endif
321
     #endif
322
 
322
 
323
     // Home Z last if homing towards the bed
323
     // Home Z last if homing towards the bed
326
         #if ENABLED(Z_SAFE_HOMING)
326
         #if ENABLED(Z_SAFE_HOMING)
327
           home_z_safely();
327
           home_z_safely();
328
         #else
328
         #else
329
-          HOMEAXIS(Z);
329
+          homeaxis(Z_AXIS);
330
         #endif
330
         #endif
331
 
331
 
332
         #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
332
         #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)

+ 3
- 3
Marlin/src/module/delta.cpp View File

278
 
278
 
279
   // At least one carriage has reached the top.
279
   // At least one carriage has reached the top.
280
   // Now re-home each carriage separately.
280
   // Now re-home each carriage separately.
281
-  HOMEAXIS(A);
282
-  HOMEAXIS(B);
283
-  HOMEAXIS(C);
281
+  homeaxis(A_AXIS);
282
+  homeaxis(B_AXIS);
283
+  homeaxis(C_AXIS);
284
 
284
 
285
   // Set all carriages to their home positions
285
   // Set all carriages to their home positions
286
   // Do this here all at once for Delta, because
286
   // Do this here all at once for Delta, because

+ 0
- 1
Marlin/src/module/motion.h View File

189
 void set_axis_is_at_home(const AxisEnum axis);
189
 void set_axis_is_at_home(const AxisEnum axis);
190
 
190
 
191
 void homeaxis(const AxisEnum axis);
191
 void homeaxis(const AxisEnum axis);
192
-#define HOMEAXIS(A) homeaxis(_AXIS(A))
193
 
192
 
194
 #if ENABLED(SENSORLESS_HOMING)
193
 #if ENABLED(SENSORLESS_HOMING)
195
   void sensorless_homing_per_axis(const AxisEnum axis, const bool enable=true);
194
   void sensorless_homing_per_axis(const AxisEnum axis, const bool enable=true);

Loading…
Cancel
Save