~ruther/qmk_firmware

1837d98425006611f70691a19689e0a970c981ae — QMK Bot 4 years ago d961d8d + f3bef84
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 2 insertions(+), 2 deletions(-)

M quantum/keyboard.c
M quantum/keyboard.c => quantum/keyboard.c +2 -2
@@ 479,7 479,7 @@ MATRIX_LOOP_END:

#ifdef OLED_ENABLE
    oled_task();
#    ifndef OLED_DISABLE_TIMEOUT
#    if OLED_TIMEOUT > 0
    // Wake up oled if user is using those fabulous keys or spinning those encoders!
#        ifdef ENCODER_ENABLE
    if (matrix_changed || encoders_changed) oled_on();


@@ 491,7 491,7 @@ MATRIX_LOOP_END:

#ifdef ST7565_ENABLE
    st7565_task();
#    ifndef ST7565_DISABLE_TIMEOUT
#    if ST7565_TIMEOUT > 0
    // Wake up display if user is using those fabulous keys or spinning those encoders!
#        ifdef ENCODER_ENABLE
    if (matrix_changed || encoders_changed) st7565_on();