meshtastic · thebentern · Jul 8, 2024 · Jul 8, 2024
diff --git a/boards/wio-tracker-wm1110.json b/boards/wio-tracker-wm1110.json
@@ -53,6 +53,6 @@
     "require_upload_port": true,
     "wait_for_upload_port": true
   },
-  "url": "https://www.seeedstudio.com/Wio-WM1110-Dev-Kit-p-5677.html",
+  "url": "https://www.seeedstudio.com/Wio-Tracker-1110-Dev-Board-p-5799.html",
   "vendor": "Seeed Studio"
 }
diff --git a/variants/wio-sdk-wm1110/nrf52840_s140_v7.ld → src/platform/nrf52/nrf52840_s140_v7.ld b/variants/wio-sdk-wm1110/nrf52840_s140_v7.ld → src/platform/nrf52/nrf52840_s140_v7.ld
diff --git a/variants/xiao_ble/softdevice/ble.h → src/platform/nrf52/softdevice/ble.h b/variants/xiao_ble/softdevice/ble.h → src/platform/nrf52/softdevice/ble.h
diff --git a/variants/xiao_ble/softdevice/ble_err.h → src/platform/nrf52/softdevice/ble_err.h b/variants/xiao_ble/softdevice/ble_err.h → src/platform/nrf52/softdevice/ble_err.h
diff --git a/variants/xiao_ble/softdevice/ble_gap.h → src/platform/nrf52/softdevice/ble_gap.h b/variants/xiao_ble/softdevice/ble_gap.h → src/platform/nrf52/softdevice/ble_gap.h
diff --git a/variants/xiao_ble/softdevice/ble_gatt.h → src/platform/nrf52/softdevice/ble_gatt.h b/variants/xiao_ble/softdevice/ble_gatt.h → src/platform/nrf52/softdevice/ble_gatt.h
diff --git a/variants/xiao_ble/softdevice/ble_gattc.h → src/platform/nrf52/softdevice/ble_gattc.h b/variants/xiao_ble/softdevice/ble_gattc.h → src/platform/nrf52/softdevice/ble_gattc.h
diff --git a/variants/xiao_ble/softdevice/ble_gatts.h → src/platform/nrf52/softdevice/ble_gatts.h b/variants/xiao_ble/softdevice/ble_gatts.h → src/platform/nrf52/softdevice/ble_gatts.h
diff --git a/variants/xiao_ble/softdevice/ble_hci.h → src/platform/nrf52/softdevice/ble_hci.h b/variants/xiao_ble/softdevice/ble_hci.h → src/platform/nrf52/softdevice/ble_hci.h
diff --git a/variants/xiao_ble/softdevice/ble_l2cap.h → src/platform/nrf52/softdevice/ble_l2cap.h b/variants/xiao_ble/softdevice/ble_l2cap.h → src/platform/nrf52/softdevice/ble_l2cap.h
diff --git a/variants/xiao_ble/softdevice/ble_ranges.h → src/platform/nrf52/softdevice/ble_ranges.h b/variants/xiao_ble/softdevice/ble_ranges.h → src/platform/nrf52/softdevice/ble_ranges.h
diff --git a/variants/xiao_ble/softdevice/ble_types.h → src/platform/nrf52/softdevice/ble_types.h b/variants/xiao_ble/softdevice/ble_types.h → src/platform/nrf52/softdevice/ble_types.h
diff --git a/variants/xiao_ble/softdevice/nrf52/nrf_mbr.h → ...platform/nrf52/softdevice/nrf52/nrf_mbr.h b/variants/xiao_ble/softdevice/nrf52/nrf_mbr.h → ...platform/nrf52/softdevice/nrf52/nrf_mbr.h
diff --git a/variants/xiao_ble/softdevice/nrf_error.h → src/platform/nrf52/softdevice/nrf_error.h b/variants/xiao_ble/softdevice/nrf_error.h → src/platform/nrf52/softdevice/nrf_error.h
diff --git a/variants/xiao_ble/softdevice/nrf_error_sdm.h → ...platform/nrf52/softdevice/nrf_error_sdm.h b/variants/xiao_ble/softdevice/nrf_error_sdm.h → ...platform/nrf52/softdevice/nrf_error_sdm.h
diff --git a/variants/xiao_ble/softdevice/nrf_error_soc.h → ...platform/nrf52/softdevice/nrf_error_soc.h b/variants/xiao_ble/softdevice/nrf_error_soc.h → ...platform/nrf52/softdevice/nrf_error_soc.h
diff --git a/variants/xiao_ble/softdevice/nrf_nvic.h → src/platform/nrf52/softdevice/nrf_nvic.h b/variants/xiao_ble/softdevice/nrf_nvic.h → src/platform/nrf52/softdevice/nrf_nvic.h
diff --git a/variants/xiao_ble/softdevice/nrf_sdm.h → src/platform/nrf52/softdevice/nrf_sdm.h b/variants/xiao_ble/softdevice/nrf_sdm.h → src/platform/nrf52/softdevice/nrf_sdm.h
@@ -141,7 +141,7 @@ the start of the SoftDevice (without MBR)*/
  *         Add @ref MBR_SIZE to find the first available flash address when the SoftDevice is installed
  *         just above the MBR (the usual case).
  */
-#define SD_FLASH_SIZE 0x26000
+#define SD_FLASH_SIZE 0x27000
 
 /** @brief Defines a macro for retrieving the actual FWID value from a given base address. Use
  *         @ref MBR_SIZE as the argument when the SoftDevice is installed just above the MBR (the usual

diff --git a/variants/xiao_ble/softdevice/nrf_soc.h → src/platform/nrf52/softdevice/nrf_soc.h b/variants/xiao_ble/softdevice/nrf_soc.h → src/platform/nrf52/softdevice/nrf_soc.h
diff --git a/variants/xiao_ble/softdevice/nrf_svc.h → src/platform/nrf52/softdevice/nrf_svc.h b/variants/xiao_ble/softdevice/nrf_svc.h → src/platform/nrf52/softdevice/nrf_svc.h
diff --git a/variants/wio-sdk-wm1110/platformio.ini b/variants/wio-sdk-wm1110/platformio.ini
@@ -1,4 +1,4 @@
-; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
+; The black Wio-WM1110 Dev Kit with sensors and the WM1110 module
 [env:wio-sdk-wm1110]
 extends = nrf52840_base
 board = wio-sdk-wm1110
@@ -8,10 +8,10 @@ build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
 
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-sdk-wm1110 -DWIO_WM1110
+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.
-board_build.ldscript = variants/wio-sdk-wm1110/nrf52840_s140_v7.ld
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-sdk-wm1110>
 lib_deps = 
   ${nrf52840_base.lib_deps}

diff --git a/variants/wio-tracker-wm1110/nrf52840_s140_v7.ld b/variants/wio-tracker-wm1110/nrf52840_s140_v7.ld
diff --git a/variants/wio-tracker-wm1110/platformio.ini b/variants/wio-tracker-wm1110/platformio.ini
@@ -1,12 +1,12 @@
-; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
+; The red tracker Dev Board with the WM1110 module
 [env:wio-tracker-wm1110]
 extends = nrf52840_base
 board = wio-tracker-wm1110
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-tracker-wm1110 -DWIO_WM1110
+build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-tracker-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.
-board_build.ldscript = variants/wio-tracker-wm1110/nrf52840_s140_v7.ld
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-tracker-wm1110>
 lib_deps = 
   ${nrf52840_base.lib_deps}

diff --git a/variants/xiao_ble/nrf52840_s140_v7.ld b/variants/xiao_ble/nrf52840_s140_v7.ld
diff --git a/variants/xiao_ble/platformio.ini b/variants/xiao_ble/platformio.ini
@@ -3,9 +3,9 @@
 extends = nrf52840_base
 board = xiao_ble_sense
 board_level = extra
-build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Ivariants/xiao_ble/softdevice -Ivariants/xiao_ble/softdevice/nrf52 -DEBYTE_E22 -DEBYTE_E22_900M30S -DPRIVATE_HW
+build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -D EBYTE_E22 -DEBYTE_E22_900M30S -DPRIVATE_HW
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
-board_build.ldscript = variants/xiao_ble/nrf52840_s140_v7.ld
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
 lib_deps = 
   ${nrf52840_base.lib_deps}