3 files changed, 6 insertions(+), 3 deletions(-)

M keyboards/handwired/splittest/teensy_2/config.h
M keyboards/vitamins_included/rev1/config.h
M quantum/split_common/split_util.c

@@ 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

@@ 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

@@ 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;
 }