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
70863fbd
Commit
70863fbd
authored
5 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Avoid name conflict with 'UART'
parent
7709261e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/core/drivers.h
+3
-1
3 additions, 1 deletion
Marlin/src/core/drivers.h
with
3 additions
and
1 deletion
Marlin/src/core/drivers.h
+
3
−
1
View file @
70863fbd
...
@@ -133,6 +133,8 @@
...
@@ -133,6 +133,8 @@
#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) \
#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) \
|| AXIS_DRIVER_TYPE(A,TMC2209) )
|| AXIS_DRIVER_TYPE(A,TMC2209) )
#define AXIS_HAS_RXTX AXIS_HAS_UART
#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
#define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
#define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
...
@@ -172,7 +174,7 @@
...
@@ -172,7 +174,7 @@
#define HAS_STALLGUARD ANY_AXIS_HAS(STALLGUARD)
#define HAS_STALLGUARD ANY_AXIS_HAS(STALLGUARD)
#define HAS_SG_RESULT ANY_AXIS_HAS(SG_RESULT)
#define HAS_SG_RESULT ANY_AXIS_HAS(SG_RESULT)
#define HAS_COOLSTEP ANY_AXIS_HAS(COOLSTEP)
#define HAS_COOLSTEP ANY_AXIS_HAS(COOLSTEP)
#define HAS_TMC_UART ANY_AXIS_HAS(
UART
)
#define HAS_TMC_UART ANY_AXIS_HAS(
RXTX
)
#define HAS_TMC_SPI ANY_AXIS_HAS(SPI)
#define HAS_TMC_SPI ANY_AXIS_HAS(SPI)
#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)
...
...
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