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

Jonavin merc additional encoder functionality #13039

Merged
merged 31 commits into from
Jul 3, 2021
Merged

Jonavin merc additional encoder functionality #13039

merged 31 commits into from
Jul 3, 2021

Commits on May 29, 2021

  1. keymap - add fn layer selectable encoder keys

    Jonavin committed May 29, 2021
    Configuration menu
    Copy the full SHA
    9ca134a View commit details
    Browse the repository at this point in the history

  2. update readme with new keymap changes

    Jonavin committed May 29, 2021
    Configuration menu
    Copy the full SHA
    00a25b6 View commit details
    Browse the repository at this point in the history

  3. keymap Additional encoder functionality

    Jonavin committed May 29, 2021
    Configuration menu
    Copy the full SHA
    5d068a3 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2021

  1. Merge 'master' git://github.com/qmk/qmk_firmware

    Jonavin committed May 30, 2021
    Configuration menu
    Copy the full SHA
    e565bb0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'qmk-master' into jonavin-merc-encoderFkeys

    Jonavin committed May 30, 2021
    Configuration menu
    Copy the full SHA
    6b994e1 View commit details
    Browse the repository at this point in the history

  3. readme update

    Jonavin committed May 30, 2021
    Configuration menu
    Copy the full SHA
    6e639eb View commit details
    Browse the repository at this point in the history

  4. fix incoming merge

    Jonavin committed May 30, 2021
    Configuration menu
    Copy the full SHA
    dbaec21 View commit details
    Browse the repository at this point in the history

  5. Update keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c 

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    @Jonavin @drashna
    Jonavin and drashna authored May 30, 2021
    Configuration menu
    Copy the full SHA
    5473061 View commit details
    Browse the repository at this point in the history

  6. Update keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c 

    Co-authored-by: Drashna Jaelre <drashna@live.com>
    @Jonavin @drashna
    Jonavin and drashna authored May 30, 2021
    Configuration menu
    Copy the full SHA
    22a08a3 View commit details
    Browse the repository at this point in the history

  7. fix broken commit from PR recommendation

    Jonavin committed May 30, 2021
    Configuration menu
    Copy the full SHA
    7135623 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. rewrite encoder keymap selection - struct PROGMEM

    Jonavin committed May 31, 2021
    Configuration menu
    Copy the full SHA
    a3049ac View commit details
    Browse the repository at this point in the history

  2. update readme to reflect struct changes

    Jonavin committed May 31, 2021
    Configuration menu
    Copy the full SHA
    f59cbf9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed May 31, 2021
    Configuration menu
    Copy the full SHA
    0b7eee0 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    baf5c5d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    003ab42 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    83b10e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 13, 2021
    Configuration menu
    Copy the full SHA
    544ac6c View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    0922a59 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    4170065 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 18, 2021
    Configuration menu
    Copy the full SHA
    24bd6a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 20, 2021
    Configuration menu
    Copy the full SHA
    59491e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 24, 2021
    Configuration menu
    Copy the full SHA
    3bf5772 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 27, 2021
    Configuration menu
    Copy the full SHA
    192d9d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. update keymap - double tap LShift to toggle CAPS

    Jonavin committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    e6cccbd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 28, 2021
    Configuration menu
    Copy the full SHA
    b303e90 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. add KC_LSFTCAPS to keymap

    Jonavin committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    d11a5d5 View commit details
    Browse the repository at this point in the history

  2. fix keymap SCLN to SCLK

    @Jonavin
    Jonavin committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    6fdf2c9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jun 29, 2021
    Configuration menu
    Copy the full SHA
    77ff941 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jul 1, 2021
    Configuration menu
    Copy the full SHA
    a077b72 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2021

  1. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jul 3, 2021
    Configuration menu
    Copy the full SHA
    6090f6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'qmk:master' into jonavin-merc-encoderFkeys

    @Jonavin
    Jonavin authored Jul 3, 2021
    Configuration menu
    Copy the full SHA
    b3676fa View commit details
    Browse the repository at this point in the history