HCoop
/
clinton
/
Smoothieware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc7ea0e
)
Clewar feed hold when alarm is cleared
author
Jim Morris
<morris@wolfman.com>
Mon, 16 Jul 2018 11:52:43 +0000
(12:52 +0100)
committer
Jim Morris
<morris@wolfman.com>
Mon, 16 Jul 2018 11:52:43 +0000
(12:52 +0100)
src/libs/Kernel.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/libs/Kernel.cpp
b/src/libs/Kernel.cpp
index
83fe48c
..
58793d3
100644
(file)
--- a/
src/libs/Kernel.cpp
+++ b/
src/libs/Kernel.cpp
@@
-314,6
+314,7
@@
void Kernel::call_event(_EVENT_ENUM id_event, void * argument)
bool was_idle = true;
if(id_event == ON_HALT) {
this->halted = (argument == nullptr);
+ if(!this->halted && this->feed_hold) this->feed_hold= false; // also clear feed hold
was_idle = conveyor->is_idle(); // see if we were doing anything like printing
}