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/0xcb | |
| 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/0xcb')
| -rw-r--r-- | keyboards/0xcb/1337/keymaps/conor/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/1337/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/1337/keymaps/jakob/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/1337/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/1337/rules.mk | 3 | ||||
| -rw-r--r-- | keyboards/0xcb/static/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/static/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/0xcb/static/rules.mk | 3 |
8 files changed, 10 insertions, 8 deletions
diff --git a/keyboards/0xcb/1337/keymaps/conor/keymap.c b/keyboards/0xcb/1337/keymaps/conor/keymap.c index e9d8756b1..63c3ea9f5 100644 --- a/keyboards/0xcb/1337/keymaps/conor/keymap.c +++ b/keyboards/0xcb/1337/keymaps/conor/keymap.c | |||
| @@ -76,7 +76,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | /* oled stuff :) */ | 78 | /* oled stuff :) */ |
| 79 | #ifdef OLED_DRIVER_ENABLE | 79 | #ifdef OLED_ENABLE |
| 80 | uint16_t startup_timer; | 80 | uint16_t startup_timer; |
| 81 | 81 | ||
| 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/1337/keymaps/default/keymap.c b/keyboards/0xcb/1337/keymaps/default/keymap.c index 54413458f..b79ecb767 100644 --- a/keyboards/0xcb/1337/keymaps/default/keymap.c +++ b/keyboards/0xcb/1337/keymaps/default/keymap.c | |||
| @@ -76,7 +76,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | /* oled stuff :) */ | 78 | /* oled stuff :) */ |
| 79 | #ifdef OLED_DRIVER_ENABLE | 79 | #ifdef OLED_ENABLE |
| 80 | uint16_t startup_timer; | 80 | uint16_t startup_timer; |
| 81 | 81 | ||
| 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/1337/keymaps/jakob/keymap.c b/keyboards/0xcb/1337/keymaps/jakob/keymap.c index f4a5c3cb4..190fee21c 100644 --- a/keyboards/0xcb/1337/keymaps/jakob/keymap.c +++ b/keyboards/0xcb/1337/keymaps/jakob/keymap.c | |||
| @@ -76,7 +76,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | /* oled stuff :) */ | 78 | /* oled stuff :) */ |
| 79 | #ifdef OLED_DRIVER_ENABLE | 79 | #ifdef OLED_ENABLE |
| 80 | uint16_t startup_timer; | 80 | uint16_t startup_timer; |
| 81 | 81 | ||
| 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/1337/keymaps/via/keymap.c b/keyboards/0xcb/1337/keymaps/via/keymap.c index 897bfdeda..eefa67ddb 100644 --- a/keyboards/0xcb/1337/keymaps/via/keymap.c +++ b/keyboards/0xcb/1337/keymaps/via/keymap.c | |||
| @@ -76,7 +76,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | /* oled stuff :) */ | 78 | /* oled stuff :) */ |
| 79 | #ifdef OLED_DRIVER_ENABLE | 79 | #ifdef OLED_ENABLE |
| 80 | uint16_t startup_timer; | 80 | uint16_t startup_timer; |
| 81 | 81 | ||
| 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 82 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk index 365b79c05..b08dfd380 100644 --- a/keyboards/0xcb/1337/rules.mk +++ b/keyboards/0xcb/1337/rules.mk | |||
| @@ -24,4 +24,5 @@ AUDIO_ENABLE = no # Audio output | |||
| 24 | 24 | ||
| 25 | ENCODER_ENABLE = yes | 25 | ENCODER_ENABLE = yes |
| 26 | LTO_ENABLE = yes | 26 | LTO_ENABLE = yes |
| 27 | OLED_DRIVER_ENABLE = yes | 27 | OLED_ENABLE = yes |
| 28 | OLED_DRIVER = SSD1306 | ||
diff --git a/keyboards/0xcb/static/keymaps/default/keymap.c b/keyboards/0xcb/static/keymaps/default/keymap.c index e83d6c904..139c257e6 100644 --- a/keyboards/0xcb/static/keymaps/default/keymap.c +++ b/keyboards/0xcb/static/keymaps/default/keymap.c | |||
| @@ -92,7 +92,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 92 | #endif | 92 | #endif |
| 93 | 93 | ||
| 94 | /* oled stuff :) */ | 94 | /* oled stuff :) */ |
| 95 | #ifdef OLED_DRIVER_ENABLE | 95 | #ifdef OLED_ENABLE |
| 96 | uint16_t startup_timer = 0; | 96 | uint16_t startup_timer = 0; |
| 97 | 97 | ||
| 98 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 98 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/static/keymaps/via/keymap.c b/keyboards/0xcb/static/keymaps/via/keymap.c index 4b8bf3ae5..6bb24c1fa 100644 --- a/keyboards/0xcb/static/keymaps/via/keymap.c +++ b/keyboards/0xcb/static/keymaps/via/keymap.c | |||
| @@ -92,7 +92,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) { | |||
| 92 | #endif | 92 | #endif |
| 93 | 93 | ||
| 94 | /* oled stuff :) */ | 94 | /* oled stuff :) */ |
| 95 | #ifdef OLED_DRIVER_ENABLE | 95 | #ifdef OLED_ENABLE |
| 96 | uint16_t startup_timer = 0; | 96 | uint16_t startup_timer = 0; |
| 97 | 97 | ||
| 98 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { | 98 | oled_rotation_t oled_init_user(oled_rotation_t rotation) { |
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk index fb9907998..c50970a43 100644 --- a/keyboards/0xcb/static/rules.mk +++ b/keyboards/0xcb/static/rules.mk | |||
| @@ -23,4 +23,5 @@ AUDIO_ENABLE = no # Audio output | |||
| 23 | 23 | ||
| 24 | ENCODER_ENABLE = yes | 24 | ENCODER_ENABLE = yes |
| 25 | LTO_ENABLE = yes | 25 | LTO_ENABLE = yes |
| 26 | OLED_DRIVER_ENABLE = yes | 26 | OLED_ENABLE = yes |
| 27 | OLED_DRIVER = SSD1306 | ||
