ota: enable OTA on the nRF52 variants the OTAFIX bootloader supports

Switch these existing variants from `nrf52_base` to `rak4631_hw` (which adds
ENABLE_OTA + the in-place flash store + the EndF post-build hook), so they get
OTA-over-LoRa. Scope is limited to variants already covered by the
Adafruit_nRF52_Bootloader_OTAFIX in-place apply — no new variants are added.
OtaTargets.h is regenerated to include their target ids.

src/helpers/ota/OtaTargets.h

@@ -2,7 +2,7 @@
 #include <stdint.h>
 
 // AUTO-GENERATED by tools/mota/gen_targets.py — do not edit by hand.
-// 319 OTA-capable PlatformIO envs. Maps target_id (= sha2-256:4 of the env name, LE uint32)
+// 418 OTA-capable PlatformIO envs. Maps target_id (= sha2-256:4 of the env name, LE uint32)
 // to the human-readable env name, so a node/tool can name a target seen over the air WITHOUT
 // transmitting the string in the .mota / LoRa protocol. Regenerate when the OTA env set changes.
 
@@ -142,6 +142,58 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0xd7460575, "Heltec_WSL3_repeater_bridge_rs232" },
     { 0x33e2c171, "Heltec_WSL3_room_server" },
     { 0xa165ae99, "Heltec_WSL3_sensor" },
+    { 0x04c5c2b7, "ikoka_handheld_nrf_e22_30dbm_096_companion_radio_ble" },
+    { 0x6c1ca659, "ikoka_handheld_nrf_e22_30dbm_096_companion_radio_usb" },
+    { 0xa295fb04, "ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_ble" },
+    { 0x61c405ca, "ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_usb" },
+    { 0xe893fe91, "ikoka_handheld_nrf_e22_30dbm_repeater" },
+    { 0x2b599d31, "ikoka_handheld_nrf_e22_30dbm_room_server" },
+    { 0xf1442d25, "ikoka_handheld_nrf_kiss_modem" },
+    { 0x15082ede, "ikoka_nano_nrf_22dbm_companion_radio_ble" },
+    { 0x6ff350d1, "ikoka_nano_nrf_22dbm_companion_radio_usb" },
+    { 0xe03d0cd9, "ikoka_nano_nrf_22dbm_kiss_modem" },
+    { 0x82e1eb2c, "ikoka_nano_nrf_22dbm_repeater" },
+    { 0x0ee19b12, "ikoka_nano_nrf_22dbm_room_server" },
+    { 0x6c67ed89, "ikoka_nano_nrf_30dbm_companion_radio_ble" },
+    { 0xd1c05d0d, "ikoka_nano_nrf_30dbm_companion_radio_usb" },
+    { 0xb90150b0, "ikoka_nano_nrf_30dbm_kiss_modem" },
+    { 0x7285bdb3, "ikoka_nano_nrf_30dbm_repeater" },
+    { 0x77cadc99, "ikoka_nano_nrf_30dbm_room_server" },
+    { 0xc177e6cd, "ikoka_nano_nrf_33dbm_companion_radio_ble" },
+    { 0xf7a38993, "ikoka_nano_nrf_33dbm_companion_radio_usb" },
+    { 0x83762f33, "ikoka_nano_nrf_33dbm_kiss_modem" },
+    { 0x86cadda9, "ikoka_nano_nrf_33dbm_repeater" },
+    { 0x7e49da49, "ikoka_nano_nrf_33dbm_room_server" },
+    { 0x305d6f92, "ikoka_stick_nrf_22dbm_companion_radio_ble" },
+    { 0xbc6b870b, "ikoka_stick_nrf_22dbm_companion_radio_usb" },
+    { 0x78845fdd, "ikoka_stick_nrf_22dbm_kiss_modem" },
+    { 0x6d35f434, "ikoka_stick_nrf_22dbm_repeater" },
+    { 0xa52d76a8, "ikoka_stick_nrf_22dbm_room_server" },
+    { 0xd8de9639, "ikoka_stick_nrf_30dbm_companion_radio_ble" },
+    { 0x8ab5c51b, "ikoka_stick_nrf_30dbm_companion_radio_usb" },
+    { 0x80097676, "ikoka_stick_nrf_30dbm_kiss_modem" },
+    { 0xffe70df5, "ikoka_stick_nrf_30dbm_repeater" },
+    { 0x3da80417, "ikoka_stick_nrf_30dbm_room_server" },
+    { 0x47ca3c13, "ikoka_stick_nrf_33dbm_companion_radio_ble" },
+    { 0x28b499c7, "ikoka_stick_nrf_33dbm_companion_radio_usb" },
+    { 0xf1ab4c28, "ikoka_stick_nrf_33dbm_kiss_modem" },
+    { 0xe5331f02, "ikoka_stick_nrf_33dbm_repeater" },
+    { 0xfba7177b, "ikoka_stick_nrf_33dbm_room_server" },
+    { 0x69df7765, "LilyGo_T-Echo-Lite_companion_radio_ble" },
+    { 0xe9fbc9be, "LilyGo_T-Echo-Lite_kiss_modem" },
+    { 0x40818863, "LilyGo_T-Echo-Lite_non_shell_companion_radio_ble" },
+    { 0x65deac33, "LilyGo_T-Echo-Lite_non_shell_companion_radio_usb" },
+    { 0xd86cf67a, "LilyGo_T-Echo-Lite_repeater" },
+    { 0xed73ac03, "LilyGo_T-Echo-Lite_room_server" },
+    { 0xab0d550a, "LilyGo_T-Echo_Card_companion_radio_ble" },
+    { 0x1bd2a266, "LilyGo_T-Echo_Card_companion_radio_usb" },
+    { 0x9a5ae8fc, "LilyGo_T-Echo_Card_repeater" },
+    { 0x1e9eb97a, "LilyGo_T-Echo_Card_room_server" },
+    { 0x139536f4, "LilyGo_T-Echo_companion_radio_ble" },
+    { 0x0716c724, "LilyGo_T-Echo_companion_radio_usb" },
+    { 0x8de23fa7, "LilyGo_T-Echo_kiss_modem" },
+    { 0xb92ec96b, "LilyGo_T-Echo_repeater" },
+    { 0x420ebc63, "LilyGo_T-Echo_room_server" },
     { 0x967ccaee, "LilyGo_T3S3_sx1262_companion_radio_ble" },
     { 0x5f7c7688, "LilyGo_T3S3_sx1262_companion_radio_usb" },
     { 0xbd04e6e7, "LilyGo_T3S3_sx1262_kiss_modem" },
@@ -205,14 +257,29 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0xcea95e20, "Meshadventurer_sx1268_terminal_chat" },
     { 0xd45277ff, "Meshimi_companion_radio_ble_" },
     { 0x2cad9a9d, "Meshimi_repeater_" },
-    { 0xf1c1641c, "nibble_screen_connect_companion_radio_ble" },
-    { 0x8dcc5d89, "nibble_screen_connect_companion_radio_usb" },
-    { 0x6139a846, "nibble_screen_connect_companion_radio_wifi" },
-    { 0xc0dbcae4, "nibble_screen_connect_kiss_modem" },
-    { 0xcd0bdd06, "nibble_screen_connect_repeater" },
-    { 0x9ecb53b1, "nibble_screen_connect_repeater_bridge_espnow" },
-    { 0x82f6d321, "nibble_screen_connect_room_server" },
-    { 0xb10261c8, "nibble_screen_connect_terminal_chat" },
+    { 0x063f1f00, "nibble_screen_connect_companion_radio_ble_" },
+    { 0xa8a79da5, "nibble_screen_connect_companion_radio_usb_" },
+    { 0xc0d3815b, "nibble_screen_connect_companion_radio_wifi_" },
+    { 0x966ac88e, "nibble_screen_connect_kiss_modem_" },
+    { 0x104b3f8b, "nibble_screen_connect_repeater_" },
+    { 0x23b49348, "nibble_screen_connect_repeater_bridge_espnow_" },
+    { 0xc42cc90d, "nibble_screen_connect_room_server_" },
+    { 0xc24791c3, "nibble_screen_connect_terminal_chat_" },
+    { 0x15e11067, "nibble_zero_connect_companion_radio_ble_" },
+    { 0x90799c32, "nibble_zero_connect_companion_radio_usb_" },
+    { 0x881a6a48, "nibble_zero_connect_companion_radio_wifi_" },
+    { 0xf26af51c, "nibble_zero_connect_repeater_" },
+    { 0x8174cbdc, "nibble_zero_connect_repeater_bridge_espnow_" },
+    { 0x0bf0f061, "nibble_zero_connect_room_server_" },
+    { 0x2509dd80, "nibble_zero_connect_terminal_chat_" },
+    { 0x56293b24, "ProMicro_companion_radio_ble" },
+    { 0x8c81078c, "ProMicro_companion_radio_usb" },
+    { 0xbd6a1c97, "ProMicro_kiss_modem" },
+    { 0xf4d98c12, "ProMicro_repeater" },
+    { 0xccac4283, "ProMicro_repeater_bridge_rs232_serial1" },
+    { 0x5f606274, "ProMicro_room_server" },
+    { 0x84923735, "ProMicro_sensor" },
+    { 0x2c0b8b05, "ProMicro_terminal_chat" },
     { 0xdba69401, "R1Neo_companion_radio_ble" },
     { 0xcb6555ee, "R1Neo_companion_radio_usb" },
     { 0xd60daf25, "R1Neo_kiss_modem" },
@@ -262,6 +329,11 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0xf8d1958f, "Station_G3_ESP32_logging_repeater" },
     { 0x3c49caf8, "Station_G3_ESP32_repeater" },
     { 0x91878dd8, "Station_G3_ESP32_room_server" },
+    { 0x4dbf035e, "t1000e_companion_radio_ble" },
+    { 0xff4102d6, "t1000e_companion_radio_usb" },
+    { 0x2f9a9185, "t1000e_kiss_modem" },
+    { 0x000fc519, "t1000e_repeater" },
+    { 0x3e55e34d, "t1000e_room_server" },
     { 0x16482630, "T_Beam_S3_Supreme_SX1262_companion_radio_ble" },
     { 0x01c43d49, "T_Beam_S3_Supreme_SX1262_companion_radio_wifi" },
     { 0x51fe3801, "T_Beam_S3_Supreme_SX1262_kiss_modem" },
@@ -284,6 +356,11 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0x1211b151, "Tenstar_C3_sx1268_kiss_modem" },
     { 0x0a32044b, "Tenstar_C3_sx1268_repeater" },
     { 0xa13fe853, "Tenstar_C3_sx1268_repeater_bridge_espnow" },
+    { 0x79b9ff01, "ThinkNode_M1_companion_radio_ble" },
+    { 0xc3decea2, "ThinkNode_M1_companion_radio_usb" },
+    { 0x3c012018, "ThinkNode_M1_kiss_modem" },
+    { 0x6afd6f75, "ThinkNode_M1_repeater" },
+    { 0x7517d400, "ThinkNode_M1_room_server" },
     { 0xd7598668, "ThinkNode_M2_companion_radio_ble" },
     { 0x413287d8, "ThinkNode_M2_companion_radio_serial" },
     { 0xe8cd2377, "ThinkNode_M2_companion_radio_usb" },
@@ -293,6 +370,11 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0xa5cb783a, "ThinkNode_M2_Repeater_bridge_espnow" },
     { 0x4b9f8283, "ThinkNode_M2_room_server" },
     { 0x311846c9, "ThinkNode_M2_terminal_chat" },
+    { 0x8b6b29b7, "ThinkNode_M3_companion_radio_ble" },
+    { 0x37928233, "ThinkNode_M3_companion_radio_usb" },
+    { 0x88ac45da, "ThinkNode_M3_kiss_modem" },
+    { 0x087f99c0, "ThinkNode_M3_repeater" },
+    { 0x2afe6c63, "ThinkNode_M3_room_server" },
     { 0xf2d61a1c, "ThinkNode_M5_companion_radio_ble" },
     { 0x1da30414, "ThinkNode_M5_companion_radio_serial" },
     { 0xae8fe1c9, "ThinkNode_M5_companion_radio_usb" },
@@ -302,8 +384,20 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0x1298038d, "ThinkNode_M5_Repeater_bridge_espnow" },
     { 0x2c47acff, "ThinkNode_M5_room_server" },
     { 0x7d641646, "ThinkNode_M5_terminal_chat" },
+    { 0x51efdbfe, "ThinkNode_M6_companion_radio_ble" },
+    { 0xf2aada5b, "ThinkNode_M6_companion_radio_usb" },
+    { 0xe59c9373, "ThinkNode_M6_kiss_modem" },
+    { 0x236f605c, "ThinkNode_M6_repeater" },
+    { 0x93994fed, "ThinkNode_M6_room_server" },
     { 0x37443a5b, "WHY2025_badge_companion_radio_ble_" },
     { 0x603384a7, "WHY2025_badge_repeater_" },
+    { 0x475a2a6a, "WioTrackerL1_companion_radio_ble" },
+    { 0xf4175d2c, "WioTrackerL1_companion_radio_usb" },
+    { 0x3d831006, "WioTrackerL1_kiss_modem" },
+    { 0x556eb1bc, "WioTrackerL1_repeater" },
+    { 0x0c689b90, "WioTrackerL1_room_server" },
+    { 0x91eac424, "WioTrackerL1Eink_companion_radio_ble" },
+    { 0x7a84a8c4, "WioTrackerL1Eink_kiss_modem" },
     { 0x67843a5f, "Xiao_C3_companion_radio_ble" },
     { 0xfad357ab, "Xiao_C3_companion_radio_usb" },
     { 0x16af5c67, "Xiao_C3_companion_radio_wifi" },
@@ -313,6 +407,11 @@ inline const char* ota_target_env_name(uint32_t target_id) {
     { 0x77c8f2b5, "Xiao_C6_companion_radio_ble_" },
     { 0x71ee0e15, "Xiao_C6_kiss_modem" },
     { 0x8824cd0c, "Xiao_C6_repeater_" },
+    { 0xe5439198, "Xiao_nrf52_companion_radio_ble" },
+    { 0xe90a6e74, "Xiao_nrf52_companion_radio_usb" },
+    { 0x833e5cdc, "Xiao_nrf52_kiss_modem" },
+    { 0x93145fbb, "Xiao_nrf52_repeater" },
+    { 0x33a154ff, "Xiao_nrf52_room_server" },
     { 0x6658b418, "Xiao_S3_companion_radio_ble" },
     { 0x964f4f5c, "Xiao_S3_companion_radio_usb" },
     { 0x0a5dc760, "Xiao_S3_kiss_modem" },

variants/ikoka_handheld_nrf/platformio.ini

@@ -1,8 +1,8 @@
 [ikoka_handheld_nrf]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
   -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
@@ -23,10 +23,10 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<../variants/ikoka_handheld_nrf>
   +<helpers/sensors>
-lib_deps = ${nrf52_base.lib_deps}
+lib_deps = ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 

variants/ikoka_nano_nrf/platformio.ini

@@ -1,8 +1,8 @@
 [ikoka_nano_nrf]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
    ${sensor_base.build_flags}
   -D NRF52_PLATFORM -D XIAO_NRF52
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
@@ -29,7 +29,7 @@ build_flags = ${nrf52_base.build_flags}
   -UENV_INCLUDE_GPS
 debug_tool = jlink
 upload_protocol = nrfutil
-lib_deps = ${nrf52_base.lib_deps}
+lib_deps = ${rak4631_hw.lib_deps}
    ${sensor_base.lib_deps}
 
 [ikoka_nano_nrf_e22_22dbm]

variants/ikoka_stick_nrf/platformio.ini

@@ -1,8 +1,8 @@
 [ikoka_stick_nrf]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -D NRF52_PLATFORM -D XIAO_NRF52
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
@@ -29,7 +29,7 @@ build_flags = ${nrf52_base.build_flags}
   -D PIN_WIRE_SCL=7
   -D PIN_WIRE_SDA=6
   -UENV_INCLUDE_GPS
-lib_deps = ${nrf52_base.lib_deps}
+lib_deps = ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
 
 [ikoka_stick_nrf_e22_22dbm]

variants/lilygo_techo/platformio.ini

@@ -1,8 +1,8 @@
 [LilyGo_T-Echo]
-extends = nrf52_base
+extends = rak4631_hw
 board = t-echo
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I variants/lilygo_techo
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -34,7 +34,7 @@ build_flags = ${nrf52_base.build_flags}
   -D DISPLAY_CLASS=GxEPDDisplay
   -D BACKLIGHT_BTN=PIN_BUTTON2
   -D AUTO_OFF_MILLIS=0
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<TechoBoard.cpp>
   +<helpers/sensors/EnvironmentSensorManager.cpp>
@@ -42,7 +42,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../variants/lilygo_techo>
 lib_deps =
-  ${nrf52_base.lib_deps}
+  ${rak4631_hw.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
   adafruit/Adafruit BME280 Library @ ^2.3.0
   zinggjm/GxEPD2 @ 1.6.2

variants/lilygo_techo_card/platformio.ini

@@ -1,8 +1,8 @@
 [LilyGo_T-Echo_Card]
-extends = nrf52_base
+extends = rak4631_hw
 board = t-echo
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I variants/lilygo_techo_card
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -19,7 +19,7 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_GPS=1
   -D DISPLAY_CLASS=U8g2Display
   -D PIN_OLED_RESET=-1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<TechoCardBoard.cpp>
   +<helpers/sensors/EnvironmentSensorManager.cpp>
@@ -27,7 +27,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../variants/lilygo_techo_card>
 lib_deps =
-  ${nrf52_base.lib_deps}
+  ${rak4631_hw.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
   olikraus/U8g2 @ ^2.35.19
   adafruit/Adafruit NeoPixel@^1.10.0

variants/lilygo_techo_lite/platformio.ini

@@ -1,8 +1,8 @@
 [LilyGo_T-Echo-Lite]
-extends = nrf52_base
+extends = rak4631_hw
 board = t-echo
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I variants/lilygo_techo_lite
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -28,7 +28,7 @@ build_flags = ${nrf52_base.build_flags}
   -D EINK_Y_OFFSET=10
   -D DISPLAY_ROTATION=4
   -D AUTO_OFF_MILLIS=0
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<TechoBoard.cpp>
   +<helpers/sensors/EnvironmentSensorManager.cpp>
@@ -36,7 +36,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/ui/MomentaryButton.cpp>
   +<../variants/lilygo_techo_lite>
 lib_deps =
-  ${nrf52_base.lib_deps}
+  ${rak4631_hw.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
   adafruit/Adafruit BME280 Library @ ^2.3.0
   https://github.com/SoulOfNoob/GxEPD2.git
@@ -104,7 +104,7 @@ upload_protocol = nrfutil
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags =
-  ${nrf52_base.build_flags}
+  ${rak4631_hw.build_flags}
   -I variants/lilygo_techo_lite
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -131,7 +131,7 @@ build_flags =
   -D OFFLINE_QUEUE_SIZE=256
   -D UI_RECENT_LIST_SIZE=9
   -D AUTO_SHUTDOWN_MILLIVOLTS=3300
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<TechoBoard.cpp>
   +<helpers/sensors/EnvironmentSensorManager.cpp>
@@ -149,7 +149,7 @@ upload_protocol = nrfutil
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags =
-  ${nrf52_base.build_flags}
+  ${rak4631_hw.build_flags}
   -I variants/lilygo_techo_lite
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -175,7 +175,7 @@ build_flags =
   -D AUTO_SHUTDOWN_MILLIVOLTS=3300
   ; -D MESH_PACKET_LOGGING=1
   ; -D MESH_DEBUG=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<TechoBoard.cpp>
   +<helpers/sensors/EnvironmentSensorManager.cpp>

variants/promicro/platformio.ini

@@ -1,7 +1,7 @@
 [Promicro]
-extends = nrf52_base
+extends = rak4631_hw
 board = promicro_nrf52840
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I variants/promicro
   -D PROMICRO
   -D USE_SX1262
@@ -23,10 +23,10 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_BMP280=1
   -D ENV_INCLUDE_INA3221=1
   -D ENV_INCLUDE_INA219=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/sensors>
   +<../variants/promicro>
-lib_deps= ${nrf52_base.lib_deps}
+lib_deps= ${rak4631_hw.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
   adafruit/Adafruit INA3221 Library @ ^1.0.1
   adafruit/Adafruit INA219 @ ^1.2.3

variants/t1000-e/platformio.ini

@@ -1,8 +1,8 @@
 [t1000-e]
-extends = nrf52_base
+extends = rak4631_hw
 board = tracker-t1000-e
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
   -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
@@ -28,7 +28,7 @@ build_flags = ${nrf52_base.build_flags}
   -D LR11X0_DIO_AS_RF_SWITCH=true
   -D LR11X0_DIO3_TCXO_VOLTAGE=1.6
   -D ENV_INCLUDE_GPS=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/nrf52/T1000eBoard.cpp>
   +<../variants/t1000-e>

variants/thinknode_m1/platformio.ini

@@ -1,8 +1,8 @@
 [ThinkNode_M1]
-extends = nrf52_base
+extends = rak4631_hw
 board = thinknode_m1
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
@@ -24,12 +24,12 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_RX_BOOSTED_GAIN=1
   -D LORA_TX_POWER=22
   -D P_LORA_TX_LED=13
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<ThinkNodeM1Board.cpp>
   +<../variants/thinknode_m1>
 lib_deps =
-  ${nrf52_base.lib_deps}
+  ${rak4631_hw.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
 debug_tool = jlink
 upload_protocol = nrfutil

variants/thinknode_m3/platformio.ini

@@ -1,8 +1,8 @@
 [ThinkNode_M3]
-extends = nrf52_base
+extends = rak4631_hw
 board = thinknode_m3
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
@@ -29,13 +29,13 @@ build_flags = ${nrf52_base.build_flags}
   -D LR11X0_DIO3_TCXO_VOLTAGE=3.3
   -D MESH_DEBUG=1
   -D ENV_INCLUDE_GPS=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<../variants/thinknode_m3>
   +<helpers/sensors>
 debug_tool = stlink
 upload_protocol = nrfutil
-lib_deps= ${nrf52_base.lib_deps}
+lib_deps= ${rak4631_hw.lib_deps}
 
 [env:ThinkNode_M3_repeater]
 extends = ThinkNode_M3

variants/thinknode_m6/platformio.ini

@@ -1,8 +1,8 @@
 [ThinkNode_M6]
-extends = nrf52_base
+extends = rak4631_hw
 board = thinknode_m6
 board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -I src/helpers/nrf52
   -I lib/nrf52/s140_nrf52_6.1.1_API/include
@@ -27,13 +27,13 @@ build_flags = ${nrf52_base.build_flags}
   -D P_LORA_TX_LED=PIN_LED_BLUE
 ;  -D PERSISTANT_GPS=1
 ;  -D ENV_SKIP_GPS_DETECT=1
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/sensors>
   +<ThinkNodeM6Board.cpp>
   +<../variants/thinknode_m6>
 lib_deps =
-  ${nrf52_base.lib_deps}
+  ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
 debug_tool = jlink
 upload_protocol = nrfutil

variants/wio-tracker-l1-eink/platformio.ini

@@ -1,8 +1,8 @@
 [WioTrackerL1Eink]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-wio-tracker-l1
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
   -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
@@ -27,12 +27,12 @@ build_flags = ${nrf52_base.build_flags}
   -D GPS_BAUD_RATE=9600
   -D ENV_PIN_SDA=PIN_WIRE1_SDA
   -D ENV_PIN_SCL=PIN_WIRE1_SCL
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<WioTrackerL1Board.cpp>
   +<../variants/wio-tracker-l1>
   +<helpers/ui/GxEPDDisplay.cpp>
   +<helpers/sensors>
-lib_deps= ${nrf52_base.lib_deps}
+lib_deps= ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
   adafruit/Adafruit GFX Library @ ^1.12.1
   zinggjm/GxEPD2 @ 1.6.2

variants/wio-tracker-l1/platformio.ini

@@ -1,8 +1,8 @@
 [WioTrackerL1]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-wio-tracker-l1
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
   -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
@@ -16,12 +16,12 @@ build_flags = ${nrf52_base.build_flags}
   -D SX126X_RX_BOOSTED_GAIN=1
   -D PIN_OLED_RESET=-1
   -D GPS_BAUD_RATE=9600
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<WioTrackerL1Board.cpp>
   +<../variants/wio-tracker-l1>
   +<helpers/ui/SH1106Display.cpp>
   +<helpers/sensors>
-lib_deps= ${nrf52_base.lib_deps}
+lib_deps= ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
   adafruit/Adafruit SH110X @ ^2.1.13
   adafruit/Adafruit GFX Library @ ^1.12.1

variants/xiao_nrf52/platformio.ini

@@ -1,8 +1,8 @@
 [Xiao_nrf52]
-extends = nrf52_base
+extends = rak4631_hw
 board = seeed-xiao-afruitnrf52-nrf52840
 board_build.ldscript = boards/nrf52840_s140_v7.ld
-build_flags = ${nrf52_base.build_flags}
+build_flags = ${rak4631_hw.build_flags}
   ${sensor_base.build_flags}
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
   -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
@@ -30,14 +30,14 @@ build_flags = ${nrf52_base.build_flags}
   -D PIN_WIRE_SDA=D7
   -D PIN_USER_BTN=PIN_BUTTON1
   -D DISPLAY_CLASS=NullDisplayDriver
-build_src_filter = ${nrf52_base.build_src_filter}
+build_src_filter = ${rak4631_hw.build_src_filter}
   +<helpers/*.cpp>
   +<helpers/sensors>
   +<../variants/xiao_nrf52>
   +<helpers/ui/NullDisplayDriver.cpp>
 debug_tool = jlink
 upload_protocol = nrfutil
-lib_deps = ${nrf52_base.lib_deps}
+lib_deps = ${rak4631_hw.lib_deps}
   ${sensor_base.lib_deps}
 
 [env:Xiao_nrf52_companion_radio_ble]