|
@ -418,15 +418,13 @@ inline bool turn_on_heaters() { |
|
|
inline bool prime_nozzle() { |
|
|
inline bool prime_nozzle() { |
|
|
|
|
|
|
|
|
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f; |
|
|
const feedRate_t fr_slow_e = planner.settings.max_feedrate_mm_s[E_AXIS] / 15.0f; |
|
|
#if HAS_LCD_MENU |
|
|
#if HAS_LCD_MENU && DISABLED(TOUCH_BUTTONS) // ui.button_pressed issue with touchscreen
|
|
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE) |
|
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE) |
|
|
float Total_Prime = 0.0; |
|
|
float Total_Prime = 0.0; |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
|
|
|
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
|
|
|
#if HAS_LCD_MENU |
|
|
|
|
|
ui.capture(); |
|
|
ui.capture(); |
|
|
#endif |
|
|
|
|
|
ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99); |
|
|
ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99); |
|
|
ui.chirp(); |
|
|
ui.chirp(); |
|
|
|
|
|
|
|
@ -439,7 +437,10 @@ inline bool prime_nozzle() { |
|
|
destination.e += 0.25; |
|
|
destination.e += 0.25; |
|
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE) |
|
|
#if ENABLED(PREVENT_LENGTHY_EXTRUDE) |
|
|
Total_Prime += 0.25; |
|
|
Total_Prime += 0.25; |
|
|
if (Total_Prime >= EXTRUDE_MAXLENGTH) return G26_ERR; |
|
|
if (Total_Prime >= EXTRUDE_MAXLENGTH) { |
|
|
|
|
|
ui.release(); |
|
|
|
|
|
return G26_ERR; |
|
|
|
|
|
} |
|
|
#endif |
|
|
#endif |
|
|
prepare_internal_move_to_destination(fr_slow_e); |
|
|
prepare_internal_move_to_destination(fr_slow_e); |
|
|
destination = current_position; |
|
|
destination = current_position; |
|
|