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 /keyboards/splitkb/kyria/rev1 | |
| 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 'keyboards/splitkb/kyria/rev1')
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/rev1.c | 2 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/rules.mk | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 9df5a3823..a330dfc10 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h | |||
| @@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 69 | /* Locking resynchronize hack */ | 69 | /* Locking resynchronize hack */ |
| 70 | #define LOCKING_RESYNC_ENABLE | 70 | #define LOCKING_RESYNC_ENABLE |
| 71 | 71 | ||
| 72 | #ifdef OLED_DRIVER_ENABLE | 72 | #ifdef OLED_ENABLE |
| 73 | # define OLED_DISPLAY_128X64 | 73 | # define OLED_DISPLAY_128X64 |
| 74 | # define SPLIT_OLED_ENABLE | 74 | # define SPLIT_OLED_ENABLE |
| 75 | #endif | 75 | #endif |
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c index 8da217810..ac82f7373 100644 --- a/keyboards/splitkb/kyria/rev1/rev1.c +++ b/keyboards/splitkb/kyria/rev1/rev1.c | |||
| @@ -55,7 +55,7 @@ led_config_t g_led_config = { { | |||
| 55 | } }; | 55 | } }; |
| 56 | #endif | 56 | #endif |
| 57 | 57 | ||
| 58 | #ifdef OLED_DRIVER_ENABLE | 58 | #ifdef OLED_ENABLE |
| 59 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } | 59 | __attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; } |
| 60 | 60 | ||
| 61 | __attribute__((weak)) void oled_task_user(void) { | 61 | __attribute__((weak)) void oled_task_user(void) { |
diff --git a/keyboards/splitkb/kyria/rev1/rules.mk b/keyboards/splitkb/kyria/rev1/rules.mk index 6b9217782..cc2cbba60 100644 --- a/keyboards/splitkb/kyria/rev1/rules.mk +++ b/keyboards/splitkb/kyria/rev1/rules.mk | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | OLED_DRIVER_ENABLE = yes # Enables the use of OLED displays | 1 | OLED_ENABLE = yes |
| 2 | OLED_DRIVER = SSD1306 # Enables the use of OLED displays | ||
| 2 | ENCODER_ENABLE = yes # ENables the use of one or more encoders | 3 | ENCODER_ENABLE = yes # ENables the use of one or more encoders |
| 3 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | 4 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
| 4 | RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) | 5 | RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) |
