diff options
Diffstat (limited to 'quantum/split_common')
-rw-r--r-- | quantum/split_common/post_config.h | 2 | ||||
-rw-r--r-- | quantum/split_common/split_util.c | 6 | ||||
-rw-r--r-- | quantum/split_common/transport.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/quantum/split_common/post_config.h b/quantum/split_common/post_config.h index 5c0b414fb3..4ae1d52732 100644 --- a/quantum/split_common/post_config.h +++ b/quantum/split_common/post_config.h @@ -1,4 +1,4 @@ -#if defined(USE_I2C) || defined(EH) +#if defined(USE_I2C) // When using I2C, using rgblight implicitly involves split support. # if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_SPLIT) # define RGBLIGHT_SPLIT diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 5c548de059..076f186649 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -33,9 +33,11 @@ bool waitForUsb(void) { wait_ms(100); } -#if defined(__AVR__) // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow +#if defined(__AVR__) (USBCON &= ~(_BV(USBE) | _BV(OTGPADE))); +#else + usbStop(&USBD1); #endif return false; @@ -76,7 +78,7 @@ __attribute__((weak)) bool is_keyboard_master(void) { } static void keyboard_master_setup(void) { -#if defined(USE_I2C) || defined(EH) +#if defined(USE_I2C) # ifdef SSD1306OLED matrix_master_OLED_init(); # endif diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c index 3c783dc568..ab421adc4a 100644 --- a/quantum/split_common/transport.c +++ b/quantum/split_common/transport.c @@ -21,7 +21,7 @@ static pin_t encoders_pad[] = ENCODERS_PAD_A; # define NUMBER_OF_ENCODERS (sizeof(encoders_pad) / sizeof(pin_t)) #endif -#if defined(USE_I2C) || defined(EH) +#if defined(USE_I2C) # include "i2c_master.h" # include "i2c_slave.h" |