|
@@ -418,15 +418,13 @@ inline bool turn_on_heaters() {
|
418
|
418
|
inline bool prime_nozzle() {
|
419
|
419
|
|
420
|
420
|
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f;
|
421
|
|
- #if HAS_LCD_MENU
|
|
421
|
+ #if HAS_LCD_MENU && DISABLED(TOUCH_BUTTONS) // ui.button_pressed issue with touchscreen
|
422
|
422
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
|
423
|
423
|
float Total_Prime = 0.0;
|
424
|
424
|
#endif
|
425
|
425
|
|
426
|
426
|
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
|
427
|
|
- #if HAS_LCD_MENU
|
428
|
|
- ui.capture();
|
429
|
|
- #endif
|
|
427
|
+ ui.capture();
|
430
|
428
|
ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99);
|
431
|
429
|
ui.chirp();
|
432
|
430
|
|
|
@@ -439,7 +437,10 @@ inline bool prime_nozzle() {
|
439
|
437
|
destination.e += 0.25;
|
440
|
438
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
|
441
|
439
|
Total_Prime += 0.25;
|
442
|
|
- if (Total_Prime >= EXTRUDE_MAXLENGTH) return G26_ERR;
|
|
440
|
+ if (Total_Prime >= EXTRUDE_MAXLENGTH) {
|
|
441
|
+ ui.release();
|
|
442
|
+ return G26_ERR;
|
|
443
|
+ }
|
443
|
444
|
#endif
|
444
|
445
|
prepare_internal_move_to_destination(fr_slow_e);
|
445
|
446
|
destination = current_position;
|