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

Fix up enqueue now functions

Browse Source 
…and apply to MALYAN_LCD.
This commit is contained in:
Scott Lahteine 2018-04-19 19:33:16 -05:00
parent c91b3142aa
commit 6f87e4b4dc
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin.h
View File

@ -197,13 +197,13 @@ bool enqueue_and_echo_command(const char* cmd, bool say_ok=false); // Add a sing
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();
#define HAS_LCD_QUEUE_NOW (ENABLED(ULTIPANEL) && (ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(PID_AUTOTUNE_MENU) || ENABLED(ADVANCED_PAUSE_FEATURE)))
#define HAS_LCD_QUEUE_NOW (ENABLED(MALYAN_LCD) || (ENABLED(ULTIPANEL) && (ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(PID_AUTOTUNE_MENU) || ENABLED(ADVANCED_PAUSE_FEATURE))))
#define HAS_QUEUE_NOW (ENABLED(SDSUPPORT) || HAS_LCD_QUEUE_NOW)
#if HAS_QUEUE_NOW
// Return only when commands are actually enqueued
void enqueue_and_echo_command_now(const char* cmd, bool say_ok=false);
void enqueue_and_echo_command_now(const char* cmd);
#if HAS_LCD_QUEUE_NOW
void enqueue_and_echo_commands_P_now(const char * const cmd);
void enqueue_and_echo_commands_now_P(const char * const cmd);
#endif
#endif

6
Marlin/Marlin_main.cpp
View File

@ -897,11 +897,11 @@ bool enqueue_and_echo_command(const char* cmd, bool say_ok/*=false*/) {
}
#if HAS_QUEUE_NOW
void enqueue_and_echo_command_now(const char* cmd, bool say_ok/*=false*/) {
while (!enqueue_and_echo_command(cmd, say_ok)) idle();
void enqueue_and_echo_command_now(const char* cmd) {
while (!enqueue_and_echo_command(cmd)) idle();
}
#if HAS_LCD_QUEUE_NOW
void enqueue_and_echo_commands_P_now(const char * const pgcode) {
void enqueue_and_echo_commands_now_P(const char * const pgcode) {
enqueue_and_echo_commands_P(pgcode);
while (drain_injected_commands_P()) idle();
}

10
Marlin/malyanlcd.cpp
View File

@ -106,14 +106,14 @@ void process_lcd_c_command(const char* command) {
// M104 S<temperature>
char cmd[20];
sprintf_P(cmd, PSTR("M104 S%s"), command + 1);
enqueue_and_echo_command_now(cmd, false);
enqueue_and_echo_command_now(cmd);
} break;
case 'P': {
// M140 S<temperature>
char cmd[20];
sprintf_P(cmd, PSTR("M140 S%s"), command + 1);
enqueue_and_echo_command_now(cmd, false);
enqueue_and_echo_command_now(cmd);
} break;
default:
@ -175,8 +175,8 @@ void process_lcd_j_command(const char* command) {
case 'E':
// enable or disable steppers
// switch to relative
enqueue_and_echo_command_now("G91");
enqueue_and_echo_command_now(steppers_enabled ? "M18" : "M17");
enqueue_and_echo_commands_now_P(PSTR("G91"));
enqueue_and_echo_commands_now_P(steppers_enabled ? PSTR("M18") : PSTR("M17"));
steppers_enabled = !steppers_enabled;
break;
case 'A':
@ -242,7 +242,7 @@ void process_lcd_p_command(const char* command) {
break;
case 'H':
// Home all axis
enqueue_and_echo_command_now("G28");
enqueue_and_echo_commands_now_P(PSTR("G28"));
break;
default: {
// Print file 000 - a three digit number indicating which

2
Marlin/ultralcd.cpp
View File

@ -1710,7 +1710,7 @@ void kill_screen(const char* lcd_msg) {
void lcd_enqueue_commands_P(const char * const cmd) {
no_reentry = true;
enqueue_and_echo_commands_P_now(cmd);
enqueue_and_echo_commands_now_P(cmd);
no_reentry = false;
}