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:
a9abe0b
)
Allow unkill button to clear halt generated from another source
author
Jim Morris
<morris@wolfman.com>
Sun, 6 Dec 2015 07:09:42 +0000
(23:09 -0800)
committer
Jim Morris
<morris@wolfman.com>
Sun, 6 Dec 2015 07:09:42 +0000
(23:09 -0800)
src/modules/utils/killbutton/KillButton.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/modules/utils/killbutton/KillButton.cpp
b/src/modules/utils/killbutton/KillButton.cpp
index
aa2bf66
..
cdceb1e
100644
(file)
--- a/
src/modules/utils/killbutton/KillButton.cpp
+++ b/
src/modules/utils/killbutton/KillButton.cpp
@@
-76,6
+76,7
@@
uint32_t KillButton::button_tick(uint32_t dummy)
switch(state) {
case IDLE:
if(!this->kill_button.get()) state= KILL_BUTTON_DOWN;
+ else if(unkill_enable && killed) state= KILLED_BUTTON_UP; // allow kill button to unkill if kill was created fromsome other source
break;
case KILL_BUTTON_DOWN:
if(killed) state= KILLED_BUTTON_DOWN;