diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-05-20 15:48:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:48:36 +0900 |
| commit | 3ed039ed768252d64ef64865737d1cb10e8a3f2f (patch) | |
| tree | f75d7d0bcef60fda2c0407bdeaa5062a54100f44 /tmk_core/common | |
| parent | be58a6847364a9a8243a77b5398e9c209628d1ef (diff) | |
| parent | 24d05fee49bd9d86863f896d70eafd25674ec248 (diff) | |
Merge branch 'master' into fix/mouse_keys
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/keyboard.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 52546866eb..85d2525480 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -75,6 +75,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef QWIIC_ENABLE # include "qwiic.h" #endif +#ifdef OLED_DRIVER_ENABLE + #include "oled_driver.h" +#endif #ifdef VELOCIKEY_ENABLE #include "velocikey.h" #endif @@ -205,6 +208,9 @@ void keyboard_init(void) { #ifdef QWIIC_ENABLE qwiic_init(); #endif +#ifdef OLED_DRIVER_ENABLE + oled_init(OLED_ROTATION_0); +#endif #ifdef PS2_MOUSE_ENABLE ps2_mouse_init(); #endif @@ -262,7 +268,11 @@ void keyboard_task(void) uint8_t keys_processed = 0; #endif +#if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT) + uint8_t ret = matrix_scan(); +#else matrix_scan(); +#endif if (is_keyboard_master()) { for (uint8_t r = 0; r < MATRIX_ROWS; r++) { @@ -306,6 +316,15 @@ MATRIX_LOOP_END: qwiic_task(); #endif +#ifdef OLED_DRIVER_ENABLE + oled_task(); +#ifndef OLED_DISABLE_TIMEOUT + // Wake up oled if user is using those fabulous keys! + if (ret) + oled_on(); +#endif +#endif + #ifdef MOUSEKEY_ENABLE // mousekey repeat & acceleration mousekey_task(); |