HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add Clear HOLD and HOLD display to panel (in cnc mode)
[clinton/Smoothieware.git]
/
src
/
modules
/
utils
/
panel
/
screens
/
cnc
/
WatchScreen.cpp
diff --git
a/src/modules/utils/panel/screens/cnc/WatchScreen.cpp
b/src/modules/utils/panel/screens/cnc/WatchScreen.cpp
index
a99854e
..
01a9cd7
100644
(file)
--- a/
src/modules/utils/panel/screens/cnc/WatchScreen.cpp
+++ b/
src/modules/utils/panel/screens/cnc/WatchScreen.cpp
@@
-207,7
+207,10
@@
const char *WatchScreen::get_status()
if (THEKERNEL->is_halted())
return "ALARM";
- if (THEPANEL->is_suspended() /*|| THEKERNEL->get_feed_hold()*/)
+ if (THEKERNEL->get_feed_hold())
+ return "Hold";
+
+ if (THEPANEL->is_suspended())
return "Suspended";
if (THEPANEL->is_playing())