diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-28 20:45:57 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-28 20:45:57 +0000 |
| commit | 6932e22dd85a539f920c93b62fa78b3fc272c0d2 (patch) | |
| tree | e59145e8ef9072e46ed1edc1c9586617a6cfb5e7 | |
| parent | 69c341eb5c1516637ae767913f5569bc484914c9 (diff) | |
| parent | 097ae9d8172a1d7774e81e98aec8b88c147fa7e2 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/0xcb/static/config.h | 1 | ||||
| -rw-r--r-- | keyboards/0xcb/static/keymaps/bongocat/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/static/readme.md | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index 0d36b931ee..c30450b460 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -48,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW #define TAP_CODE_DELAY 10 -#define ENCODER_DIRECTION_FLIP #define ENCODER_RESOLUTION 4 #define ENCODERS_PAD_A { D0 } #define ENCODERS_PAD_B { D1 } diff --git a/keyboards/0xcb/static/keymaps/bongocat/keymap.c b/keyboards/0xcb/static/keymaps/bongocat/keymap.c index acdc521847..12cc75217e 100644 --- a/keyboards/0xcb/static/keymaps/bongocat/keymap.c +++ b/keyboards/0xcb/static/keymaps/bongocat/keymap.c @@ -107,7 +107,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { #endif /* oled stuff :) */ -#ifdef OLED_DRIVER_ENABLE +#ifdef OLED_ENABLE #define IDLE_FRAMES 5 #define IDLE_SPEED 20 // below this wpm value your animation will idle #define TAP_FRAMES 2 diff --git a/keyboards/0xcb/static/readme.md b/keyboards/0xcb/static/readme.md index 8403b4450e..57e87b71a6 100644 --- a/keyboards/0xcb/static/readme.md +++ b/keyboards/0xcb/static/readme.md @@ -4,7 +4,7 @@ Macro keypad * Keyboard Maintainer: [Conor Burns](https://github.com/conor-burns) * Hardware Supported: https://github.com/0xCB-dev/0xcb-static -* Hardware Availability: Soon on tindie or order your own parts - the hardware in the repo is Open Source :D +* Hardware Availability: On CandyKeys or order your own parts - the hardware in the repo is Open Source :D * PCB renders :)  |