|
@@ -160,7 +160,7 @@ int16_t g26_bed_temp,
|
160
|
160
|
|
161
|
161
|
int8_t g26_prime_flag;
|
162
|
162
|
|
163
|
|
-#if ENABLED(NEWPANEL)
|
|
163
|
+#if ENABLED(ULTIPANEL)
|
164
|
164
|
|
165
|
165
|
/**
|
166
|
166
|
* If the LCD is clicked, cancel, wait for release, return true
|
|
@@ -331,7 +331,7 @@ inline bool look_for_lines_to_connect() {
|
331
|
331
|
for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
|
332
|
332
|
for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
|
333
|
333
|
|
334
|
|
- #if ENABLED(NEWPANEL)
|
|
334
|
+ #if ENABLED(ULTIPANEL)
|
335
|
335
|
if (user_canceled()) return true; // Check if the user wants to stop the Mesh Validation
|
336
|
336
|
#endif
|
337
|
337
|
|
|
@@ -422,14 +422,14 @@ inline bool turn_on_heaters() {
|
422
|
422
|
if (g26_bed_temp > 25) {
|
423
|
423
|
lcd_setstatusPGM(PSTR("G26 Heating Bed."), 99);
|
424
|
424
|
lcd_quick_feedback(true);
|
425
|
|
- #if ENABLED(NEWPANEL)
|
|
425
|
+ #if ENABLED(ULTIPANEL)
|
426
|
426
|
lcd_external_control = true;
|
427
|
427
|
#endif
|
428
|
428
|
#endif
|
429
|
429
|
thermalManager.setTargetBed(g26_bed_temp);
|
430
|
430
|
while (ABS(thermalManager.degBed() - g26_bed_temp) > 3) {
|
431
|
431
|
|
432
|
|
- #if ENABLED(NEWPANEL)
|
|
432
|
+ #if ENABLED(ULTIPANEL)
|
433
|
433
|
if (is_lcd_clicked()) return exit_from_g26();
|
434
|
434
|
#endif
|
435
|
435
|
|
|
@@ -452,7 +452,7 @@ inline bool turn_on_heaters() {
|
452
|
452
|
thermalManager.setTargetHotend(g26_hotend_temp, 0);
|
453
|
453
|
while (ABS(thermalManager.degHotend(0) - g26_hotend_temp) > 3) {
|
454
|
454
|
|
455
|
|
- #if ENABLED(NEWPANEL)
|
|
455
|
+ #if ENABLED(ULTIPANEL)
|
456
|
456
|
if (is_lcd_clicked()) return exit_from_g26();
|
457
|
457
|
#endif
|
458
|
458
|
|
|
@@ -478,7 +478,7 @@ inline bool turn_on_heaters() {
|
478
|
478
|
*/
|
479
|
479
|
inline bool prime_nozzle() {
|
480
|
480
|
|
481
|
|
- #if ENABLED(NEWPANEL)
|
|
481
|
+ #if ENABLED(ULTIPANEL)
|
482
|
482
|
float Total_Prime = 0.0;
|
483
|
483
|
|
484
|
484
|
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
|
|
@@ -623,7 +623,7 @@ void GcodeSuite::G26() {
|
623
|
623
|
|
624
|
624
|
if (parser.seen('P')) {
|
625
|
625
|
if (!parser.has_value()) {
|
626
|
|
- #if ENABLED(NEWPANEL)
|
|
626
|
+ #if ENABLED(ULTIPANEL)
|
627
|
627
|
g26_prime_flag = -1;
|
628
|
628
|
#else
|
629
|
629
|
SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
|
|
@@ -668,7 +668,7 @@ void GcodeSuite::G26() {
|
668
|
668
|
}
|
669
|
669
|
|
670
|
670
|
int16_t g26_repeats;
|
671
|
|
- #if ENABLED(NEWPANEL)
|
|
671
|
+ #if ENABLED(ULTIPANEL)
|
672
|
672
|
g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
|
673
|
673
|
#else
|
674
|
674
|
if (!parser.seen('R')) {
|
|
@@ -727,7 +727,7 @@ void GcodeSuite::G26() {
|
727
|
727
|
move_to(destination, 0.0);
|
728
|
728
|
move_to(destination, g26_ooze_amount);
|
729
|
729
|
|
730
|
|
- #if ENABLED(NEWPANEL)
|
|
730
|
+ #if ENABLED(ULTIPANEL)
|
731
|
731
|
lcd_external_control = true;
|
732
|
732
|
#endif
|
733
|
733
|
|
|
@@ -835,7 +835,7 @@ void GcodeSuite::G26() {
|
835
|
835
|
plan_arc(endpoint, arc_offset, false); // Draw a counter-clockwise arc
|
836
|
836
|
feedrate_mm_s = save_feedrate;
|
837
|
837
|
set_destination_from_current();
|
838
|
|
- #if ENABLED(NEWPANEL)
|
|
838
|
+ #if ENABLED(ULTIPANEL)
|
839
|
839
|
if (user_canceled()) goto LEAVE; // Check if the user wants to stop the Mesh Validation
|
840
|
840
|
#endif
|
841
|
841
|
|
|
@@ -861,7 +861,7 @@ void GcodeSuite::G26() {
|
861
|
861
|
|
862
|
862
|
for (int8_t ind = start_ind; ind <= end_ind; ind++) {
|
863
|
863
|
|
864
|
|
- #if ENABLED(NEWPANEL)
|
|
864
|
+ #if ENABLED(ULTIPANEL)
|
865
|
865
|
if (user_canceled()) goto LEAVE; // Check if the user wants to stop the Mesh Validation
|
866
|
866
|
#endif
|
867
|
867
|
|
|
@@ -910,7 +910,7 @@ void GcodeSuite::G26() {
|
910
|
910
|
move_to(destination, 0); // Move back to the starting position
|
911
|
911
|
//debug_current_and_destination(PSTR("done doing X/Y move."));
|
912
|
912
|
|
913
|
|
- #if ENABLED(NEWPANEL)
|
|
913
|
+ #if ENABLED(ULTIPANEL)
|
914
|
914
|
lcd_external_control = false; // Give back control of the LCD Panel!
|
915
|
915
|
#endif
|
916
|
916
|
|