From 6f26ed23ee0c3fd64bd3521f657e6755b5cacc1a Mon Sep 17 00:00:00 2001
From: Victor Oliveira <rhapsodyv@gmail.com>
Date: Sat, 25 Jul 2020 17:57:16 -0300
Subject: [PATCH] Fix ui.external_control compile error (#18778)
---
Marlin/src/lcd/ultralcd.cpp | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp
index 9968a3218a..88a9c36b36 100644
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -753,19 +753,19 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
//SERIAL_ECHOLNPAIR("Post Move with Axis ", int(axis), " soon.");
}
-#endif // HAS_LCD_MENU
+ #if ENABLED(AUTO_BED_LEVELING_UBL)
-#if ENABLED(AUTO_BED_LEVELING_UBL)
-
- void MarlinUI::external_encoder() {
- if (external_control && encoderDiff) {
- ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
- encoderDiff = 0; // Hide encoder events from the screen handler
- refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh.
+ void MarlinUI::external_encoder() {
+ if (external_control && encoderDiff) {
+ ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
+ encoderDiff = 0; // Hide encoder events from the screen handler
+ refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh.
+ }
}
- }
-#endif
+ #endif
+
+#endif // HAS_LCD_MENU
/**
* Update the LCD, read encoder buttons, etc.
@@ -1283,7 +1283,9 @@ void MarlinUI::update() {
case encrot2: ENCODER_SPIN(encrot1, encrot3); break;
case encrot3: ENCODER_SPIN(encrot2, encrot0); break;
}
- TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
+ #if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
+ external_encoder();
+ #endif
lastEncoderBits = enc;
}