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

Jump to bottom

New encoder logic with debouncing #26723

Merged
merged 43 commits into from
May 9, 2024
Merged

New encoder logic with debouncing #26723

merged 43 commits into from
May 9, 2024

Commits on Feb 2, 2024

  1. New encoder logic with debouncing

    @dbuezas
    dbuezas committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    5be8b4e View commit details
    Browse the repository at this point in the history

  2. Increase debouncing time to 3ms and fix unused variable warning

    @dbuezas
    dbuezas committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    6d6b163 View commit details
    Browse the repository at this point in the history

  3. Add encoder reset mechanism to avoid off-by-one-step bug in Ender 3

    @dbuezas
    dbuezas committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    c88345d View commit details
    Browse the repository at this point in the history

  4. Encoder reset timeout depends on steps per pulses. Reset may advance … 

    …encoderDiff if passed half a step.
    @dbuezas
    dbuezas committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    92c4c7d View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Advance encoder after a while if it has crossed the half a step thres… 

    …hold while changing direction
    @dbuezas
    dbuezas committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    2100d45 View commit details
    Browse the repository at this point in the history

  2. Revert "Advance encoder after a while if it has crossed the half a st… 

    …ep threshold while changing direction"

This reverts commit 2100d45.
    @dbuezas
    dbuezas committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c9e0792 View commit details
    Browse the repository at this point in the history

  3. Revert "Encoder reset timeout depends on steps per pulses. Reset may … 

    …advance encoderDiff if passed half a step."

This reverts commit 92c4c7d.
    @dbuezas
    dbuezas committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    32fd50d View commit details
    Browse the repository at this point in the history

  4. Make RESET_ENCODER_AFTER_MS depend on ENCODER_PULSES_PER_STEP

    @dbuezas
    dbuezas committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    fc1d80b View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge remote-tracking branch 'OriginalRepo/bugfix-2.1.x' into dbuezas… 

    …/encoder-improvements-v2

# Conflicts:
#	Marlin/src/lcd/marlinui.cpp
    @dbuezas
    dbuezas committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    eaa43b3 View commit details
    Browse the repository at this point in the history

  2. Compute abs_diff after step reset

    @dbuezas
    dbuezas committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    4073275 View commit details
    Browse the repository at this point in the history

  3. Fix no screen wakeup if encoder has 1 pulse per step

    @dbuezas
    dbuezas committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    df74c62 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. misc. cleanup

    @thinkyhead
    thinkyhead committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    160c46d View commit details
    Browse the repository at this point in the history

  2. Test ignoring 2 steps jump.

    @dbuezas
    dbuezas committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    f5b39d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Merge branch 'bugfix-2.1.x' into pr/26723

    @thinkyhead
    thinkyhead committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    e18704b View commit details
    Browse the repository at this point in the history

  2. merge followup

    @thinkyhead
    thinkyhead committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    408aeba View commit details
    Browse the repository at this point in the history

  3. Add missed step detection, remove BLOCK_CLICK_AFTER_MOVEMENT_MS and R… 

    …ESET_ENCODER_AFTER_MS
    @dbuezas
    dbuezas committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3d36ddc View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge branch 'bugfix-2.1.x' into pr/26723

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    0a6ec33 View commit details
    Browse the repository at this point in the history

  2. prettify

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    adff939 View commit details
    Browse the repository at this point in the history

  3. Adjust encoder multiplier

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    5a015dc View commit details
    Browse the repository at this point in the history

  4. Move epps fallback

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    e67b68e View commit details
    Browse the repository at this point in the history

  5. some E3V2 encoder

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    fa68359 View commit details
    Browse the repository at this point in the history

  6. more E3V2

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b928eec View commit details
    Browse the repository at this point in the history

  7. more more

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b6bd7e3 View commit details
    Browse the repository at this point in the history

  8. const

    @thinkyhead
    thinkyhead committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a78a4b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Merge branch 'bugfix-2.1.x' into pr/26723

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    55853b2 View commit details
    Browse the repository at this point in the history

  2. index encoder bits

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    7657a28 View commit details
    Browse the repository at this point in the history

  3. en_A, B

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    f625a8f View commit details
    Browse the repository at this point in the history

  4. struct

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    96f31fe View commit details
    Browse the repository at this point in the history

  5. lvgl encoder

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    04c8a86 View commit details
    Browse the repository at this point in the history

  6. encoder style

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    71a9459 View commit details
    Browse the repository at this point in the history

  7. simplify lv

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    3e4cbed View commit details
    Browse the repository at this point in the history

  8. clarify

    @thinkyhead
    thinkyhead committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    8a5c1be View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. share 'get_encoder_delta'

    @thinkyhead
    thinkyhead committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    bd0a74e View commit details
    Browse the repository at this point in the history

  2. no pause EN1/2

    @thinkyhead
    thinkyhead committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    3ff61dc View commit details
    Browse the repository at this point in the history

  3. use buttons.h

    @thinkyhead
    thinkyhead committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    e329cb6 View commit details
    Browse the repository at this point in the history

  4. const

    @thinkyhead
    thinkyhead committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    1ed1e91 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Merge remote-tracking branch 'upstream/bugfix-2.1.x' into pr/26723

    @thinkyhead
    thinkyhead committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    98ba982 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Use ui.get_encoder_delta in lv_update_encoder

    @thinkyhead
    thinkyhead committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    fb6b08e View commit details
    Browse the repository at this point in the history

  2. Clarify HAS_MARLINUI_ENCODER

    @thinkyhead
    thinkyhead committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    ffb1c82 View commit details
    Browse the repository at this point in the history

  3. unify button init

    @thinkyhead
    thinkyhead committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0467ea4 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. combine ab debounce

    @thinkyhead
    thinkyhead committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    00b8733 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2024

  1. Split up A-B debounce

    @thinkyhead
    thinkyhead committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    49a49ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix-2.1.x' into pr/26723

    @thinkyhead
    thinkyhead committed Apr 14, 2024
    Configuration menu
    Copy the full SHA
    5f84257 View commit details
    Browse the repository at this point in the history