CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2096 from thinkyhead/cherry_picking3

Browse Source 
Hide M117 with no LCD
This commit is contained in:
Scott Lahteine 2015-05-16 21:10:28 -07:00
commit 273a4a253f
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Marlin/Marlin_main.cpp
View File

@ -752,23 +752,31 @@ void get_command() {
} }
#endif #endif
while (MYSERIAL.available() > 0 && commands_in_queue < BUFSIZE) { //
// Loop while serial characters are incoming and the queue is not full
//
while (commands_in_queue < BUFSIZE && MYSERIAL.available() > 0) {
#ifdef NO_TIMEOUTS #ifdef NO_TIMEOUTS
last_command_time = ms; last_command_time = ms;
#endif #endif
serial_char = MYSERIAL.read(); serial_char = MYSERIAL.read();
if (serial_char == '\n' || serial_char == '\r' || //
serial_count >= (MAX_CMD_SIZE - 1) // If the character ends the line, or the line is full...
) { //
if (serial_char == '\n' || serial_char == '\r' || serial_count >= MAX_CMD_SIZE-1) {
// end of line == end of comment // end of line == end of comment
comment_mode = false; comment_mode = false;
if (!serial_count) return; // shortcut for empty lines if (!serial_count) return; // empty lines just exit
char *command = command_queue[cmd_queue_index_w]; char *command = command_queue[cmd_queue_index_w];
command[serial_count] = 0; // terminate string command[serial_count] = 0; // terminate string
// this item in the queue is not from sd
#ifdef SDSUPPORT #ifdef SDSUPPORT
fromsd[cmd_queue_index_w] = false; fromsd[cmd_queue_index_w] = false;
#endif #endif
@ -834,7 +842,7 @@ void get_command() {
serial_count = 0; //clear buffer serial_count = 0; //clear buffer
} }
else if (serial_char == '\\') { // Handle escapes else if (serial_char == '\\') { // Handle escapes
if (MYSERIAL.available() > 0 && commands_in_queue < BUFSIZE) { if (MYSERIAL.available() > 0 && commands_in_queue < BUFSIZE) {
// if we have one more character, copy it over // if we have one more character, copy it over
serial_char = MYSERIAL.read(); serial_char = MYSERIAL.read();
command_queue[cmd_queue_index_w][serial_count++] = serial_char; command_queue[cmd_queue_index_w][serial_count++] = serial_char;
@ -3849,15 +3857,16 @@ inline void gcode_M115() {
SERIAL_PROTOCOLPGM(MSG_M115_REPORT); SERIAL_PROTOCOLPGM(MSG_M115_REPORT);
} }
/** #ifdef ULTIPANEL
* M117: Set LCD Status Message
*/ /**
inline void gcode_M117() { * M117: Set LCD Status Message
char* codepos = strchr_pointer + 5; */
char* starpos = strchr(codepos, '*'); inline void gcode_M117() {
if (starpos) *starpos = '\0'; lcd_setstatus(strchr_pointer + 5);
lcd_setstatus(codepos); }
}
#endif
/** /**
* M119: Output endstop states to serial output * M119: Output endstop states to serial output
@ -5407,9 +5416,13 @@ void process_next_command() {
case 115: // M115: Report capabilities case 115: // M115: Report capabilities
gcode_M115(); gcode_M115();
break; break;
case 117: // M117: Set LCD message text
gcode_M117(); #ifdef ULTIPANEL
break; case 117: // M117: Set LCD message text
gcode_M117();
break;
#endif
case 114: // M114: Report current position case 114: // M114: Report current position
gcode_M114(); gcode_M114();
break; break;