Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
9db5f36a
Commit
9db5f36a
authored
Jun 04, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
338341f2
33759619
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
mechanics.h
MK/module/mechanics.h
+2
-1
sanitycheck.h
MK/module/sanitycheck.h
+2
-2
No files found.
MK/module/mechanics.h
View file @
9db5f36a
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#define MECH_DELTA 3
#define MECH_DELTA 3
#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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment