bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

make 'wait' optional and mark as workaround

Browse Source
This commit is contained in:
Wurstnase
2015-04-16 21:42:54 +02:00
parent d69da22f7c
commit b09a957fce
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -724,16 +724,20 @@ void get_command() {
if (drain_queued_commands_P()) return; // priority is given to non-serial commands
static millis_t last_command_time = 0;
millis_t ms = millis();
#ifdef NO_TIMEOUTS
static millis_t last_command_time = 0;
millis_t ms = millis();
if (!MYSERIAL.available() && commands_in_queue == 0 && ms - last_command_time > 1000) {
SERIAL_ECHOLNPGM(MSG_WAIT);
last_command_time = ms;
}
if (!MYSERIAL.available() && commands_in_queue == 0 && ms - last_command_time > 1000) {
SERIAL_ECHOLNPGM(MSG_WAIT);
last_command_time = ms;
}
#endif
while (MYSERIAL.available() > 0 && commands_in_queue < BUFSIZE) {
last_command_time = ms;
#ifdef NO_TIMEOUTS
last_command_time = ms;
#endif
serial_char = MYSERIAL.read();
if (serial_char == '\n' || serial_char == '\r' ||