From 7a8fdd56fa69bfe0a405f155d9282bb586928c3c Mon Sep 17 00:00:00 2001
From: gjelsoe <36234524+gjelsoe@users.noreply.github.com>
Date: Fri, 6 Mar 2026 08:17:07 +0100
Subject: [PATCH] Cleanup

Added board definition.
.INI file cleanup
---
 boards/radiomaster_bandit.json                | 37 +++++++++++++++++++
 .../radiomaster_900_bandit/platformio.ini     | 14 ++++---
 .../platformio.ini                            | 12 +++---
 3 files changed, 52 insertions(+), 11 deletions(-)
 create mode 100644 boards/radiomaster_bandit.json

diff --git a/boards/radiomaster_bandit.json b/boards/radiomaster_bandit.json
new file mode 100644
index 00000000..69e487ea
--- /dev/null
+++ b/boards/radiomaster_bandit.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32_out.ld",
+      "partitions": "default_8MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_RADIOMASTER_BANDIT -DARDUINO_ARCH_ESP32",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Radiomaster Bandit",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.espressif.com/en/products/socs/esp32",
+  "vendor": "Espressif"
+}
diff --git a/variants/radiomaster_900_bandit/platformio.ini b/variants/radiomaster_900_bandit/platformio.ini
index 08321bbf..3543d97d 100644
--- a/variants/radiomaster_900_bandit/platformio.ini
+++ b/variants/radiomaster_900_bandit/platformio.ini
@@ -1,7 +1,6 @@
 [radiomaster_900_bandit]
 extends = esp32_base
-board = esp32dev
-#upload_flags = --before default_reset
+board = radiomaster_bandit
 build_flags =
   ${esp32_base.build_flags}
   -I variants/radiomaster_900_bandit
@@ -22,15 +21,13 @@ build_flags =
   -D PIN_BOARD_SCL=12
   -D PIN_USER_JOYSTICK=39
   -D ENV_INCLUDE_GPS=0
+
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/radiomaster_900_bandit>
   +<helpers/ui/AnalogJoystick.cpp>
   +<helpers/ui/SH1115Display.cpp>
   +<helpers/sensors>
 
-board_upload.flash_size = 8MB
-board_build.partitions = default_8MB.csv
-
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit NeoPixel@^1.10.0
@@ -38,7 +35,6 @@ lib_deps =
 
 [env:radiomaster_900_bandit_companion_radio_ble]
 extends = radiomaster_900_bandit
-board_build.upload.maximum_ram_size=2000000
 build_flags =
   ${radiomaster_900_bandit.build_flags}
   -I examples/companion_radio/ui-new
@@ -50,11 +46,13 @@ build_flags =
 ;  -D RADIOLIB_DEBUG_BASIC=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
+
 lib_deps =
   ${radiomaster_900_bandit.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -71,8 +69,10 @@ build_flags =
   -D PERSISTANT_GPS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit.build_src_filter}
   +<../examples/simple_repeater>
+
 lib_deps =
   ${radiomaster_900_bandit.lib_deps}
   ${esp32_ota.lib_deps}
@@ -87,8 +87,10 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit.build_src_filter}
   +<../examples/simple_room_server>
+
 lib_deps =
   ${radiomaster_900_bandit.lib_deps}
   ${esp32_ota.lib_deps}
diff --git a/variants/radiomaster_900_bandit_nano/platformio.ini b/variants/radiomaster_900_bandit_nano/platformio.ini
index 14d191c3..97ed758c 100644
--- a/variants/radiomaster_900_bandit_nano/platformio.ini
+++ b/variants/radiomaster_900_bandit_nano/platformio.ini
@@ -1,6 +1,6 @@
 [radiomaster_900_bandit_nano]
 extends = esp32_base
-board = esp32dev
+board = radiomaster_bandit
 build_flags =
   ${esp32_base.build_flags}
   -I variants/radiomaster_900_bandit_nano
@@ -34,16 +34,12 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<helpers/sensors>
 
-board_upload.flash_size = 8MB
-board_build.partitions = default_8MB.csv
-
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
 [env:radiomaster_900_bandit_nano_companion_radio_ble]
 extends = radiomaster_900_bandit_nano
-;board_build.upload.maximum_ram_size=2000000
 build_flags =
   ${radiomaster_900_bandit_nano.build_flags}
   -I examples/companion_radio/ui-new
@@ -55,11 +51,13 @@ build_flags =
 ;  -D RADIOLIB_DEBUG_BASIC=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit_nano.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/MomentaryButton.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-new/*.cpp>
+
 lib_deps =
   ${radiomaster_900_bandit_nano.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -76,8 +74,10 @@ build_flags =
   -D PERSISTANT_GPS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit_nano.build_src_filter}
   +<../examples/simple_repeater>
+
 lib_deps =
   ${radiomaster_900_bandit_nano.lib_deps}
   ${esp32_ota.lib_deps}
@@ -92,8 +92,10 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+
 build_src_filter = ${radiomaster_900_bandit_nano.build_src_filter}
   +<../examples/simple_room_server>
+
 lib_deps =
   ${radiomaster_900_bandit_nano.lib_deps}
   ${esp32_ota.lib_deps}