Skip to content

M
MarlinKimbra
Commit 9db5f36a authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents 338341f2 33759619
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
MK/module/mechanics.h
View file @ 9db5f36a
...@@ -34,5 +34,6 @@ ...@@ -34,5 +34,6 @@
#define MECH_SCARA 4 #define MECH_SCARA 4
#define MECH(mech) (MECHANISM == MECH_##mech) #define MECH(mech) (MECHANISM == MECH_##mech)
#define NOMECH(mech) (MECHANISM != MECH_##mech)
#endif #endif
\ No newline at end of file
MK/module/sanitycheck.h
View file @ 9db5f36a
...@@ -1624,8 +1624,8 @@ ...@@ -1624,8 +1624,8 @@
#if Z_ENDSTOP_SERVO_NR < 0 #if Z_ENDSTOP_SERVO_NR < 0
#error DEPENDENCY ERROR: You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_PROBE_ENDSTOP. #error DEPENDENCY ERROR: You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_PROBE_ENDSTOP.
#endif #endif
#if DISABLED(SERVO_ENDSTOP_ANGLES) #if DISABLED(Z_ENDSTOP_SERVO_ANGLES)
#error DEPENDENCY ERROR: You must have SERVO_ENDSTOP_ANGLES EXIST for Z Extend and Retract to use Z_PROBE_ENDSTOP. #error DEPENDENCY ERROR: You must have Z_ENDSTOP_SERVO_ANGLES EXIST for Z Extend and Retract to use Z_PROBE_ENDSTOP.
#endif #endif
#endif #endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment