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
b6d9eb22
Commit
b6d9eb22
authored
8 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Extend Core endstop commentary
parent
c5e08e87
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/endstops.cpp
+10
-4
10 additions, 4 deletions
Marlin/endstops.cpp
with
10 additions
and
4 deletions
Marlin/endstops.cpp
+
10
−
4
View file @
b6d9eb22
...
...
@@ -273,8 +273,6 @@ void Endstops::update() {
#endif
#if CORE_IS_XY || CORE_IS_XZ
// Head direction in -X axis for CoreXY and CoreXZ bots.
// If DeltaA == -DeltaB, the movement is only in only one axis
#if ENABLED(COREYX) || ENABLED(COREZX)
#define CORE_X_CMP !=
#define CORE_X_NOT !
...
...
@@ -282,6 +280,10 @@ void Endstops::update() {
#define CORE_X_CMP ==
#define CORE_X_NOT
#endif
// Head direction in -X axis for CoreXY and CoreXZ bots.
// If steps differ, both axes are moving.
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z, handled below)
// If DeltaA == DeltaB, the movement is only in the 1st axis (X)
if
(
stepper
.
current_block
->
steps
[
CORE_AXIS_1
]
!=
stepper
.
current_block
->
steps
[
CORE_AXIS_2
]
||
stepper
.
motor_direction
(
CORE_AXIS_1
)
CORE_X_CMP
stepper
.
motor_direction
(
CORE_AXIS_2
))
{
if
(
CORE_X_NOT
stepper
.
motor_direction
(
X_HEAD
))
#else
...
...
@@ -324,7 +326,9 @@ void Endstops::update() {
#if CORE_IS_XY || CORE_IS_YZ
// Head direction in -Y axis for CoreXY / CoreYZ bots.
// If DeltaA == DeltaB, the movement is in only one axis
// If steps differ, both axes are moving
// If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y)
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z)
if
(
stepper
.
current_block
->
steps
[
CORE_AXIS_1
]
!=
stepper
.
current_block
->
steps
[
CORE_AXIS_2
]
||
stepper
.
motor_direction
(
CORE_AXIS_1
)
CORE_YZ_CMP
stepper
.
motor_direction
(
CORE_AXIS_2
))
{
if
(
CORE_YZ_NOT
stepper
.
motor_direction
(
Y_HEAD
))
#else
...
...
@@ -346,7 +350,9 @@ void Endstops::update() {
#if CORE_IS_XZ || CORE_IS_YZ
// Head direction in -Z axis for CoreXZ or CoreYZ bots.
// If DeltaA == DeltaB, the movement is in only one axis
// If steps differ, both axes are moving
// If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y, already handled above)
// If DeltaA == -DeltaB, the movement is only in the 2nd axis (Z)
if
(
stepper
.
current_block
->
steps
[
CORE_AXIS_1
]
!=
stepper
.
current_block
->
steps
[
CORE_AXIS_2
]
||
stepper
.
motor_direction
(
CORE_AXIS_1
)
CORE_YZ_CMP
stepper
.
motor_direction
(
CORE_AXIS_2
))
{
if
(
CORE_YZ_NOT
stepper
.
motor_direction
(
Z_HEAD
))
#else
...
...
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