Merge branch 'master' into wio-lr1110-refresh

variants/wio-sdk-wm1110/platformio.ini

@@ -5,8 +5,6 @@ board = wio-sdk-wm1110
 
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
 build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
-
-board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-sdk-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
@@ -15,5 +13,19 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-sdk-wm1110>
 lib_deps = 
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
+;debug_tool = stlink
+;debug_speed = 4000
+; No need to reflash if the binary hasn't changed
+debug_load_mode = modified
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
-upload_protocol = jlink
+upload_protocol = nrfutil
+;upload_protocol = stlink
+; we prefer to stop in setup() because we are an 'ardiuno' app
+debug_init_break = tbreak setup
+
+; we need to turn off BLE/soft device if we are debugging otherwise it will watchdog reset us.
+debug_extra_cmds =
+  echo Running .gdbinit script
+  commands 1
+  set useSoftDevice = false
+  end

variants/wio-sdk-wm1110/variant.h

@@ -107,6 +107,8 @@ extern "C" {
 
 #define LR1110_GNSS_ANT_PIN (32 + 5) // P1.05 37
 
+#define NRF_USE_SERIAL_DFU
+
 #ifdef __cplusplus
 }
 #endif