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/config.h | |
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/config.h')
-rwxr-xr-x | keyboards/mechwild/mercutio/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h index 457b3bfdf9..2c318848c5 100755 --- a/keyboards/mechwild/mercutio/config.h +++ b/keyboards/mechwild/mercutio/config.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Kyle McCreery +/* Copyright 2021 Kyle McCreery * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ #define ENCODERS_PAD_B { B5 } /* encoder resolution */ -#define ENCODER_RESOLUTION 2 +#define ENCODER_RESOLUTION 4 #define TAP_CODE_DELAY 10 /* COL2ROW or ROW2COL */ @@ -53,4 +53,4 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +#define LOCKING_RESYNC_ENABLE
\ No newline at end of file |