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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
9a51f29e
Commit
9a51f29e
authored
Feb 24, 2020
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Simplified E_AXIS_HAS macro
parent
ebd2bcc1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/core/drivers.h
+2
-2
2 additions, 2 deletions
Marlin/src/core/drivers.h
Marlin/src/inc/Conditionals_post.h
+0
-53
0 additions, 53 deletions
Marlin/src/inc/Conditionals_post.h
with
2 additions
and
55 deletions
Marlin/src/core/drivers.h
+
2
−
2
View file @
9a51f29e
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
#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_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !
HAS_##
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) \
|| AXIS_DRIVER_TYPE(A,TMC2160) \
|| AXIS_DRIVER_TYPE(A,TMC2160) \
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
|| AXIS_DRIVER_TYPE(A,TMC5160) )
|| AXIS_DRIVER_TYPE(A,TMC5160) )
#define _OR_EAH(N,T) || AXIS_HAS_##T(E##N)
#define _OR_EAH(N,T) || AXIS_HAS_##T(E##N)
#define E_AXIS_HAS(T) (0
RREPEAT2(E_STEPPERS, _OR_EAH,
T))
#define E_AXIS_HAS(T) (0
_OR_EAH(0,T) _OR_EAH(1,T) _OR_EAH(2,T) _OR_EAH(3,T) _OR_EAH(4,T) _OR_EAH(5,T) _OR_EAH(6,T) _OR_EAH(7,
T))
#define ANY_AXIS_HAS(T) ( AXIS_HAS_##T(X) || AXIS_HAS_##T(X2) \
#define ANY_AXIS_HAS(T) ( AXIS_HAS_##T(X) || AXIS_HAS_##T(X2) \
|| AXIS_HAS_##T(Y) || AXIS_HAS_##T(Y2) \
|| AXIS_HAS_##T(Y) || AXIS_HAS_##T(Y2) \
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/inc/Conditionals_post.h
+
0
−
53
View file @
9a51f29e
...
@@ -1444,59 +1444,6 @@
...
@@ -1444,59 +1444,6 @@
#define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
#define HAS_Z4_MAX (PIN_EXISTS(Z4_MAX))
#define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
#define HAS_Z_MIN_PROBE_PIN (HAS_CUSTOM_PROBE_PIN && PIN_EXISTS(Z_MIN_PROBE))
// Cannot use a macro with a defined() statement inside REPEAT macros.
// [AXIS]_HARDWARE_SERIAL definitions are typically strings which cannot be
// tested directly, as they will evaluate to 0.
#ifdef X_HARDWARE_SERIAL
#define HAS_X_HARDWARE_SERIAL 1
#endif
#ifdef X2_HARDWARE_SERIAL
#define HAS_X2_HARDWARE_SERIAL 1
#endif
#ifdef Y_HARDWARE_SERIAL
#define HAS_Y_HARDWARE_SERIAL 1
#endif
#ifdef Y2_HARDWARE_SERIAL
#define HAS_Y2_HARDWARE_SERIAL 1
#endif
#ifdef Z_HARDWARE_SERIAL
#define HAS_Z_HARDWARE_SERIAL 1
#endif
#ifdef Z2_HARDWARE_SERIAL
#define HAS_Z2_HARDWARE_SERIAL 1
#endif
#ifdef Z3_HARDWARE_SERIAL
#define HAS_Z3_HARDWARE_SERIAL 1
#endif
#ifdef Z4_HARDWARE_SERIAL
#define HAS_Z4_HARDWARE_SERIAL 1
#endif
#ifdef E0_HARDWARE_SERIAL
#define HAS_E0_HARDWARE_SERIAL 1
#endif
#ifdef E1_HARDWARE_SERIAL
#define HAS_E1_HARDWARE_SERIAL 1
#endif
#ifdef E2_HARDWARE_SERIAL
#define HAS_E2_HARDWARE_SERIAL 1
#endif
#ifdef E3_HARDWARE_SERIAL
#define HAS_E3_HARDWARE_SERIAL 1
#endif
#ifdef E4_HARDWARE_SERIAL
#define HAS_E4_HARDWARE_SERIAL 1
#endif
#ifdef E5_HARDWARE_SERIAL
#define HAS_E5_HARDWARE_SERIAL 1
#endif
#ifdef E6_HARDWARE_SERIAL
#define HAS_E6_HARDWARE_SERIAL 1
#endif
#ifdef E7_HARDWARE_SERIAL
#define HAS_E7_HARDWARE_SERIAL 1
#endif
//
//
// ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
// ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
//
//
...
...
...
...
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