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

🚸 Tweak MKS UI G-code console

Browse Source
This commit is contained in:
Scott Lahteine 2021-10-17 20:24:41 -05:00 committed by Scott Lahteine
parent 01a0f3a8cf
commit af08f16efc
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/queue.h
View File

@ -133,7 +133,7 @@ public:
* Enqueue command(s) to run from SRAM. Drained by process_injected_command(). * Enqueue command(s) to run from SRAM. Drained by process_injected_command().
* Aborts the current SRAM queue so only use for one or two commands. * Aborts the current SRAM queue so only use for one or two commands.
*/ */
static inline void inject(char * const gcode) { static inline void inject(const char * const gcode) {
strncpy(injected_commands, gcode, sizeof(injected_commands) - 1); strncpy(injected_commands, gcode, sizeof(injected_commands) - 1);
} }

2
Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
View File

@ -82,8 +82,6 @@ void lv_serial_capt_hook(void * userPointer, uint8_t c) {
void lv_eom_hook(void *) { void lv_eom_hook(void *) {
// Message is done, let's remove the hook now // Message is done, let's remove the hook now
MYSERIAL1.setHook(); MYSERIAL1.setHook();
// We are back from the keyboard, so let's redraw ourselves
draw_return_ui();
} }
void lv_draw_gcode(bool clear) { void lv_draw_gcode(bool clear) {

10
Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
View File

@ -164,13 +164,13 @@ static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
draw_return_ui(); draw_return_ui();
break; break;
case GCodeCommand: case GCodeCommand:
if (!queue.ring_buffer.full(3)) { if (ret_ta_txt[0] && !queue.ring_buffer.full(3)) {
// Hook anything that goes to the serial port // Hook for the next bytes to arrive from the serial port
MYSERIAL1.setHook(lv_serial_capt_hook, lv_eom_hook, 0); MYSERIAL1.setHook(lv_serial_capt_hook, lv_eom_hook, 0);
queue.enqueue_one_now(ret_ta_txt); // Run the command as soon as possible
queue.inject(ret_ta_txt);
} }
lv_clear_keyboard(); goto_previous_ui();
// draw_return_ui is called in the end of message hook
break; break;
default: break; default: break;
} }