diff options
| author | Kyle McCreery <mccreery.kyle@gmail.com> | 2021-01-23 07:32:10 -1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 09:32:10 -0800 |
| commit | 05a4583ce89ae12c8f978fe015ebab387f649575 (patch) | |
| tree | a5081503844adf8d8f0f72f2c4ec56597d792b45 /keyboards/mechwild/mercutio/rules.mk | |
| parent | 7d774fa1dcd90097b06a8589f9087edfbc21967a (diff) | |
[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>
Diffstat (limited to 'keyboards/mechwild/mercutio/rules.mk')
| -rw-r--r--[-rwxr-xr-x] | keyboards/mechwild/mercutio/rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/mechwild/mercutio/rules.mk b/keyboards/mechwild/mercutio/rules.mk index d2a2a02a08..7d02480ec5 100755..100644 --- a/keyboards/mechwild/mercutio/rules.mk +++ b/keyboards/mechwild/mercutio/rules.mk @@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes -OLED_DRIVER_ENABLE = yes +OLED_DRIVER_ENABLE = yes
\ No newline at end of file |