summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-26 10:49:16 +0000
committerQMK Bot <hello@qmk.fm>2021-06-26 10:49:16 +0000
commit5489c47a273f33e005f0b99a2205b181cb3d90ed (patch)
treee999ffe0f81aed8235231f36bbf5d06a525c6b52 /tmk_core/common
parent298b3831263b318ee19d58f3bea4bf14142557cd (diff)
parentc232882fda0669e28312446feac3cadb254962e8 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/chibios/chibios_config.h4
-rw-r--r--tmk_core/common/usb_util.c2
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; }