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
af171136
Commit
af171136
authored
Apr 18, 2016
by
Scott Lahteine
Browse files
Options
Downloads
Plain Diff
Merge pull request #3538 from jbrazio/bugfix/endtop-hit-redeclared
_ENDSTOP_HIT redeclared
parents
daade352
bcf1e027
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/stepper.cpp
+3
-3
3 additions, 3 deletions
Marlin/stepper.cpp
with
3 additions
and
3 deletions
Marlin/stepper.cpp
+
3
−
3
View file @
af171136
...
@@ -298,13 +298,13 @@ void checkHitEndstops() {
...
@@ -298,13 +298,13 @@ void checkHitEndstops() {
#define _SET_STOP_CHAR(A,C) ;
#define _SET_STOP_CHAR(A,C) ;
#endif
#endif
#define _ENDSTOP_HIT(A,C) do{ \
#define _ENDSTOP_HIT
_ECHO
(A,C) do{ \
SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", endstops_trigsteps[A ##_AXIS] / axis_steps_per_unit[A ##_AXIS]); \
SERIAL_ECHOPAIR(" " STRINGIFY(A) ":", endstops_trigsteps[A ##_AXIS] / axis_steps_per_unit[A ##_AXIS]); \
_SET_STOP_CHAR(A,C); }while(0)
_SET_STOP_CHAR(A,C); }while(0)
#define _ENDSTOP_HIT_TEST(A,C) \
#define _ENDSTOP_HIT_TEST(A,C) \
if (TEST(endstop_hit_bits, A ##_MIN) || TEST(endstop_hit_bits, A ##_MAX)) \
if (TEST(endstop_hit_bits, A ##_MIN) || TEST(endstop_hit_bits, A ##_MAX)) \
_ENDSTOP_HIT(A,C)
_ENDSTOP_HIT
_ECHO
(A,C)
SERIAL_ECHO_START
;
SERIAL_ECHO_START
;
SERIAL_ECHOPGM
(
MSG_ENDSTOPS_HIT
);
SERIAL_ECHOPGM
(
MSG_ENDSTOPS_HIT
);
...
@@ -314,7 +314,7 @@ void checkHitEndstops() {
...
@@ -314,7 +314,7 @@ void checkHitEndstops() {
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
#define P_AXIS Z_AXIS
#define P_AXIS Z_AXIS
if
(
TEST
(
endstop_hit_bits
,
Z_MIN_PROBE
))
_ENDSTOP_HIT
(
P
,
'P'
);
if
(
TEST
(
endstop_hit_bits
,
Z_MIN_PROBE
))
_ENDSTOP_HIT
_ECHO
(
P
,
'P'
);
#endif
#endif
SERIAL_EOL
;
SERIAL_EOL
;
...
...
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