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:
17aca3f
)
only enable ! and ~ if in grbl mode
author
Jim Morris
<morris@wolfman.com>
Thu, 28 Jan 2016 23:06:48 +0000
(15:06 -0800)
committer
Jim Morris
<morris@wolfman.com>
Thu, 28 Jan 2016 23:06:48 +0000
(15:06 -0800)
src/libs/USBDevice/USBSerial/USBSerial.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/libs/USBDevice/USBSerial/USBSerial.cpp
b/src/libs/USBDevice/USBSerial/USBSerial.cpp
index
e4ece61
..
457febe
100644
(file)
--- a/
src/libs/USBDevice/USBSerial/USBSerial.cpp
+++ b/
src/libs/USBDevice/USBSerial/USBSerial.cpp
@@
-207,14
+207,16
@@
bool USBSerial::USBEvent_EPOut(uint8_t bEP, uint8_t bEPStatus)
continue;
\r
}
\r
\r
- if(c[i] == '!'){ // safe pause
\r
- THEKERNEL->set_feed_hold(true);
\r
- continue;
\r
- }
\r
+ if(THEKERNEL->is_grbl_mode()) {
\r
+ if(c[i] == '!'){ // safe pause
\r
+ THEKERNEL->set_feed_hold(true);
\r
+ continue;
\r
+ }
\r
\r
- if(c[i] == '~'){ // safe resume
\r
- THEKERNEL->set_feed_hold(false);
\r
- continue;
\r
+ if(c[i] == '~'){ // safe resume
\r
+ THEKERNEL->set_feed_hold(false);
\r
+ continue;
\r
+ }
\r
}
\r
\r
if (flush_to_nl == false)
\r