|
@@ -753,19 +753,19 @@ void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
|
753
|
753
|
//SERIAL_ECHOLNPAIR("Post Move with Axis ", int(axis), " soon.");
|
754
|
754
|
}
|
755
|
755
|
|
756
|
|
-#endif // HAS_LCD_MENU
|
757
|
|
-
|
758
|
|
-#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
756
|
+ #if ENABLED(AUTO_BED_LEVELING_UBL)
|
759
|
757
|
|
760
|
|
- void MarlinUI::external_encoder() {
|
761
|
|
- if (external_control && encoderDiff) {
|
762
|
|
- ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
|
763
|
|
- encoderDiff = 0; // Hide encoder events from the screen handler
|
764
|
|
- refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh.
|
|
758
|
+ void MarlinUI::external_encoder() {
|
|
759
|
+ if (external_control && encoderDiff) {
|
|
760
|
+ ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
|
|
761
|
+ encoderDiff = 0; // Hide encoder events from the screen handler
|
|
762
|
+ refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh.
|
|
763
|
+ }
|
765
|
764
|
}
|
766
|
|
- }
|
767
|
765
|
|
768
|
|
-#endif
|
|
766
|
+ #endif
|
|
767
|
+
|
|
768
|
+#endif // HAS_LCD_MENU
|
769
|
769
|
|
770
|
770
|
/**
|
771
|
771
|
* Update the LCD, read encoder buttons, etc.
|
|
@@ -1283,7 +1283,9 @@ void MarlinUI::update() {
|
1283
|
1283
|
case encrot2: ENCODER_SPIN(encrot1, encrot3); break;
|
1284
|
1284
|
case encrot3: ENCODER_SPIN(encrot2, encrot0); break;
|
1285
|
1285
|
}
|
1286
|
|
- TERN_(AUTO_BED_LEVELING_UBL, external_encoder());
|
|
1286
|
+ #if BOTH(HAS_LCD_MENU, AUTO_BED_LEVELING_UBL)
|
|
1287
|
+ external_encoder();
|
|
1288
|
+ #endif
|
1287
|
1289
|
lastEncoderBits = enc;
|
1288
|
1290
|
}
|
1289
|
1291
|
|