HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
allow feed hold to be enabled independently of grbl mode, so in grbl mode it is set...
[clinton/Smoothieware.git]
/
src
/
libs
/
USBDevice
/
USBSerial
/
USBSerial.cpp
diff --git
a/src/libs/USBDevice/USBSerial/USBSerial.cpp
b/src/libs/USBDevice/USBSerial/USBSerial.cpp
index
cd7ab1f
..
c308d67
100644
(file)
--- a/
src/libs/USBDevice/USBSerial/USBSerial.cpp
+++ b/
src/libs/USBDevice/USBSerial/USBSerial.cpp
@@
-198,7
+198,7
@@
bool USBSerial::USBEvent_EPOut(uint8_t bEP, uint8_t bEPStatus)
continue;
}
- if(THEKERNEL->is_grbl_mode()) {
+ if(THEKERNEL->is_grbl_mode()
|| THEKERNEL->is_feed_hold_enabled()
) {
if(c[i] == '!') { // safe pause
THEKERNEL->set_feed_hold(true);
continue;