Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
b5837b4d
Commit
b5837b4d
authored
May 07, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix stepper.cpp
parent
b1f907a5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
stepper.cpp
MK/module/motion/stepper.cpp
+4
-4
No files found.
MK/module/motion/stepper.cpp
View file @
b5837b4d
...
@@ -408,7 +408,7 @@ inline void update_endstops() {
...
@@ -408,7 +408,7 @@ inline void update_endstops() {
#if MECH(COREXY) || MECH(COREYX)|| MECH(COREXZ) || MECH(COREZX)
#if MECH(COREXY) || MECH(COREYX)|| MECH(COREXZ) || MECH(COREZX)
// Head direction in -X axis for CoreXY and CoreXZ bots.
// Head direction in -X axis for CoreXY and CoreXZ bots.
// If Delta1 == -Delta2, the movement is only in Y or Z axis
// If Delta1 == -Delta2, the movement is only in Y or Z axis
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
CORE_AXIS_2
])
||
(
TEST
(
out_bits
,
A_AXIS
)
==
TEST
(
out_bits
,
CORE_AXIS_2
)
))
{
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
CORE_AXIS_2
])
||
motor_direction
(
A_AXIS
)
==
motor_direction
(
CORE_AXIS_2
))
{
if
(
motor_direction
(
X_HEAD
))
if
(
motor_direction
(
X_HEAD
))
#else
#else
if
(
motor_direction
(
X_AXIS
))
// stepping along -X axis (regular Cartesian bot)
if
(
motor_direction
(
X_AXIS
))
// stepping along -X axis (regular Cartesian bot)
...
@@ -442,7 +442,7 @@ inline void update_endstops() {
...
@@ -442,7 +442,7 @@ inline void update_endstops() {
#if MECH(COREXY) || MECH(COREYX)
#if MECH(COREXY) || MECH(COREYX)
// Head direction in -Y axis for CoreXY bots.
// Head direction in -Y axis for CoreXY bots.
// If DeltaX == DeltaY, the movement is only in X axis
// If DeltaX == DeltaY, the movement is only in X axis
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
B_AXIS
])
||
(
TEST
(
out_bits
,
A_AXIS
)
!=
TEST
(
out_bits
,
B_AXIS
)
))
{
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
B_AXIS
])
||
motor_direction
(
A_AXIS
)
!=
motor_direction
(
B_AXIS
))
{
if
(
motor_direction
(
Y_HEAD
))
if
(
motor_direction
(
Y_HEAD
))
#else
#else
if
(
motor_direction
(
Y_AXIS
))
// -direction
if
(
motor_direction
(
Y_AXIS
))
// -direction
...
@@ -464,7 +464,7 @@ inline void update_endstops() {
...
@@ -464,7 +464,7 @@ inline void update_endstops() {
#if MECH(COREXZ) || MECH(COREZX)
#if MECH(COREXZ) || MECH(COREZX)
// Head direction in -Z axis for CoreXZ bots.
// Head direction in -Z axis for CoreXZ bots.
// If DeltaX == DeltaZ, the movement is only in X axis
// If DeltaX == DeltaZ, the movement is only in X axis
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
C_AXIS
])
||
(
TEST
(
out_bits
,
A_AXIS
)
!=
TEST
(
out_bits
,
C_AXIS
)
))
{
if
((
current_block
->
steps
[
A_AXIS
]
!=
current_block
->
steps
[
C_AXIS
])
||
motor_direction
(
A_AXIS
)
!=
motor_direction
(
C_AXIS
))
{
if
(
motor_direction
(
Z_HEAD
))
if
(
motor_direction
(
Z_HEAD
))
#else
#else
if
(
motor_direction
(
Z_AXIS
))
if
(
motor_direction
(
Z_AXIS
))
...
@@ -1264,7 +1264,7 @@ void st_init() {
...
@@ -1264,7 +1264,7 @@ void st_init() {
enable_endstops
(
true
);
// Start with endstops active. After homing they can be disabled
enable_endstops
(
true
);
// Start with endstops active. After homing they can be disabled
sei
();
sei
();
set_stepper_direction
();
// Init directions to
out
_bits = 0
set_stepper_direction
();
// Init directions to
last_direction
_bits = 0
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment