SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Misc. comments

Browse source
This commit is contained in:
Scott Lahteine 2018-02-04 17:39:32 -06:00
parent aecf0c9bb9
commit 2ea4e74ed3
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/gcode/bedlevel/G26.cpp
View file

@ -437,9 +437,8 @@ inline bool turn_on_heaters() {
SERIAL_EOL(); SERIAL_EOL();
} }
idle(); idle();
MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace can MYSERIAL0.flush(); // G26 takes a long time to complete. PronterFace may
// over run the serial character buffer with M105's without // overwhelm the serial buffer with M105's without this fix.
// this fix
} }
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
} }
@ -513,8 +512,8 @@ inline bool prime_nozzle() {
wait_for_release(); wait_for_release();
strcpy_P(lcd_status_message, PSTR("Done Priming")); // We can't do lcd_setstatusPGM() without having it continue; strcpy_P(lcd_status_message, PSTR("Done Priming")); // Hack to get the message up. May be obsolete.
// So... We cheat to get a message up.
lcd_setstatusPGM(PSTR("Done Priming"), 99); lcd_setstatusPGM(PSTR("Done Priming"), 99);
lcd_quick_feedback(true); lcd_quick_feedback(true);
lcd_external_control = false; lcd_external_control = false;

5
Marlin/src/lcd/ultralcd.cpp
View file

@ -5410,9 +5410,8 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; }
} }
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
if (lcd_external_control) { if (lcd_external_control) {
ubl.encoder_diff = encoderDiff; // Make the encoder's rotation available to G29's Mesh Editor ubl.encoder_diff = encoderDiff; // Make encoder rotation available to UBL G29 mesh editing.
encoderDiff = 0; // We are going to lie to the LCD Panel and claim the encoder encoderDiff = 0; // Hide the encoder event from the current screen handler.
// knob has not turned.
} }
#endif #endif
lastEncoderBits = enc; lastEncoderBits = enc;