From 2142beb2e5f87bea0f861413f6ef729d3e0d5c84 Mon Sep 17 00:00:00 2001
From: InsanityAutomation
<38436470+InsanityAutomation@users.noreply.github.com>
Date: Sun, 24 Nov 2019 18:04:19 -0500
Subject: [PATCH] Fix UI compile error in UBL (#15981)
---
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp | 26 ++++++++++++++-------
Marlin/src/gcode/bedlevel/G26.cpp | 5 ++--
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
index fefc65756e..8b2e046e45 100644
--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -790,9 +790,13 @@
} while (best.pos.x >= 0 && --count);
- ui.release();
+ #if HAS_LCD_MENU
+ ui.release();
+ #endif
STOW_PROBE(); // Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
- ui.capture();
+ #if HAS_LCD_MENU
+ ui.capture();
+ #endif
#ifdef Z_AFTER_PROBING
move_z_after_probing();
@@ -851,7 +855,9 @@
static void echo_and_take_a_measurement() { SERIAL_ECHOLNPGM(" and take a measurement."); }
float unified_bed_leveling::measure_business_card_thickness(float in_height) {
- ui.capture();
+ #if HAS_LCD_MENU
+ ui.capture();
+ #endif
save_ubl_active_state_and_disable(); // Disable bed level correction for probing
do_blocking_move_to(0.5f * (MESH_MAX_X - (MESH_MIN_X)), 0.5f * (MESH_MAX_Y - (MESH_MIN_Y)), in_height);
@@ -890,8 +896,9 @@
}
void unified_bed_leveling::manually_probe_remaining_mesh(const xy_pos_t &pos, const float &z_clearance, const float &thick, const bool do_ubl_mesh_map) {
-
- ui.capture();
+ #if HAS_LCD_MENU
+ ui.capture();
+ #endif
save_ubl_active_state_and_disable(); // No bed level correction so only raw data is obtained
do_blocking_move_to_xy_z(current_position, z_clearance);
@@ -919,7 +926,9 @@
do_blocking_move_to_z(z_clearance);
KEEPALIVE_STATE(PAUSED_FOR_USER);
- ui.capture();
+ #if HAS_LCD_MENU
+ ui.capture();
+ #endif
if (do_ubl_mesh_map) display_map(g29_map_type); // show user where we're probing
@@ -986,8 +995,9 @@
save_ubl_active_state_and_disable();
LCD_MESSAGEPGM(MSG_UBL_FINE_TUNE_MESH);
- ui.capture(); // Take over control of the LCD encoder
-
+ #if HAS_LCD_MENU
+ ui.capture(); // Take over control of the LCD encoder
+ #endif
do_blocking_move_to_xy_z(pos, Z_CLEARANCE_BETWEEN_PROBES); // Move to the given XY with probe clearance
#if ENABLED(UBL_MESH_EDIT_MOVES_Z)
diff --git a/Marlin/src/gcode/bedlevel/G26.cpp b/Marlin/src/gcode/bedlevel/G26.cpp
index 467b71059c..71fecb837e 100644
--- a/Marlin/src/gcode/bedlevel/G26.cpp
+++ b/Marlin/src/gcode/bedlevel/G26.cpp
@@ -424,8 +424,9 @@ inline bool prime_nozzle() {
#endif
if (g26_prime_flag == -1) { // The user wants to control how much filament gets purged
-
- ui.capture();
+ #if HAS_LCD_MENU
+ ui.capture();
+ #endif
ui.set_status_P(GET_TEXT(MSG_G26_MANUAL_PRIME), 99);
ui.chirp();