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
c01f1b7c
Commit
c01f1b7c
authored
Apr 19, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix servo
parent
e8a8bd84
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+10
-10
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
c01f1b7c
...
...
@@ -406,7 +406,7 @@ bool target_direction;
#ifdef SDSUPPORT
static
bool
fromsd
[
BUFSIZE
];
#endif
//!SDSUPPORT
#endif
#ifdef FILAMENTCHANGEENABLE
bool
filament_changing
=
false
;
...
...
@@ -1338,12 +1338,12 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
// Engage Z Servo endstop if enabled
if
(
servo_endstops
[
Z_AXIS
]
>=
0
)
{
#if SERVO_LEVELING
servo
s
[
servo_endstops
[
Z_AXIS
]].
attach
(
0
);
servo
[
servo_endstops
[
Z_AXIS
]].
attach
(
0
);
#endif
servo
s
[
servo_endstops
[
Z_AXIS
]].
write
(
servo_endstop_angles
[
Z_AXIS
*
2
]);
servo
[
servo_endstops
[
Z_AXIS
]].
write
(
servo_endstop_angles
[
Z_AXIS
*
2
]);
#if SERVO_LEVELING_DELAY
delay
(
PROBE_SERVO_DEACTIVATION_DELAY
);
servo
s
[
servo_endstops
[
Z_AXIS
]].
detach
();
servo
[
servo_endstops
[
Z_AXIS
]].
detach
();
#endif
}
#endif //NUM_SERVOS > 0
...
...
@@ -1361,14 +1361,14 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
*/
#if SERVO_LEVELING
servo
s
[
servo_endstops
[
Z_AXIS
]].
attach
(
0
);
servo
[
servo_endstops
[
Z_AXIS
]].
attach
(
0
);
#endif
servo
s
[
servo_endstops
[
Z_AXIS
]].
write
(
servo_endstop_angles
[
Z_AXIS
*
2
+
1
]);
servo
[
servo_endstops
[
Z_AXIS
]].
write
(
servo_endstop_angles
[
Z_AXIS
*
2
+
1
]);
#if SERVO_LEVELING
delay
(
PROBE_SERVO_DEACTIVATION_DELAY
);
servo
s
[
servo_endstops
[
Z_AXIS
]].
detach
();
servo
[
servo_endstops
[
Z_AXIS
]].
detach
();
#endif
}
#endif //NUM_SERVOS > 0
...
...
@@ -1447,7 +1447,7 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
#endif
{
if
(
servo_endstops
[
axis
]
>
-
1
)
servo
s
[
servo_endstops
[
axis
]].
write
(
servo_endstop_angles
[
axis
*
2
]);
servo
[
servo_endstops
[
axis
]].
write
(
servo_endstop_angles
[
axis
*
2
]);
}
#endif // SERVO_ENDSTOPS && !Z_PROBE_SLED
...
...
@@ -1514,7 +1514,7 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
// Retract Servo endstop if enabled
#if NUM_SERVOS > 0
if
(
servo_endstops
[
axis
]
>
-
1
)
servo
s
[
servo_endstops
[
axis
]].
write
(
servo_endstop_angles
[
axis
*
2
+
1
]);
servo
[
servo_endstops
[
axis
]].
write
(
servo_endstop_angles
[
axis
*
2
+
1
]);
#endif
#if SERVO_LEVELING && !defined(Z_PROBE_SLED)
...
...
@@ -6872,7 +6872,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
if
(
!
filament_changing
)
#endif
{
if
(
degHotend
(
active_extruder
)
<
IDLE_OOZING_MAXTEMP
&&
degTargetHotend
(
active_extruder
)
<
IDLE_OOZING_MINTEMP
)
{
if
(
degHotend
(
active_extruder
)
<
IDLE_OOZING_MAXTEMP
&&
degTargetHotend
(
active_extruder
)
<
IDLE_OOZING_MINTEMP
)
{
IDLE_OOZING_retract
(
false
);
}
else
if
((
millis
()
-
axis_last_activity
)
>
IDLE_OOZING_SECONDS
*
1000
)
{
...
...
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