MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync enqueue_and_echo_command with 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine 2018-07-25 18:06:25 -05:00
parent e5b928f574
commit 349cf3ee5a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.h
View File

@ -193,7 +193,7 @@ extern bool Running;
inline bool IsRunning() { return Running; } inline bool IsRunning() { return Running; }
inline bool IsStopped() { return !Running; } inline bool IsStopped() { return !Running; }
bool enqueue_and_echo_command(const char* cmd, bool say_ok=false); // Add a single command to the end of the buffer. Return false on failure. bool enqueue_and_echo_command(const char* cmd); // Add a single command to the end of the buffer. Return false on failure.
void enqueue_and_echo_commands_P(const char * const cmd); // Set one or more commands to be prioritized over the next Serial/SD command. void enqueue_and_echo_commands_P(const char * const cmd); // Set one or more commands to be prioritized over the next Serial/SD command.
void clear_command_queue(); void clear_command_queue();

4
Marlin/Marlin_main.cpp
View File

@ -871,8 +871,8 @@ inline bool _enqueuecommand(const char* cmd, bool say_ok=false) {
/** /**
* Enqueue with Serial Echo * Enqueue with Serial Echo
*/ */
bool enqueue_and_echo_command(const char* cmd, bool say_ok/*=false*/) { bool enqueue_and_echo_command(const char* cmd) {
if (_enqueuecommand(cmd, say_ok)) { if (_enqueuecommand(cmd)) {
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd); SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd);
SERIAL_CHAR('"'); SERIAL_CHAR('"');

2
Marlin/malyanlcd.cpp
View File

@ -332,7 +332,7 @@ void process_lcd_s_command(const char* command) {
case 'H': case 'H':
// Home all axis // Home all axis
enqueue_and_echo_command("G28", false); enqueue_and_echo_command("G28");
break; break;
case 'L': { case 'L': {