diff options
author | Joel Challis <git@zvecr.com> | 2021-06-26 11:48:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-26 11:48:48 +0100 |
commit | c232882fda0669e28312446feac3cadb254962e8 (patch) | |
tree | 005383b7ae7e7403a0d9cf935f666ca0f7f68aa0 /tmk_core | |
parent | 848da57d6e2b87b566457c49a2ed15c147e221f5 (diff) | |
download | qmk_firmware-c232882fda0669e28312446feac3cadb254962e8.tar.gz qmk_firmware-c232882fda0669e28312446feac3cadb254962e8.zip |
Allow configuration of USB_VBUS_PIN on chibios (#13342)
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/chibios/chibios_config.h | 4 | ||||
-rw-r--r-- | tmk_core/common/usb_util.c | 2 |
2 files changed, 4 insertions, 2 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 |
diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c index e4c50fcb1..d4134a044 100644 --- a/tmk_core/common/usb_util.c +++ b/tmk_core/common/usb_util.c | |||
@@ -13,8 +13,8 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | #include "quantum.h" | ||
16 | #include "usb_util.h" | 17 | #include "usb_util.h" |
17 | #include "wait.h" | ||
18 | 18 | ||
19 | __attribute__((weak)) void usb_disable(void) {} | 19 | __attribute__((weak)) void usb_disable(void) {} |
20 | __attribute__((weak)) bool usb_connected_state(void) { return true; } | 20 | __attribute__((weak)) bool usb_connected_state(void) { return true; } |