aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorRyan Caltabiano <rcalt2vt@gmail.com>2019-04-15 22:32:57 -0500
committerskullydazed <skullydazed@users.noreply.github.com>2019-04-20 08:05:10 -0700
commit0a645225b9c863a106921185a6c2e0c340f10694 (patch)
tree2bf8c295650e54fb4548a7ac4d348ccfc8caa307 /quantum/quantum.c
parentb5cb5ec6ddb15cfe336b835055f546f72d440a66 (diff)
downloadqmk_firmware-0a645225b9c863a106921185a6c2e0c340f10694.tar.gz
qmk_firmware-0a645225b9c863a106921185a6c2e0c340f10694.zip
OLED Driver Feature
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index a64878c72..9aa498dad 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -275,6 +275,12 @@ bool process_record_quantum(keyrecord_t *record) {
275 preprocess_tap_dance(keycode, record); 275 preprocess_tap_dance(keycode, record);
276 #endif 276 #endif
277 277
278 #if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT)
279 // Wake up oled if user is using those fabulous keys!
280 if (record->event.pressed)
281 oled_on();
282 #endif
283
278 if (!( 284 if (!(
279 #if defined(KEY_LOCK_ENABLE) 285 #if defined(KEY_LOCK_ENABLE)
280 // Must run first to be able to mask key_up events. 286 // Must run first to be able to mask key_up events.
@@ -1087,6 +1093,9 @@ void matrix_init_quantum() {
1087 #ifdef OUTPUT_AUTO_ENABLE 1093 #ifdef OUTPUT_AUTO_ENABLE
1088 set_output(OUTPUT_AUTO); 1094 set_output(OUTPUT_AUTO);
1089 #endif 1095 #endif
1096 #ifdef OLED_DRIVER_ENABLE
1097 oled_init(OLED_ROTATION_0);
1098 #endif
1090 matrix_init_kb(); 1099 matrix_init_kb();
1091} 1100}
1092 1101
@@ -1123,6 +1132,10 @@ void matrix_scan_quantum() {
1123 haptic_task(); 1132 haptic_task();
1124 #endif 1133 #endif
1125 1134
1135 #ifdef OLED_DRIVER_ENABLE
1136 oled_task();
1137 #endif
1138
1126 matrix_scan_kb(); 1139 matrix_scan_kb();
1127} 1140}
1128#if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN) 1141#if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN)