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

[Keymap] Adding Fancy keymap and Bongocat Keymap to Mercutio Keyboard #11520

Merged
merged 17 commits into from
Jan 23, 2021
Merged

[Keymap] Adding Fancy keymap and Bongocat Keymap to Mercutio Keyboard #11520

merged 17 commits into from
Jan 23, 2021

Commits on Dec 14, 2020

  1. Initial commit on new clean branch. Testing out functionality of oled… 

    … and encoder for default features.
    @kylemccreery
    kylemccreery committed Dec 14, 2020
    Configuration menu
    Copy the full SHA
    a71a995 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Cleaned up the initial push and removed the fancy keymap until the ex… 

    …tra features and functionality can be tested and made more user friendly.
    @kylemccreery
    kylemccreery committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    c02689f View commit details
    Browse the repository at this point in the history

  2. Cleaned up the readme some more, compiled and tested both default and… 

    … via keymaps, and did another round of checks to prepare for starting the PR.
    @kylemccreery
    kylemccreery committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    13a94d4 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into mercutio

    @kylemccreery
    kylemccreery committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    d202155 View commit details
    Browse the repository at this point in the history

  4. Cleaning up the keymap to meet expected formatting in a couple places… 

    … and also adding in the TAP_CODE_DELAY after newly encoutnered encoder issues and inconsistencies.
    @kylemccreery
    kylemccreery committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    1397455 View commit details
    Browse the repository at this point in the history

  5. Initial commit of branch specifically for implementing the more compl… 

    …icated fancy keymap as I expect the main PR to be approved first.
    @kylemccreery
    kylemccreery committed Dec 15, 2020
    Configuration menu
    Copy the full SHA
    dd78e13 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. testing bongo cat out

    @kylemccreery
    kylemccreery committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    78dc918 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2020

  1. Progress with intended OLED behavior. Needs to be cleaned up still.

    @kylemccreery
    kylemccreery committed Dec 20, 2020
    Configuration menu
    Copy the full SHA
    ed2ba8f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. Cleaned up bongocat and added WPM display on it.

    @kylemccreery
    kylemccreery committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    83ea91f View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2020

  1. Almost there. Need to rethink the layer checking in encoder.

    @kylemccreery
    kylemccreery committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    1eb878a View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. Merge branch 'master' of https://github.com/kylemccreery/qmk_firmware … 

    …into mercutio_fancy
    @kylemccreery
    kylemccreery committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    285b723 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. Catching up working docs.

    @kylemccreery
    kylemccreery committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    fcc0166 View commit details
    Browse the repository at this point in the history

  2. Fixing all the merge issues I didn't check before doing the last comm… 

    …it. Learn from my mistakes, check your commits.
    @kylemccreery
    kylemccreery committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    508a1d1 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. Fixed and updated fancy firmware and bongocat firmware.

    @kylemccreery
    kylemccreery committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    833b611 View commit details
    Browse the repository at this point in the history

  2. Updating license year since I will be doing a PR anyway.

    @kylemccreery
    kylemccreery committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    c63ecd1 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2021

  1. Merge branch 'master' of https://github.com/qmk/qmk_firmware into mer… 

    …cutio_fancy
    @kylemccreery
    kylemccreery committed Jan 12, 2021
    Configuration menu
    Copy the full SHA
    ed450b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2021

  1. Update keyboards/mechwild/mercutio/keymaps/fancy/keymap.c 

    Co-authored-by: Ryan <[email protected]>
    @kylemccreery @fauxpark
    kylemccreery and fauxpark authored Jan 15, 2021
    Configuration menu
    Copy the full SHA
    1981d47 View commit details
    Browse the repository at this point in the history