Merge branch 'master' into develop

2019-07-22 19:23:48 +07:00
parent 33de35504a b041b23ba3
commit 8fad8fb5c2
19 changed files with 1431 additions and 161 deletions
@@ -160,7 +160,11 @@ void dcd_init (uint8_t rhport)
    USB_OTG_GINTMSK_USBSUSPM */;

  // Enable pullup, enable peripheral.
+#ifdef USB_OTG_GCCFG_VBDEN
+  USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBDEN | USB_OTG_GCCFG_PWRDWN;
+#else
  USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBUSBSEN | USB_OTG_GCCFG_PWRDWN;
+#endif
 }

 void dcd_int_enable (uint8_t rhport)