Skip to content

Commit

Permalink
Revert "In split keyboards fix connection issue when slave and OLED a…
Browse files Browse the repository at this point in the history
…re connected via I2C. Fix qmk#9335"

This reverts commit 3ee639e.
  • Loading branch information
osenchenko committed Jan 10, 2021
1 parent 3ee639e commit 2f71dcd
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions tmk_core/common/keyboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,8 @@ void keyboard_init(void) {
qwiic_init();
#endif
#ifdef OLED_DRIVER_ENABLE
#if defined(SPLIT_KEYBOARD) && defined(USE_I2C)
if (is_keyboard_master()) {
oled_init(OLED_ROTATION_0);
}
#else
oled_init(OLED_ROTATION_0);
#endif
#endif
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_init();
#endif
Expand Down Expand Up @@ -410,22 +404,12 @@ void keyboard_task(void) {
#endif

#ifdef OLED_DRIVER_ENABLE
#if defined(SPLIT_KEYBOARD) && defined(USE_I2C)
if (is_keyboard_master()) {
oled_task();
#ifndef OLED_DISABLE_TIMEOUT
// Wake up oled if user is using those fabulous keys!
if (ret) oled_on();
#endif
}
#else
oled_task();
# ifndef OLED_DISABLE_TIMEOUT
// Wake up oled if user is using those fabulous keys!
if (ret) oled_on();
# endif
#endif
#endif

#ifdef MOUSEKEY_ENABLE
// mousekey repeat & acceleration
Expand Down

0 comments on commit 2f71dcd

Please sign in to comment.