HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
add feed hold to status
[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
aefde1f
..
d8278b2
100644
(file)
--- a/
src/modules/utils/panel/screens/cnc/WatchScreen.cpp
+++ b/
src/modules/utils/panel/screens/cnc/WatchScreen.cpp
@@
-208,8
+208,8
@@
const char *WatchScreen::get_status()
if (THEKERNEL->is_halted())
return "ALARM";
- if (THEPANEL->is_suspended())
- return "
Suspende
d";
+ if (THEPANEL->is_suspended()
|| THEKERNEL->get_feed_hold()
)
+ return "
Feed Hol
d";
if (THEPANEL->is_playing())
return THEPANEL->get_playing_file();