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 /quantum/keyboard.c | |
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 'quantum/keyboard.c')
-rw-r--r-- | quantum/keyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 644d8650d..473306c65 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c | |||
@@ -82,7 +82,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
82 | #ifdef QWIIC_ENABLE | 82 | #ifdef QWIIC_ENABLE |
83 | # include "qwiic.h" | 83 | # include "qwiic.h" |
84 | #endif | 84 | #endif |
85 | #ifdef OLED_DRIVER_ENABLE | 85 | #ifdef OLED_ENABLE |
86 | # include "oled_driver.h" | 86 | # include "oled_driver.h" |
87 | #endif | 87 | #endif |
88 | #ifdef ST7565_ENABLE | 88 | #ifdef ST7565_ENABLE |
@@ -319,7 +319,7 @@ void keyboard_init(void) { | |||
319 | #ifdef QWIIC_ENABLE | 319 | #ifdef QWIIC_ENABLE |
320 | qwiic_init(); | 320 | qwiic_init(); |
321 | #endif | 321 | #endif |
322 | #ifdef OLED_DRIVER_ENABLE | 322 | #ifdef OLED_ENABLE |
323 | oled_init(OLED_ROTATION_0); | 323 | oled_init(OLED_ROTATION_0); |
324 | #endif | 324 | #endif |
325 | #ifdef ST7565_ENABLE | 325 | #ifdef ST7565_ENABLE |
@@ -477,7 +477,7 @@ MATRIX_LOOP_END: | |||
477 | qwiic_task(); | 477 | qwiic_task(); |
478 | #endif | 478 | #endif |
479 | 479 | ||
480 | #ifdef OLED_DRIVER_ENABLE | 480 | #ifdef OLED_ENABLE |
481 | oled_task(); | 481 | oled_task(); |
482 | # ifndef OLED_DISABLE_TIMEOUT | 482 | # ifndef OLED_DISABLE_TIMEOUT |
483 | // Wake up oled if user is using those fabulous keys or spinning those encoders! | 483 | // Wake up oled if user is using those fabulous keys or spinning those encoders! |