Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
1d6f90b0
Commit
1d6f90b0
authored
9 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Plain Diff
Merge pull request #3365 from thinkyhead/fix_fancy_new_endstop_config
Fix bug in new endstop pullups handling
parents
de39056f
c0e72579
Branches
Branches containing commit
Tags
Tags containing commit
Loading
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/Conditionals.h
+7
-7
7 additions, 7 deletions
Marlin/Conditionals.h
with
7 additions
and
7 deletions
Marlin/Conditionals.h
+
7
−
7
View file @
1d6f90b0
...
@@ -278,25 +278,25 @@
...
@@ -278,25 +278,25 @@
* Set ENDSTOPPULLUPS for unused endstop switches
* Set ENDSTOPPULLUPS for unused endstop switches
*/
*/
#if ENABLED(ENDSTOPPULLUPS)
#if ENABLED(ENDSTOPPULLUPS)
#if
DIS
ABLED(USE_XMAX_PLUG)
#if
EN
ABLED(USE_XMAX_PLUG)
#define ENDSTOPPULLUP_XMAX
#define ENDSTOPPULLUP_XMAX
#endif
#endif
#if
DIS
ABLED(USE_YMAX_PLUG)
#if
EN
ABLED(USE_YMAX_PLUG)
#define ENDSTOPPULLUP_YMAX
#define ENDSTOPPULLUP_YMAX
#endif
#endif
#if
DIS
ABLED(USE_ZMAX_PLUG)
#if
EN
ABLED(USE_ZMAX_PLUG)
#define ENDSTOPPULLUP_ZMAX
#define ENDSTOPPULLUP_ZMAX
#endif
#endif
#if
DIS
ABLED(USE_XMIN_PLUG)
#if
EN
ABLED(USE_XMIN_PLUG)
#define ENDSTOPPULLUP_XMIN
#define ENDSTOPPULLUP_XMIN
#endif
#endif
#if
DIS
ABLED(USE_YMIN_PLUG)
#if
EN
ABLED(USE_YMIN_PLUG)
#define ENDSTOPPULLUP_YMIN
#define ENDSTOPPULLUP_YMIN
#endif
#endif
#if
DIS
ABLED(USE_ZMIN_PLUG)
#if
EN
ABLED(USE_ZMIN_PLUG)
#define ENDSTOPPULLUP_ZMIN
#define ENDSTOPPULLUP_ZMIN
#endif
#endif
#if
DIS
ABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)
#if
EN
ABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)
#define ENDSTOPPULLUP_ZMIN_PROBE
#define ENDSTOPPULLUP_ZMIN_PROBE
#endif
#endif
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment