Skip to content
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

Reliable encoder wheel action when reversing direction #18694

Merged
merged 13 commits into from
Jul 19, 2020
Merged

Reliable encoder wheel action when reversing direction #18694

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4d302c1
When reversing the encoder direction, a movement step can be missed.
marknn3 Jul 18, 2020
55a9f2e
Update ultralcd.cpp
thinkyhead Jul 18, 2020
b907adf
Update ultralcd.cpp
thinkyhead Jul 18, 2020
8377c6e
Update ultralcd.cpp
thinkyhead Jul 18, 2020
65c25f1
better
thinkyhead Jul 18, 2020
3224373
Update ultralcd.cpp
thinkyhead Jul 18, 2020
d7de0f3
Fix the logic, and include a check for 'past half threshold'.
marknn3 Jul 19, 2020
b9bf696
Removed comment because it is not relevant anymore
marknn3 Jul 19, 2020
e657530
Different approach. The edge-cases are now fixed.
marknn3 Jul 19, 2020
4346731
Tweaks while reviewing
thinkyhead Jul 19, 2020
07f7f85
Update ultralcd.cpp
thinkyhead Jul 19, 2020
a219963
Update ultralcd.cpp
thinkyhead Jul 19, 2020
9b8eb20
Expand comments
thinkyhead Jul 19, 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
25 changes: 13 additions & 12 deletions Marlin/src/lcd/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,20 +902,21 @@ void MarlinUI::update() {
// When reversing the encoder direction, a movement step can be missed because
// encoderDiff has a non-zero residual value, making the controller unresponsive.
// The fix clears the residual value when the encoder is reversed.
// Also check if passed half the threshold. This will compensate for missed single steps.
// Also check if past half the threshold to compensate for missed single steps.
static int8_t lastEncoderDiff;
int8_t prevDiff = lastEncoderDiff;
lastEncoderDiff = encoderDiff; // Store before updating encoderDiff to save actual steps

// When not past threshold, and reversing... or past half the threshold
if ((encoderDiff != 0 && abs_diff < (ENCODER_PULSES_PER_STEP)) && // Not past threshold
(
abs_diff > (ENCODER_PULSES_PER_STEP) / 2 || // Passed half the threshold
(ABS(encoderDiff - lastEncoderDiff) >= (ENCODER_PULSES_PER_STEP) && ABS(lastEncoderDiff) < (ENCODER_PULSES_PER_STEP)) // Or direction change through zero
)) {
lastEncoderDiff = encoderDiff; // Store before updating encoderDiff, we want actual steps
encoderDiff = (encoderDiff < 0 ? -1 : 1) * (ENCODER_PULSES_PER_STEP); // Treat as full step
abs_diff = ENCODER_PULSES_PER_STEP;
}
else {
lastEncoderDiff = encoderDiff;
if (WITHIN(abs_diff, 1, (ENCODER_PULSES_PER_STEP) - 1) // Not past threshold
&& (abs_diff > (ENCODER_PULSES_PER_STEP) / 2 // Passed half the threshold?
|| (ABS(encoderDiff - prevDiff) >= (ENCODER_PULSES_PER_STEP) // Or a large change...
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
&& ABS(prevDiff) < (ENCODER_PULSES_PER_STEP) // ...starting from a partial step?
)
)
) {
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
encoderDiff = (encoderDiff < 0 ? -1 : 1) * (ENCODER_PULSES_PER_STEP); // Treat as full step
abs_diff = ENCODER_PULSES_PER_STEP;
}
#endif

Expand Down