summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-10-17 23:37:37 +0100
committerGitHub <noreply@github.com>2019-10-17 23:37:37 +0100
commit5dc91ddc60f0fd1f277345ccf20e17a8ab684cca (patch)
tree492cf6584b4848e93f9c7585d4f62bad6b9a6d68
parent550435c1c9766e143a054a3943dfcac1d92ac408 (diff)
SPLIT - Remove NO_USB_STARTUP_CHECK requirement for usb detection (#7053)
* Avoid NO_USB_STARTUP_CHECK - Disable USB as checks seem to enable it somehow * Update quantum/split_common/split_util.c Co-Authored-By: fauxpark <fauxpark@gmail.com> * Also remove NO_USB_STARTUP_CHECK from vitamins_included/rev1
-rw-r--r--keyboards/handwired/splittest/teensy_2/config.h2
-rw-r--r--keyboards/vitamins_included/rev1/config.h1
-rw-r--r--quantum/split_common/split_util.c6
3 files changed, 6 insertions, 3 deletions
diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h
index 2b5bcf8e92..7c092db307 100644
--- a/keyboards/handwired/splittest/teensy_2/config.h
+++ b/keyboards/handwired/splittest/teensy_2/config.h
@@ -29,5 +29,3 @@
// teensy has vbus detection issues - use usb detection instead
#define SPLIT_USB_DETECT
-// required for teensy slave otherwise it "locks up" during startup
-#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index a6f9c95fba..c4881db01b 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
#define SPLIT_USB_DETECT
-#define NO_USB_STARTUP_CHECK
#define EE_HANDS
#define SOFT_SERIAL_PIN D0
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 8983861bcc..5c548de059 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -32,6 +32,12 @@ 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
+ (USBCON &= ~(_BV(USBE) | _BV(OTGPADE)));
+#endif
+
return false;
}