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
f1eaed7e
Commit
f1eaed7e
authored
Jul 12, 2019
by
InsanityAutomation
Committed by
Scott Lahteine
Jul 12, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Only init servo pins used for servos (#14589)
parent
19b24a34
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/HAL/HAL_AVR/HAL.cpp
+4
-4
4 additions, 4 deletions
Marlin/src/HAL/HAL_AVR/HAL.cpp
Marlin/src/HAL/HAL_LPC1768/main.cpp
+4
-4
4 additions, 4 deletions
Marlin/src/HAL/HAL_LPC1768/main.cpp
Marlin/src/inc/Conditionals_post.h
+5
-5
5 additions, 5 deletions
Marlin/src/inc/Conditionals_post.h
with
13 additions
and
13 deletions
Marlin/src/HAL/HAL_AVR/HAL.cpp
+
4
−
4
View file @
f1eaed7e
...
@@ -37,16 +37,16 @@
...
@@ -37,16 +37,16 @@
void
HAL_init
(
void
)
{
void
HAL_init
(
void
)
{
// Init Servo Pins
// Init Servo Pins
#if
PIN_EXISTS(
SERVO0
)
#if
HAS_
SERVO
_
0
OUT_WRITE
(
SERVO0_PIN
,
LOW
);
OUT_WRITE
(
SERVO0_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO1
)
#if
HAS_
SERVO
_
1
OUT_WRITE
(
SERVO1_PIN
,
LOW
);
OUT_WRITE
(
SERVO1_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO2
)
#if
HAS_
SERVO
_
2
OUT_WRITE
(
SERVO2_PIN
,
LOW
);
OUT_WRITE
(
SERVO2_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO3
)
#if
HAS_
SERVO
_
3
OUT_WRITE
(
SERVO3_PIN
,
LOW
);
OUT_WRITE
(
SERVO3_PIN
,
LOW
);
#endif
#endif
}
}
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/HAL_LPC1768/main.cpp
+
4
−
4
View file @
f1eaed7e
...
@@ -73,16 +73,16 @@ void HAL_init(void) {
...
@@ -73,16 +73,16 @@ void HAL_init(void) {
#endif
#endif
// Init Servo Pins
// Init Servo Pins
#if
PIN_EXISTS(
SERVO0
)
#if
HAS_
SERVO
_
0
OUT_WRITE
(
SERVO0_PIN
,
LOW
);
OUT_WRITE
(
SERVO0_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO1
)
#if
HAS_
SERVO
_
1
OUT_WRITE
(
SERVO1_PIN
,
LOW
);
OUT_WRITE
(
SERVO1_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO2
)
#if
HAS_
SERVO
_
2
OUT_WRITE
(
SERVO2_PIN
,
LOW
);
OUT_WRITE
(
SERVO2_PIN
,
LOW
);
#endif
#endif
#if
PIN_EXISTS(
SERVO3
)
#if
HAS_
SERVO
_
3
OUT_WRITE
(
SERVO3_PIN
,
LOW
);
OUT_WRITE
(
SERVO3_PIN
,
LOW
);
#endif
#endif
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/inc/Conditionals_post.h
+
5
−
5
View file @
f1eaed7e
...
@@ -1000,11 +1000,11 @@
...
@@ -1000,11 +1000,11 @@
#define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
#define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
// Servos
// Servos
#define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
#define HAS_SERVO_0 (PIN_EXISTS(SERVO0)
&& NUM_SERVOS > 0
)
#define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
#define HAS_SERVO_1 (PIN_EXISTS(SERVO1)
&& NUM_SERVOS > 1
)
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2)
&& NUM_SERVOS > 2
)
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3)
&& NUM_SERVOS > 3
)
#define HAS_SERVOS
(defined(NUM_SERVOS) &&
NUM_SERVOS > 0)
#define HAS_SERVOS
(
NUM_SERVOS > 0)
#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
#if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
#define Z_PROBE_SERVO_NR -1
#define Z_PROBE_SERVO_NR -1
...
...
...
...
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