diff options
author | Xelus22 <17491233+Xelus22@users.noreply.github.com> | 2021-08-24 16:28:26 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-24 16:28:26 +1000 |
commit | 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (patch) | |
tree | 24ff5bdf570a6a9f5a77a517005bffbb35e46b22 /layouts | |
parent | 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (diff) | |
download | qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.tar.gz qmk_firmware-4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0.zip |
[Core] Refactor OLED to allow easy addition of other types (#13454)
* add docs
* core changes
* update keyboards to new OLED
* updated users to new OLED
* update layouts to new OLED
* fixup docs
* drashna's suggestion
* fix up docs
* new keyboards with oled
* core split changes
* remaining keyboard files
* Fix The Helix keyboards oled options
* reflect develop
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/community/split_3x6_3/drashna/keymap.c | 2 | ||||
-rw-r--r-- | layouts/community/split_3x6_3/drashna/rules.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 29e41e242..707dd3646 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c | |||
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
95 | }; | 95 | }; |
96 | // clang-format on | 96 | // clang-format on |
97 | 97 | ||
98 | #ifdef OLED_DRIVER_ENABLE | 98 | #ifdef OLED_ENABLE |
99 | oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_270; } | 99 | oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_270; } |
100 | #endif | 100 | #endif |
101 | 101 | ||
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk index e0ac86d69..3a8a771ee 100644 --- a/layouts/community/split_3x6_3/drashna/rules.mk +++ b/layouts/community/split_3x6_3/drashna/rules.mk | |||
@@ -20,7 +20,7 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing | |||
20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
21 | 21 | ||
22 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) | 22 | ifeq ($(strip $(KEYBOARD)), crkbd/rev1) |
23 | OLED_DRIVER_ENABLE = yes | 23 | OLED_ENABLE = yes |
24 | RGB_MATRIX_ENABLE = yes | 24 | RGB_MATRIX_ENABLE = yes |
25 | HAPTIC_ENABLE = no | 25 | HAPTIC_ENABLE = no |
26 | BOOTLOADER = qmk-dfu | 26 | BOOTLOADER = qmk-dfu |