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
master
Joel Challis 2019-10-17 23:37:37 +01:00 committed by GitHub
parent 550435c1c9
commit 5dc91ddc60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

View File

@ -29,5 +29,3 @@
// teensy has vbus detection issues - use usb detection instead // teensy has vbus detection issues - use usb detection instead
#define SPLIT_USB_DETECT #define SPLIT_USB_DETECT
// required for teensy slave otherwise it "locks up" during startup
#define NO_USB_STARTUP_CHECK

View File

@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h" #include "config_common.h"
#define SPLIT_USB_DETECT #define SPLIT_USB_DETECT
#define NO_USB_STARTUP_CHECK
#define EE_HANDS #define EE_HANDS
#define SOFT_SERIAL_PIN D0 #define SOFT_SERIAL_PIN D0

View File

@ -32,6 +32,12 @@ bool waitForUsb(void) {
} }
wait_ms(100); 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; return false;
} }