Browse Source

Fix ui.external_control compile error (#18778)

vanilla_fb_2.0.x
Victor Oliveira 4 years ago
committed by GitHub
parent
commit
6f26ed23ee
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      Marlin/src/lcd/ultralcd.cpp

24
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."); //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() { void MarlinUI::external_encoder() {
if (external_control && encoderDiff) { if (external_control && encoderDiff) {
ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing ubl.encoder_diff += encoderDiff; // Encoder for UBL G29 mesh editing
encoderDiff = 0; // Hide encoder events from the screen handler encoderDiff = 0; // Hide encoder events from the screen handler
refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh. refresh(LCDVIEW_REDRAW_NOW); // ...but keep the refresh.
}
} }
}
#endif #endif
#endif // HAS_LCD_MENU
/** /**
* Update the LCD, read encoder buttons, etc. * Update the LCD, read encoder buttons, etc.
@ -1283,7 +1283,9 @@ void MarlinUI::update() {
case encrot2: ENCODER_SPIN(encrot1, encrot3); break; case encrot2: ENCODER_SPIN(encrot1, encrot3); break;
case encrot3: ENCODER_SPIN(encrot2, encrot0); 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; lastEncoderBits = enc;
} }

Loading…
Cancel
Save