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
aa275606
Commit
aa275606
authored
Dec 30, 2014
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix manage inactivity
parent
eb09f322
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Marlin.h
MarlinKimbra/Marlin.h
+1
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+2
-2
No files found.
MarlinKimbra/Marlin.h
View file @
aa275606
...
...
@@ -103,7 +103,7 @@ FORCE_INLINE void serialprintPGM(const char *str)
void
get_command
();
void
process_commands
();
void
manage_inactivity
();
void
manage_inactivity
(
bool
ignore_stepper_queue
=
false
);
#if defined(DUAL_X_CARRIAGE) && defined(X_ENABLE_PIN) && X_ENABLE_PIN > -1 \
&& defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1
...
...
MarlinKimbra/Marlin_main.cpp
View file @
aa275606
...
...
@@ -4904,7 +4904,7 @@ Sigma_Exit:
while
(
!
lcd_clicked
()){
cnt
++
;
manage_heater
();
manage_inactivity
();
manage_inactivity
(
true
);
lcd_update
();
if
(
cnt
==
0
)
{
...
...
@@ -5779,7 +5779,7 @@ void handle_status_leds(void)
}
#endif // TEMP_STAT_LEDS
void
manage_inactivity
(
)
void
manage_inactivity
(
bool
ignore_stepper_queue
/*=false*/
)
//default argument set in Marlin.h
{
#if defined(KILL_PIN) && KILL_PIN > -1
...
...
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