Skip to content

touch: allow mesh value edit with UBL #16432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from
Jan 3, 2020
Merged

touch: allow mesh value edit with UBL #16432

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0117975
touch: allow mesh value edit with UBL
tpruvot Jan 2, 2020
b8b40fe
touch: disable conflicting/dead wheel code
tpruvot Jan 3, 2020
a732eed
check ubl external_control bool
tpruvot Jan 3, 2020
dd06f50
Update ultralcd.cpp
thinkyhead Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Marlin/src/lcd/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,9 @@ void MarlinUI::update() {
if (ELAPSED(ms, next_button_update_ms)) {
encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection;
if (buttons & EN_A) encoderDiff *= -1;
#if ENABLED(AUTO_BED_LEVELING_UBL)
if (external_control) ubl.encoder_diff = encoderDiff;
#endif
next_button_update_ms = ms + repeat_delay; // Assume the repeat delay
if (!wait_for_unclick) {
next_button_update_ms += 250; // Longer delay on first press
Expand Down Expand Up @@ -1275,7 +1278,7 @@ void MarlinUI::update() {

} // next_button_update_ms

#if HAS_ENCODER_WHEEL
#if HAS_ENCODER_WHEEL && DISABLED(TOUCH_BUTTONS)
static uint8_t lastEncoderBits;

#define encrot0 0
Expand Down