varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335

Browse source
This commit is contained in:
osenchenko 2021-01-02 22:12:29 +03:00
parent 2e9d091960
commit 3ee639e1f3
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tmk_core/common/keyboard.c
View file

@ -263,7 +263,13 @@ void keyboard_init(void) {
qwiic_init(); qwiic_init();
#endif #endif
#ifdef OLED_DRIVER_ENABLE #ifdef OLED_DRIVER_ENABLE
#if defined(SPLIT_KEYBOARD) && defined(USE_I2C)
if (is_keyboard_master()) {
oled_init(OLED_ROTATION_0); oled_init(OLED_ROTATION_0);
}
#else
oled_init(OLED_ROTATION_0);
#endif
#endif #endif
#ifdef PS2_MOUSE_ENABLE #ifdef PS2_MOUSE_ENABLE
ps2_mouse_init(); ps2_mouse_init();
@ -404,12 +410,22 @@ MATRIX_LOOP_END:
#endif #endif
#ifdef OLED_DRIVER_ENABLE #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(); oled_task();
# ifndef OLED_DISABLE_TIMEOUT # ifndef OLED_DISABLE_TIMEOUT
// Wake up oled if user is using those fabulous keys! // Wake up oled if user is using those fabulous keys!
if (ret) oled_on(); if (ret) oled_on();
# endif # endif
#endif #endif
#endif
#ifdef MOUSEKEY_ENABLE #ifdef MOUSEKEY_ENABLE
// mousekey repeat & acceleration // mousekey repeat & acceleration