Add IJK home dir flags

MarlinFirmware · May 19, 2021 · 54ddd6f · 54ddd6f
1 parent 9718e7a
commit 54ddd6f
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 38 deletions.
diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp
@@ -147,9 +147,7 @@ void GcodeSuite::M204() {
  * J = Junction Deviation (mm) (If not using CLASSIC_JERK)
  */
 void GcodeSuite::M205() {
- #define J_PARAM TERN_(HAS_JUNCTION_DEVIATION, "J")
- #define XYZE_PARAM TERN_(HAS_CLASSIC_JERK, "XYZ" AXIS4_STR AXIS5_STR AXIS6_STR "E")
- if (!parser.seen("BST" J_PARAM XYZE_PARAM)) return;
+ if (!parser.seen("BST" TERN_(HAS_JUNCTION_DEVIATION, "J") TERN_(HAS_CLASSIC_JERK, "XYZE"))) return;
 
  //planner.synchronize();
  if (parser.seenval('B')) planner.settings.min_segment_time_us = parser.value_ulong();

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
@@ -817,19 +817,34 @@
 // Homing to Min or Max
 #if X_HOME_DIR > 0
  #define X_HOME_TO_MAX 1
-#else
+#elif X_HOME_DIR < 0
  #define X_HOME_TO_MIN 1
 #endif
 #if Y_HOME_DIR > 0
  #define Y_HOME_TO_MAX 1
-#else
+#elif Y_HOME_DIR < 0
  #define Y_HOME_TO_MIN 1
 #endif
 #if Z_HOME_DIR > 0
  #define Z_HOME_TO_MAX 1
-#else
+#elif Z_HOME_DIR < 0
  #define Z_HOME_TO_MIN 1
 #endif
+#if I_HOME_DIR > 0
+ #define I_HOME_TO_MAX 1
+#elif I_HOME_DIR < 0
+ #define I_HOME_TO_MIN 1
+#endif
+#if J_HOME_DIR > 0
+ #define J_HOME_TO_MAX 1
+#elif J_HOME_DIR < 0
+ #define J_HOME_TO_MIN 1
+#endif
+#if K_HOME_DIR > 0
+ #define K_HOME_TO_MAX 1
+#elif K_HOME_DIR < 0
+ #define K_HOME_TO_MIN 1
+#endif
 
 #if HAS_BED_PROBE
  #if DISABLED(NOZZLE_AS_PROBE)

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -214,7 +214,7 @@
 #ifdef MANUAL_X_HOME_POS
  #define X_HOME_POS MANUAL_X_HOME_POS
 #else
- #define X_END_POS (X_HOME_TO_MIN ? X_MIN_POS : X_MAX_POS)
+ #define X_END_POS TERN(X_HOME_TO_MIN, X_MIN_POS, X_MAX_POS)
  #if ENABLED(BED_CENTER_AT_0_0)
  #define X_HOME_POS TERN(DELTA, 0, X_END_POS)
  #else
@@ -225,7 +225,7 @@
 #ifdef MANUAL_Y_HOME_POS
  #define Y_HOME_POS MANUAL_Y_HOME_POS
 #else
- #define Y_END_POS (Y_HOME_TO_MIN ? Y_MIN_POS : Y_MAX_POS)
+ #define Y_END_POS TERN(Y_HOME_TO_MIN, Y_MIN_POS, Y_MAX_POS)
  #if ENABLED(BED_CENTER_AT_0_0)
  #define Y_HOME_POS TERN(DELTA, 0, Y_END_POS)
  #else
@@ -236,28 +236,28 @@
 #ifdef MANUAL_Z_HOME_POS
  #define Z_HOME_POS MANUAL_Z_HOME_POS
 #else
- #define Z_HOME_POS (Z_HOME_TO_MIN ? Z_MIN_POS : Z_MAX_POS)
+ #define Z_HOME_POS TERN(Z_HOME_TO_MIN, Z_MIN_POS, Z_MAX_POS)
 #endif
 
 #if LINEAR_AXES >= 4
  #ifdef MANUAL_I_HOME_POS
  #define I_HOME_POS MANUAL_I_HOME_POS
  #else
- #define I_HOME_POS (I_HOME_DIR < 0 ? I_MIN_POS : I_MAX_POS)
+ #define I_HOME_POS TERN(I_HOME_TO_MIN, I_MIN_POS, I_MAX_POS)
  #endif
 #endif
 #if LINEAR_AXES >= 5
  #ifdef MANUAL_J_HOME_POS
  #define J_HOME_POS MANUAL_J_HOME_POS
  #else
- #define J_HOME_POS (J_HOME_DIR < 0 ? J_MIN_POS : J_MAX_POS)
+ #define J_HOME_POS TERN(J_HOME_TO_MIN, J_MIN_POS, J_MAX_POS)
  #endif
 #endif
 #if LINEAR_AXES >= 6
  #ifdef MANUAL_K_HOME_POS
  #define K_HOME_POS MANUAL_K_HOME_POS
  #else
- #define K_HOME_POS (K_HOME_DIR < 0 ? K_MIN_POS : K_MAX_POS)
+ #define K_HOME_POS TERN(K_HOME_TO_MIN, K_MIN_POS, K_MAX_POS)
  #endif
 #endif
 

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -2161,17 +2161,17 @@ CODE_N(LINEAR_AXES,
  #error "Enable USE_YMIN_PLUG when homing Y to MIN."
  #elif Y_HOME_TO_MAX && DISABLED(USE_YMAX_PLUG)
  #error "Enable USE_YMAX_PLUG when homing Y to MAX."
- #elif LINEAR_AXES >= 4 && I_HOME_DIR < 0 && DISABLED(USE_IMIN_PLUG)
+ #elif LINEAR_AXES >= 4 && I_HOME_TO_MIN && DISABLED(USE_IMIN_PLUG)
  #error "Enable USE_IMIN_PLUG when homing I to MIN."
- #elif LINEAR_AXES >= 4 && I_HOME_DIR > 0 && DISABLED(USE_IMAX_PLUG)
+ #elif LINEAR_AXES >= 4 && I_HOME_TO_MAX && DISABLED(USE_IMAX_PLUG)
  #error "Enable USE_IMAX_PLUG when homing I to MAX."
- #elif LINEAR_AXES >= 5 && J_HOME_DIR < 0 && DISABLED(USE_JMIN_PLUG)
+ #elif LINEAR_AXES >= 5 && J_HOME_TO_MIN && DISABLED(USE_JMIN_PLUG)
  #error "Enable USE_JMIN_PLUG when homing J to MIN."
- #elif LINEAR_AXES >= 5 && J_HOME_DIR > 0 && DISABLED(USE_JMAX_PLUG)
+ #elif LINEAR_AXES >= 5 && J_HOME_TO_MAX && DISABLED(USE_JMAX_PLUG)
  #error "Enable USE_JMAX_PLUG when homing J to MAX."
- #elif LINEAR_AXES >= 6 && K_HOME_DIR < 0 && DISABLED(USE_KMIN_PLUG)
+ #elif LINEAR_AXES >= 6 && K_HOME_TO_MIN && DISABLED(USE_KMIN_PLUG)
  #error "Enable USE_KMIN_PLUG when homing K to MIN."
- #elif LINEAR_AXES >= 6 && K_HOME_DIR > 0 && DISABLED(USE_KMAX_PLUG)
+ #elif LINEAR_AXES >= 6 && K_HOME_TO_MAX && DISABLED(USE_KMAX_PLUG)
  #error "Enable USE_KMAX_PLUG when homing K to MAX."
  #endif
  #endif
@@ -2751,11 +2751,11 @@ CODE_N(LINEAR_AXES,
  #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMIN (or ENDSTOPPULLUPS) when homing to Z_MIN."
  #elif Z_SENSORLESS && Z_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_ZMAX)
  #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_ZMAX (or ENDSTOPPULLUPS) when homing to Z_MAX."
- #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_IMAX)
+ #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_IMAX)
  #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_IMAX (or ENDSTOPPULLUPS) when homing to I_MAX."
- #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_JMAX)
+ #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_JMAX)
  #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_JMAX (or ENDSTOPPULLUPS) when homing to J_MAX."
- #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_DIR > 0 && DISABLED(ENDSTOPPULLUP_KMAX)
+ #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && DISABLED(ENDSTOPPULLUP_KMAX)
  #error "SENSORLESS_HOMING requires ENDSTOPPULLUP_KMAX (or ENDSTOPPULLUPS) when homing to K_MAX."
  #endif
  #endif
@@ -2801,37 +2801,37 @@ CODE_N(LINEAR_AXES,
  #else
  #error "SENSORLESS_HOMING requires Z_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to Z_MAX."
  #endif
- #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_DIR < 0 && I_MIN_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MIN && I_MIN_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
  #if I_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = true when homing to I_MIN."
  #else
  #error "SENSORLESS_HOMING requires I_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to I_MIN."
  #endif
- #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_DIR > 0 && I_MAX_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 4 && I_SENSORLESS && I_HOME_TO_MAX && I_MAX_ENDSTOP_INVERTING != I_ENDSTOP_INVERTING
  #if I_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = true when homing to I_MAX."
  #else
  #error "SENSORLESS_HOMING requires I_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to I_MAX."
  #endif
- #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_DIR < 0 && J_MIN_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MIN && J_MIN_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
  #if J_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = true when homing to J_MIN."
  #else
  #error "SENSORLESS_HOMING requires J_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to J_MIN."
  #endif
- #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_DIR > 0 && J_MAX_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 5 && J_SENSORLESS && J_HOME_TO_MAX && J_MAX_ENDSTOP_INVERTING != J_ENDSTOP_INVERTING
  #if J_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = true when homing to J_MAX."
  #else
  #error "SENSORLESS_HOMING requires J_MAX_ENDSTOP_INVERTING = false when homing TMC2209 to J_MAX."
  #endif
- #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_DIR < 0 && K_MIN_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MIN && K_MIN_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
  #if K_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = true when homing to K_MIN."
  #else
  #error "SENSORLESS_HOMING requires K_MIN_ENDSTOP_INVERTING = false when homing TMC2209 to K_MIN."
  #endif
- #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_DIR > 0 && K_MAX_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
+ #elif LINEAR_AXES >= 6 && K_SENSORLESS && K_HOME_TO_MAX && K_MAX_ENDSTOP_INVERTING != K_ENDSTOP_INVERTING
  #if K_ENDSTOP_INVERTING
  #error "SENSORLESS_HOMING requires K_MAX_ENDSTOP_INVERTING = true when homing to K_MAX."
  #else

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -488,12 +488,12 @@ bool MarlinUI::get_blink() {
 
  if (RRK(EN_KEYPAD_MIDDLE)) goto_screen(menu_move);
 
- #if DISABLED(DELTA) && Z_HOME_TO_MIN
+ #if NONE(DELTA, Z_HOME_TO_MAX)
  if (RRK(EN_KEYPAD_F2)) _reprapworld_keypad_move(Z_AXIS, 1);
  #endif
 
  if (homed) {
- #if ENABLED(DELTA) || Z_HOME_DIR != -1
+ #if EITHER(DELTA, Z_HOME_TO_MAX)
  if (RRK(EN_KEYPAD_F2)) _reprapworld_keypad_move(Z_AXIS, 1);
  #endif
  if (RRK(EN_KEYPAD_F3)) _reprapworld_keypad_move(Z_AXIS, -1);

diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp
@@ -1042,12 +1042,12 @@ void Endstops::update() {
  #if LINEAR_AXES >= 4
  if (stepper.axis_is_moving(I_AXIS)) {
  if (stepper.motor_direction(I_AXIS_HEAD)) { // -direction
- #if HAS_I_MIN || (I_SPI_SENSORLESS && I_HOME_DIR < 0)
+ #if HAS_I_MIN || (I_SPI_SENSORLESS && I_HOME_TO_MIN)
  PROCESS_ENDSTOP(I, MIN);
  #endif
  }
  else { // +direction
- #if HAS_I_MAX || (I_SPI_SENSORLESS && I_HOME_DIR > 0)
+ #if HAS_I_MAX || (I_SPI_SENSORLESS && I_HOME_TO_MAX)
  PROCESS_ENDSTOP(I, MAX);
  #endif
  }
@@ -1057,12 +1057,12 @@ void Endstops::update() {
  #if LINEAR_AXES >= 5
  if (stepper.axis_is_moving(J_AXIS)) {
  if (stepper.motor_direction(J_AXIS_HEAD)) { // -direction
- #if HAS_J_MIN || (J_SPI_SENSORLESS && J_HOME_DIR < 0)
+ #if HAS_J_MIN || (J_SPI_SENSORLESS && J_HOME_TO_MIN)
  PROCESS_ENDSTOP(J, MIN);
  #endif
  }
  else { // +direction
- #if HAS_J_MAX || (J_SPI_SENSORLESS && J_HOME_DIR > 0)
+ #if HAS_J_MAX || (J_SPI_SENSORLESS && J_HOME_TO_MAX)
  PROCESS_ENDSTOP(J, MAX);
  #endif
  }
@@ -1072,12 +1072,12 @@ void Endstops::update() {
  #if LINEAR_AXES >= 6
  if (stepper.axis_is_moving(K_AXIS)) {
  if (stepper.motor_direction(K_AXIS_HEAD)) { // -direction
- #if HAS_K_MIN || (K_SPI_SENSORLESS && K_HOME_DIR < 0)
+ #if HAS_K_MIN || (K_SPI_SENSORLESS && K_HOME_TO_MIN)
  PROCESS_ENDSTOP(K, MIN);
  #endif
  }
  else { // +direction
- #if HAS_K_MAX || (K_SPI_SENSORLESS && K_HOME_DIR > 0)
+ #if HAS_K_MAX || (K_SPI_SENSORLESS && K_HOME_TO_MAX)
  PROCESS_ENDSTOP(K, MAX);
  #endif
  }

diff --git a/Marlin/src/pins/pins_postprocess.h b/Marlin/src/pins/pins_postprocess.h
@@ -440,7 +440,7 @@
 
 #if LINEAR_AXES >= 4
  #ifdef I_STOP_PIN
- #if I_HOME_DIR < 0
+ #if I_HOME_TO_MIN
  #define I_MIN_PIN I_STOP_PIN
  #define I_MAX_PIN -1
  #else
@@ -459,7 +459,7 @@
 
 #if LINEAR_AXES >= 5
  #ifdef J_STOP_PIN
- #if J_HOME_DIR < 0
+ #if J_HOME_TO_MIN
  #define J_MIN_PIN J_STOP_PIN
  #define J_MAX_PIN -1
  #else
@@ -471,7 +471,7 @@
 
 #if LINEAR_AXES >= 6
  #ifdef K_STOP_PIN
- #if K_HOME_DIR < 0
+ #if K_HOME_TO_MIN
  #define K_MIN_PIN K_STOP_PIN
  #define K_MAX_PIN -1
  #else