diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-26 10:49:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-26 10:49:16 +0000 |
| commit | 5489c47a273f33e005f0b99a2205b181cb3d90ed (patch) | |
| tree | e999ffe0f81aed8235231f36bbf5d06a525c6b52 /tmk_core/common/chibios | |
| parent | 298b3831263b318ee19d58f3bea4bf14142557cd (diff) | |
| parent | c232882fda0669e28312446feac3cadb254962e8 (diff) | |
| download | qmk_firmware-5489c47a273f33e005f0b99a2205b181cb3d90ed.tar.gz qmk_firmware-5489c47a273f33e005f0b99a2205b181cb3d90ed.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common/chibios')
| -rw-r--r-- | tmk_core/common/chibios/chibios_config.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/common/chibios/chibios_config.h b/tmk_core/common/chibios/chibios_config.h index 1d8ace495..23c65f942 100644 --- a/tmk_core/common/chibios/chibios_config.h +++ b/tmk_core/common/chibios/chibios_config.h | |||
| @@ -15,7 +15,9 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #pragma once | 16 | #pragma once |
| 17 | 17 | ||
| 18 | #define SPLIT_USB_DETECT // Force this on for now | 18 | #ifndef USB_VBUS_PIN |
| 19 | # define SPLIT_USB_DETECT // Force this on when dedicated pin is not used | ||
| 20 | #endif | ||
| 19 | 21 | ||
| 20 | #if defined(STM32F1XX) | 22 | #if defined(STM32F1XX) |
| 21 | # define USE_GPIOV1 | 23 | # define USE_GPIOV1 |