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 | |
| parent | 848da57d6e2b87b566457c49a2ed15c147e221f5 (diff) | |
Allow configuration of USB_VBUS_PIN on chibios (#13342)0.13.15
| -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 1d8ace4955..23c65f9428 100644 --- a/tmk_core/common/chibios/chibios_config.h +++ b/tmk_core/common/chibios/chibios_config.h @@ -15,7 +15,9 @@ */ #pragma once -#define SPLIT_USB_DETECT // Force this on for now +#ifndef USB_VBUS_PIN +# define SPLIT_USB_DETECT // Force this on when dedicated pin is not used +#endif #if defined(STM32F1XX) # define USE_GPIOV1 diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c index e4c50fcb10..d4134a0446 100644 --- a/tmk_core/common/usb_util.c +++ b/tmk_core/common/usb_util.c @@ -13,8 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "quantum.h" #include "usb_util.h" -#include "wait.h" __attribute__((weak)) void usb_disable(void) {} __attribute__((weak)) bool usb_connected_state(void) { return true; } |