Commit Graph

3 Commits (18dc12cd78448bffe4ad54aa15aa715ee959e64c)

Author SHA1 Message Date
Kyle McCreery 1a7a821582
Merc updates (#12289) 2021-04-12 20:40:38 +02:00
Kyle McCreery 05a4583ce8
[Keymap] Adding Fancy and Bongocat Keymap to Mercutio Keyboard (#11520)
* Initial commit on new clean branch. Testing out functionality of oled and encoder for default features.

* Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly.

* 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.

* 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.

* Initial commit of branch specifically for implementing the more complicated fancy keymap as I expect the main PR to be approved first.

* testing bongo cat out

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

* Cleaned up bongocat and added WPM display on it.

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

* Fixing all the merge issues I didn't check before doing the last commit. Learn from my mistakes, check your commits.

* Fixed and updated fancy firmware and bongocat firmware.

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

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

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-23 09:32:10 -08:00
Kyle McCreery 1d2a9a1cdb
[Keyboard] New Keyboard - Mercutio (#11214)
* Initial commit on new clean branch. Testing out functionality of oled and encoder for default features.

* Cleaned up the initial push and removed the fancy keymap until the extra features and functionality can be tested and made more user friendly.

* 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.

* 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.

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/mechwild/mercutio/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Fixing json syntax.

* Update keyboards/mechwild/mercutio/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-01 15:16:00 -08:00