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
e7267fe5
Commit
e7267fe5
authored
Oct 28, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Dondolo
parent
5cc5f404
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
27 deletions
+21
-27
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+9
-13
stepper.cpp
MarlinKimbra/stepper.cpp
+12
-14
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
e7267fe5
...
@@ -6950,22 +6950,18 @@ inline void gcode_T(uint8_t tmp_extruder) {
...
@@ -6950,22 +6950,18 @@ inline void gcode_T(uint8_t tmp_extruder) {
active_driver
=
0
;
active_driver
=
0
;
ECHO_LMV
(
DB
,
MSG_ACTIVE_COLOR
,
(
int
)
active_extruder
);
ECHO_LMV
(
DB
,
MSG_ACTIVE_COLOR
,
(
int
)
active_extruder
);
#elif ENABLED(DONDOLO)
#elif ENABLED(DONDOLO)
active_extruder
=
target_extruder
;
active_driver
=
0
;
if
(
active_extruder
==
0
)
{
st_synchronize
();
st_synchronize
();
servo
[
DONDOLO_SERVO_INDEX
].
attach
(
0
);
servo
[
DONDOLO_SERVO_INDEX
].
attach
(
0
);
if
(
target_extruder
==
0
)
{
servo
[
DONDOLO_SERVO_INDEX
].
write
(
DONDOLO_SERVOPOS_E0
);
servo
[
DONDOLO_SERVO_INDEX
].
write
(
DONDOLO_SERVOPOS_E0
);
delay
(
DONDOLO_SERVO_DELAY
);
servo
[
DONDOLO_SERVO_INDEX
].
detach
();
}
}
else
if
(
active_extruder
==
1
)
{
else
if
(
target_extruder
==
1
)
{
st_synchronize
();
servo
[
DONDOLO_SERVO_INDEX
].
attach
(
0
);
servo
[
DONDOLO_SERVO_INDEX
].
write
(
DONDOLO_SERVOPOS_E1
);
servo
[
DONDOLO_SERVO_INDEX
].
write
(
DONDOLO_SERVOPOS_E1
);
}
delay
(
DONDOLO_SERVO_DELAY
);
delay
(
DONDOLO_SERVO_DELAY
);
servo
[
DONDOLO_SERVO_INDEX
].
detach
();
servo
[
DONDOLO_SERVO_INDEX
].
detach
();
}
active_extruder
=
target_extruder
;
active_driver
=
0
;
set_stepper_direction
(
true
);
set_stepper_direction
(
true
);
ECHO_LMV
(
DB
,
MSG_ACTIVE_DRIVER
,
active_driver
);
ECHO_LMV
(
DB
,
MSG_ACTIVE_DRIVER
,
active_driver
);
ECHO_LMV
(
DB
,
MSG_ACTIVE_EXTRUDER
,
active_extruder
);
ECHO_LMV
(
DB
,
MSG_ACTIVE_EXTRUDER
,
active_extruder
);
...
...
MarlinKimbra/stepper.cpp
View file @
e7267fe5
...
@@ -576,25 +576,23 @@ void set_stepper_direction(bool onlye) {
...
@@ -576,25 +576,23 @@ void set_stepper_direction(bool onlye) {
#if DISABLED(ADVANCE) && ENABLED(DONDOLO)
#if DISABLED(ADVANCE) && ENABLED(DONDOLO)
if
(
TEST
(
out_bits
,
E_AXIS
))
{
if
(
TEST
(
out_bits
,
E_AXIS
))
{
if
(
active_extruder
==
0
)
{
switch
(
active_extruder
)
{
REV_E_DIR
();
case
0
:
count_direction
[
E_AXIS
]
=
-
1
;
REV_E_DIR
();
break
;
case
1
:
NORM_E_DIR
();
break
;
}
}
else
{
NORM_E_DIR
();
count_direction
[
E_AXIS
]
=
-
1
;
count_direction
[
E_AXIS
]
=
-
1
;
}
}
}
else
{
else
{
if
(
active_extruder
==
0
)
{
switch
(
active_extruder
)
{
NORM_E_DIR
();
case
0
:
count_direction
[
E_AXIS
]
=
1
;
NORM_E_DIR
();
break
;
case
1
:
REV_E_DIR
();
break
;
}
}
else
{
REV_E_DIR
();
count_direction
[
E_AXIS
]
=
1
;
count_direction
[
E_AXIS
]
=
1
;
}
}
}
#elif DISABLED(ADVANCE)
#elif DISABLED(ADVANCE)
if
(
TEST
(
out_bits
,
E_AXIS
))
{
if
(
TEST
(
out_bits
,
E_AXIS
))
{
REV_E_DIR
();
REV_E_DIR
();
...
...
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