StackRduino
diff --git a/‎lib/tinyusb‎ b/‎lib/tinyusb‎
diff --git a/‎ports/nrf/bluetooth/ble_drv.c‎
Lines changed: 19 additions & 0 deletions b/‎ports/nrf/bluetooth/ble_drv.c‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎ports/nrf/bluetooth/bluetooth_common.mk‎
Lines changed: 1 addition & 0 deletions b/‎ports/nrf/bluetooth/bluetooth_common.mk‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎ports/nrf/supervisor/usb.c‎
Lines changed: 3 additions & 0 deletions b/‎ports/nrf/supervisor/usb.c‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎supervisor/shared/usb/usb.c‎
Lines changed: 2 additions & 5 deletions b/‎supervisor/shared/usb/usb.c‎
Lines changed: 2 additions & 5 deletions
@@ -32,6 +32,8 @@
 #include "ble_drv.h"
 #include "nrf_nvic.h"
 #include "nrf_sdm.h"
+#include "nrf_soc.h"
+#include "nrfx_power.h"
 #include "py/misc.h"
 
 nrf_nvic_state_t nrf_nvic_state = { 0 };
@@ -89,6 +91,23 @@ void SD_EVT_IRQHandler(void) {
     uint32_t evt_id;
     while (sd_evt_get(&evt_id) != NRF_ERROR_NOT_FOUND) {
 //        sd_evt_handler(evt_id);
+
+        switch (evt_id) {
+            // usb power event
+            case NRF_EVT_POWER_USB_DETECTED:
+            case NRF_EVT_POWER_USB_POWER_READY:
+            case NRF_EVT_POWER_USB_REMOVED: {
+                int32_t usbevt = (evt_id == NRF_EVT_POWER_USB_DETECTED   ) ? NRFX_POWER_USB_EVT_DETECTED:
+                                 (evt_id == NRF_EVT_POWER_USB_POWER_READY) ? NRFX_POWER_USB_EVT_READY   :
+                                 (evt_id == NRF_EVT_POWER_USB_REMOVED    ) ? NRFX_POWER_USB_EVT_REMOVED : -1;
+
+                extern void tusb_hal_nrf_power_event (uint32_t event);
+                tusb_hal_nrf_power_event(usbevt);
+            }
+            break;
+
+            default: break;
+        }
     }
 
     while (1) {
 
@@ -6,6 +6,7 @@ $(error Incorrect softdevice set flag)
 endif
 
 CFLAGS += -DBLUETOOTH_SD_DEBUG=1
+CFLAGS += -DSOFTDEVICE_PRESENT
 
 INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
 INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
 
@@ -43,6 +43,9 @@ extern void tusb_hal_nrf_power_event(uint32_t event);
 
 void init_usb_hardware(void) {
 
+    // 2 is max priority (0, 1 are reserved for SD)
+    NVIC_SetPriority(USBD_IRQn, 2);
+
     // USB power may already be ready at this time -> no event generated
     // We need to invoke the handler based on the status initially
     uint32_t usb_reg;
 
@@ -54,18 +54,15 @@ void load_serial_number(void) {
     }
 }
 
-bool _usb_enabled = false;
-
 bool usb_enabled(void) {
-    return _usb_enabled;
+    return tusb_inited();
 }
 
 void usb_init(void) {
     init_usb_hardware();
     load_serial_number();
 
     tusb_init();
-    _usb_enabled = true;
 
 #if MICROPY_KBD_EXCEPTION
     // Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() callback will be invoked when Ctrl+C is received
@@ -77,7 +74,7 @@ void usb_init(void) {
 }
 
 void usb_background(void) {
-    if (usb_enabled()) {
+    if (tusb_inited()) {
         tud_task();
         tud_cdc_write_flush();
     }
Original file line number	Diff line number	Diff line change
`@@ -54,18 +54,15 @@ void load_serial_number(void) {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-bool _usb_enabled = false;`
`58`		`-`
`59`	`57`	`bool usb_enabled(void) {`
`60`		`- return _usb_enabled;`
	`58`	`+ return tusb_inited();`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`void usb_init(void) {`
`64`	`62`	`init_usb_hardware();`
`65`	`63`	`load_serial_number();`
`66`	`64`
`67`	`65`	`tusb_init();`
`68`		`- _usb_enabled = true;`
`69`	`66`
`70`	`67`	`#if MICROPY_KBD_EXCEPTION`
`71`	`68`	`// Set Ctrl+C as wanted char, tud_cdc_rx_wanted_cb() callback will be invoked when Ctrl+C is received`
`@@ -77,7 +74,7 @@ void usb_init(void) {`
`77`	`74`	`}`
`78`	`75`
`79`	`76`	`void usb_background(void) {`
`80`		`- if (usb_enabled()) {`
	`77`	`+ if (tusb_inited()) {`
`81`	`78`	`tud_task();`
`82`	`79`	`tud_cdc_write_flush();`
`83`	`80`	`}`