@ -160,7 +160,7 @@ int16_t g26_bed_temp,
int8_t g26_prime_flag ;
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
/**
* If the LCD is clicked , cancel , wait for release , return true
@ -331,7 +331,7 @@ inline bool look_for_lines_to_connect() {
for ( uint8_t i = 0 ; i < GRID_MAX_POINTS_X ; i + + ) {
for ( uint8_t j = 0 ; j < GRID_MAX_POINTS_Y ; j + + ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
if ( user_canceled ( ) ) return true ; // Check if the user wants to stop the Mesh Validation
# endif
@ -422,14 +422,14 @@ inline bool turn_on_heaters() {
if ( g26_bed_temp > 25 ) {
lcd_setstatusPGM ( PSTR ( " G26 Heating Bed. " ) , 99 ) ;
lcd_quick_feedback ( true ) ;
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
lcd_external_control = true ;
# endif
# endif
thermalManager . setTargetBed ( g26_bed_temp ) ;
while ( ABS ( thermalManager . degBed ( ) - g26_bed_temp ) > 3 ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
if ( is_lcd_clicked ( ) ) return exit_from_g26 ( ) ;
# endif
@ -452,7 +452,7 @@ inline bool turn_on_heaters() {
thermalManager . setTargetHotend ( g26_hotend_temp , 0 ) ;
while ( ABS ( thermalManager . degHotend ( 0 ) - g26_hotend_temp ) > 3 ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
if ( is_lcd_clicked ( ) ) return exit_from_g26 ( ) ;
# endif
@ -478,7 +478,7 @@ inline bool turn_on_heaters() {
*/
inline bool prime_nozzle ( ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
float Total_Prime = 0.0 ;
if ( g26_prime_flag = = - 1 ) { // The user wants to control how much filament gets purged
@ -623,7 +623,7 @@ void GcodeSuite::G26() {
if ( parser . seen ( ' P ' ) ) {
if ( ! parser . has_value ( ) ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
g26_prime_flag = - 1 ;
# else
SERIAL_PROTOCOLLNPGM ( " ?Prime length must be specified when not using an LCD. " ) ;
@ -668,7 +668,7 @@ void GcodeSuite::G26() {
}
int16_t g26_repeats ;
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
g26_repeats = parser . intval ( ' R ' , GRID_MAX_POINTS + 1 ) ;
# else
if ( ! parser . seen ( ' R ' ) ) {
@ -727,7 +727,7 @@ void GcodeSuite::G26() {
move_to ( destination , 0.0 ) ;
move_to ( destination , g26_ooze_amount ) ;
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
lcd_external_control = true ;
# endif
@ -835,7 +835,7 @@ void GcodeSuite::G26() {
plan_arc ( endpoint , arc_offset , false ) ; // Draw a counter-clockwise arc
feedrate_mm_s = save_feedrate ;
set_destination_from_current ( ) ;
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
if ( user_canceled ( ) ) goto LEAVE ; // Check if the user wants to stop the Mesh Validation
# endif
@ -861,7 +861,7 @@ void GcodeSuite::G26() {
for ( int8_t ind = start_ind ; ind < = end_ind ; ind + + ) {
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
if ( user_canceled ( ) ) goto LEAVE ; // Check if the user wants to stop the Mesh Validation
# endif
@ -910,7 +910,7 @@ void GcodeSuite::G26() {
move_to ( destination , 0 ) ; // Move back to the starting position
//debug_current_and_destination(PSTR("done doing X/Y move."));
# if ENABLED( NEW PANEL)
# if ENABLED( ULTI PANEL)
lcd_external_control = false ; // Give back control of the LCD Panel!
# endif