From b05565f368cf0a2901913bd1b279625d6d3866ca Mon Sep 17 00:00:00 2001 From: Oleg Senchenko Date: Thu, 25 Mar 2021 15:42:25 +0300 Subject: Fix connection issue in split keyboards when slave and OLED display are connected via I2C, fix #9335 (#11487) * In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335 * Revert "In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335" This reverts commit 3ee639e1f35fb0fe257fc3ba1095124e039af7d7. * In split keyboards fix connection issue when slave and OLED are connected via I2C. Fix #9335 * Update drivers/oled/oled_driver.c Co-authored-by: Drashna Jaelre Co-authored-by: osenchenko Co-authored-by: Drashna Jaelre --- drivers/oled/oled_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/oled') diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c index 92c64399e2..a60f2de6d1 100644 --- a/drivers/oled/oled_driver.c +++ b/drivers/oled/oled_driver.c @@ -24,6 +24,8 @@ along with this program. If not, see . #include "progmem.h" +#include "keyboard.h" + // Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf // for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf @@ -152,6 +154,10 @@ static void InvertCharacter(uint8_t *cursor) { } bool oled_init(uint8_t rotation) { +#if defined(USE_I2C) && defined(SPLIT_KEYBOARD) + if (!is_keyboard_master()) { return true; } +#endif + oled_rotation = oled_init_user(rotation); if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) { oled_rotation_width = OLED_DISPLAY_WIDTH; -- cgit v1.2.1