From 9a94e8bd9f2d007aea0e8e28a17068d906a718c9 Mon Sep 17 00:00:00 2001
From: Austin Lane <vidplace7@gmail.com>
Date: Fri, 20 Feb 2026 19:07:18 -0500
Subject: [PATCH 01/22] Add T-Beam BPF (144-148 Mhz LoRa)

---
 boards/t-beam-bpf.json                     | 39 +++++++++++++
 src/mesh/RF95Interface.cpp                 |  9 +++
 src/platform/esp32/architecture.h          |  3 +
 variants/esp32s3/t-beam-bpf/pins_arduino.h | 26 +++++++++
 variants/esp32s3/t-beam-bpf/platformio.ini | 23 ++++++++
 variants/esp32s3/t-beam-bpf/variant.h      | 65 ++++++++++++++++++++++
 6 files changed, 165 insertions(+)
 create mode 100644 boards/t-beam-bpf.json
 create mode 100644 variants/esp32s3/t-beam-bpf/pins_arduino.h
 create mode 100644 variants/esp32s3/t-beam-bpf/platformio.ini
 create mode 100644 variants/esp32s3/t-beam-bpf/variant.h

diff --git a/boards/t-beam-bpf.json b/boards/t-beam-bpf.json
new file mode 100644
index 00000000000..2d7889b492d
--- /dev/null
+++ b/boards/t-beam-bpf.json
@@ -0,0 +1,39 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DLILYGO_TBEAM_BPF",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "psram_type": "opi",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "t-beam-bpf"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "LilyGo TBeam-BPF",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.lilygo.cn/",
+  "vendor": "LilyGo"
+}
diff --git a/src/mesh/RF95Interface.cpp b/src/mesh/RF95Interface.cpp
index 0c12401ca9f..5421d96380d 100644
--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -113,6 +113,11 @@ void RF95Interface::setTransmitEnable(bool txon)
 /// \return true if initialisation succeeded.
 bool RF95Interface::init()
 {
+#ifdef RF95_POWER_EN
+    digitalWrite(RF95_POWER_EN, HIGH);
+    pinMode(RF95_POWER_EN, OUTPUT);
+#endif
+
     RadioLibInterface::init();
 
 #if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
@@ -335,6 +340,10 @@ bool RF95Interface::sleep()
     setStandby(); // First cancel any active receiving/sending
     lora->sleep();
 
+#ifdef RF95_POWER_EN
+    digitalWrite(RF95_POWER_EN, LOW);
+#endif
+
 #ifdef RF95_FAN_EN
     digitalWrite(RF95_FAN_EN, 0);
 #endif
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 7aee45f814e..e9aa6f3fe98 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -194,6 +194,9 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK_PRO
 #elif defined(T_BEAM_1W)
 #define HW_VENDOR meshtastic_HardwareModel_TBEAM_1_WATT
+// Awaiting protobuf merge
+// #elif defined(T_BEAM_BPF)
+// #define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
 #elif defined(T_LORA_PAGER)
 #define HW_VENDOR meshtastic_HardwareModel_T_LORA_PAGER
 #elif defined(HELTEC_V4)
diff --git a/variants/esp32s3/t-beam-bpf/pins_arduino.h b/variants/esp32s3/t-beam-bpf/pins_arduino.h
new file mode 100644
index 00000000000..39d98bbaad6
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/pins_arduino.h
@@ -0,0 +1,26 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// UART1 (qwiic)
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// I2C for OLED and sensors
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+// Default SPI mapped to Radio/SD
+static const uint8_t SS = 15; // LoRa CS
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 13;
+static const uint8_t SCK = 12;
+
+// SD Card CS
+#define SDCARD_CS 10
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/esp32s3/t-beam-bpf/platformio.ini b/variants/esp32s3/t-beam-bpf/platformio.ini
new file mode 100644
index 00000000000..8358d33b568
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/platformio.ini
@@ -0,0 +1,23 @@
+; LilyGo T-Beam-BPF (144-148Mhz)
+[env:t-beam-bpf]
+custom_meshtastic_hw_model = 124
+custom_meshtastic_hw_model_slug = TBEAM_BPF
+custom_meshtastic_architecture = esp32s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 3
+custom_meshtastic_display_name = LILYGO T-Beam BPF
+custom_meshtastic_images = tbeam-1w.svg
+custom_meshtastic_tags = LilyGo
+
+extends = esp32s3_base
+board = t-beam-bpf
+board_build.partitions = default_16MB.csv
+board_check = true
+
+lib_deps =
+  ${esp32s3_base.lib_deps}
+
+build_flags = 
+  ${esp32s3_base.build_flags} 
+  -I variants/esp32s3/t-beam-bpf
+  -D T_BEAM_BPF
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
new file mode 100644
index 00000000000..9b40baea0a5
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -0,0 +1,65 @@
+// LilyGo T-Beam-BPF variant.h
+// Configuration based on LilyGO utilities.h and RF documentation
+
+// TODO Lock to 2M (144mhz) ham "region"
+// #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_HAM_2M
+
+// I2C for OLED display (SH1106 at 0x3C)
+#define I2C_SDA 8
+#define I2C_SCL 9
+
+// GPS - Quectel L76K
+#define GPS_RX_PIN 5
+#define GPS_TX_PIN 6
+#define GPS_1PPS_PIN 7
+#define HAS_GPS 1
+#define GPS_BAUDRATE 9600
+
+// Buttons
+#define BUTTON_PIN 0     // BUTTON 1
+#define ALT_BUTTON_PIN 3 // BUTTON 2
+
+// SPI (shared by LoRa and SD)
+#define SPI_MOSI 11
+#define SPI_SCK 12
+#define SPI_MISO 13
+#define SPI_CS 10
+
+// SD Card
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+#define SDCARD_CS SPI_CS
+
+// LoRa Radio - SX1278 144-148Mhz
+#define USE_RF95
+#define LORA_SCK SPI_SCK
+#define LORA_MISO SPI_MISO
+#define LORA_MOSI SPI_MOSI
+#define LORA_CS 1
+#define LORA_RESET 18
+#define LORA_IRQ 14
+#define LORA_DIO0 LORA_IRQ
+#define LORA_DIO1 21
+#define RF95_RXEN 39 // LNA enable - HIGH during RX
+
+// CRITICAL: Radio power enable - MUST be HIGH before lora.begin()!
+// GPIO 16 powers the SX1278 via LDO
+#define RF95_POWER_EN 16
+
+// "+27dBm"? PA! Investigate further (poorly documented)
+// LilyGo Docs specify SX1278 power must be capped at 10
+#define RF95_MAX_POWER 10
+// TODO map PA output curve
+// #define TX_GAIN_LORA 17
+
+// Display - SH1106 OLED (128x64)
+#define USE_SH1106
+#define OLED_WIDTH 128
+#define OLED_HEIGHT 64
+
+// 32768 Hz crystal present
+#define HAS_32768HZ 1
+
+// PMU
+#define HAS_AXP2101
+// #define PMU_IRQ 4 // Leave disabled for now

From 1d1ca1053bbe097c5358660d84b3d69c60ec4d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Thu, 26 Mar 2026 19:33:41 +0100
Subject: [PATCH 02/22] minor correction to fix compiler warnings

---
 src/platform/esp32/architecture.h     | 5 ++---
 variants/esp32s3/t-beam-bpf/variant.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index e9aa6f3fe98..fcfb88bcff2 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -194,9 +194,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK_PRO
 #elif defined(T_BEAM_1W)
 #define HW_VENDOR meshtastic_HardwareModel_TBEAM_1_WATT
-// Awaiting protobuf merge
-// #elif defined(T_BEAM_BPF)
-// #define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
+#elif defined(T_BEAM_BPF)
+#define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
 #elif defined(T_LORA_PAGER)
 #define HW_VENDOR meshtastic_HardwareModel_T_LORA_PAGER
 #elif defined(HELTEC_V4)
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
index 9b40baea0a5..8c0647dfef7 100644
--- a/variants/esp32s3/t-beam-bpf/variant.h
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -28,7 +28,7 @@
 // SD Card
 #define HAS_SDCARD
 #define SDCARD_USE_SPI1
-#define SDCARD_CS SPI_CS
+// #define SDCARD_CS SPI_CS (already defined in pins_arduino.h)
 
 // LoRa Radio - SX1278 144-148Mhz
 #define USE_RF95

From 64f415dc0f55d42b72698c99ccf0da3d4e4e9cfd Mon Sep 17 00:00:00 2001
From: Austin Lane <vidplace7@gmail.com>
Date: Fri, 20 Feb 2026 19:07:18 -0500
Subject: [PATCH 03/22] Add T-Beam BPF (144-148 Mhz LoRa)

---
 boards/t-beam-bpf.json                     | 39 +++++++++++++
 src/mesh/RF95Interface.cpp                 |  9 +++
 src/platform/esp32/architecture.h          |  3 +
 variants/esp32s3/t-beam-bpf/pins_arduino.h | 26 +++++++++
 variants/esp32s3/t-beam-bpf/platformio.ini | 23 ++++++++
 variants/esp32s3/t-beam-bpf/variant.h      | 65 ++++++++++++++++++++++
 6 files changed, 165 insertions(+)
 create mode 100644 boards/t-beam-bpf.json
 create mode 100644 variants/esp32s3/t-beam-bpf/pins_arduino.h
 create mode 100644 variants/esp32s3/t-beam-bpf/platformio.ini
 create mode 100644 variants/esp32s3/t-beam-bpf/variant.h

diff --git a/boards/t-beam-bpf.json b/boards/t-beam-bpf.json
new file mode 100644
index 00000000000..2d7889b492d
--- /dev/null
+++ b/boards/t-beam-bpf.json
@@ -0,0 +1,39 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DLILYGO_TBEAM_BPF",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "psram_type": "opi",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "t-beam-bpf"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino"],
+  "name": "LilyGo TBeam-BPF",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.lilygo.cn/",
+  "vendor": "LilyGo"
+}
diff --git a/src/mesh/RF95Interface.cpp b/src/mesh/RF95Interface.cpp
index b3aa72f7ae7..cb9e4a09b3d 100644
--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -113,6 +113,11 @@ void RF95Interface::setTransmitEnable(bool txon)
 /// \return true if initialisation succeeded.
 bool RF95Interface::init()
 {
+#ifdef RF95_POWER_EN
+    digitalWrite(RF95_POWER_EN, HIGH);
+    pinMode(RF95_POWER_EN, OUTPUT);
+#endif
+
     RadioLibInterface::init();
 
 #if defined(RADIOMASTER_900_BANDIT_NANO) || defined(RADIOMASTER_900_BANDIT)
@@ -336,6 +341,10 @@ bool RF95Interface::sleep()
     setStandby(); // First cancel any active receiving/sending
     lora->sleep();
 
+#ifdef RF95_POWER_EN
+    digitalWrite(RF95_POWER_EN, LOW);
+#endif
+
 #ifdef RF95_FAN_EN
     digitalWrite(RF95_FAN_EN, 0);
 #endif
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 30398a675f8..1bbca50e772 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -194,6 +194,9 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK_PRO
 #elif defined(T_BEAM_1W)
 #define HW_VENDOR meshtastic_HardwareModel_TBEAM_1_WATT
+// Awaiting protobuf merge
+// #elif defined(T_BEAM_BPF)
+// #define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
 #elif defined(T_LORA_PAGER)
 #define HW_VENDOR meshtastic_HardwareModel_T_LORA_PAGER
 #elif defined(HELTEC_V4)
diff --git a/variants/esp32s3/t-beam-bpf/pins_arduino.h b/variants/esp32s3/t-beam-bpf/pins_arduino.h
new file mode 100644
index 00000000000..39d98bbaad6
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/pins_arduino.h
@@ -0,0 +1,26 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// UART1 (qwiic)
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+// I2C for OLED and sensors
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+// Default SPI mapped to Radio/SD
+static const uint8_t SS = 15; // LoRa CS
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 13;
+static const uint8_t SCK = 12;
+
+// SD Card CS
+#define SDCARD_CS 10
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/esp32s3/t-beam-bpf/platformio.ini b/variants/esp32s3/t-beam-bpf/platformio.ini
new file mode 100644
index 00000000000..8358d33b568
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/platformio.ini
@@ -0,0 +1,23 @@
+; LilyGo T-Beam-BPF (144-148Mhz)
+[env:t-beam-bpf]
+custom_meshtastic_hw_model = 124
+custom_meshtastic_hw_model_slug = TBEAM_BPF
+custom_meshtastic_architecture = esp32s3
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 3
+custom_meshtastic_display_name = LILYGO T-Beam BPF
+custom_meshtastic_images = tbeam-1w.svg
+custom_meshtastic_tags = LilyGo
+
+extends = esp32s3_base
+board = t-beam-bpf
+board_build.partitions = default_16MB.csv
+board_check = true
+
+lib_deps =
+  ${esp32s3_base.lib_deps}
+
+build_flags = 
+  ${esp32s3_base.build_flags} 
+  -I variants/esp32s3/t-beam-bpf
+  -D T_BEAM_BPF
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
new file mode 100644
index 00000000000..9b40baea0a5
--- /dev/null
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -0,0 +1,65 @@
+// LilyGo T-Beam-BPF variant.h
+// Configuration based on LilyGO utilities.h and RF documentation
+
+// TODO Lock to 2M (144mhz) ham "region"
+// #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_HAM_2M
+
+// I2C for OLED display (SH1106 at 0x3C)
+#define I2C_SDA 8
+#define I2C_SCL 9
+
+// GPS - Quectel L76K
+#define GPS_RX_PIN 5
+#define GPS_TX_PIN 6
+#define GPS_1PPS_PIN 7
+#define HAS_GPS 1
+#define GPS_BAUDRATE 9600
+
+// Buttons
+#define BUTTON_PIN 0     // BUTTON 1
+#define ALT_BUTTON_PIN 3 // BUTTON 2
+
+// SPI (shared by LoRa and SD)
+#define SPI_MOSI 11
+#define SPI_SCK 12
+#define SPI_MISO 13
+#define SPI_CS 10
+
+// SD Card
+#define HAS_SDCARD
+#define SDCARD_USE_SPI1
+#define SDCARD_CS SPI_CS
+
+// LoRa Radio - SX1278 144-148Mhz
+#define USE_RF95
+#define LORA_SCK SPI_SCK
+#define LORA_MISO SPI_MISO
+#define LORA_MOSI SPI_MOSI
+#define LORA_CS 1
+#define LORA_RESET 18
+#define LORA_IRQ 14
+#define LORA_DIO0 LORA_IRQ
+#define LORA_DIO1 21
+#define RF95_RXEN 39 // LNA enable - HIGH during RX
+
+// CRITICAL: Radio power enable - MUST be HIGH before lora.begin()!
+// GPIO 16 powers the SX1278 via LDO
+#define RF95_POWER_EN 16
+
+// "+27dBm"? PA! Investigate further (poorly documented)
+// LilyGo Docs specify SX1278 power must be capped at 10
+#define RF95_MAX_POWER 10
+// TODO map PA output curve
+// #define TX_GAIN_LORA 17
+
+// Display - SH1106 OLED (128x64)
+#define USE_SH1106
+#define OLED_WIDTH 128
+#define OLED_HEIGHT 64
+
+// 32768 Hz crystal present
+#define HAS_32768HZ 1
+
+// PMU
+#define HAS_AXP2101
+// #define PMU_IRQ 4 // Leave disabled for now

From 4271481300210610bdd85a6de25f3d5a50a89d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Thu, 26 Mar 2026 19:33:41 +0100
Subject: [PATCH 04/22] minor correction to fix compiler warnings

---
 src/platform/esp32/architecture.h     | 5 ++---
 variants/esp32s3/t-beam-bpf/variant.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 1bbca50e772..d2f7d78b8c0 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -194,9 +194,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_DECK_PRO
 #elif defined(T_BEAM_1W)
 #define HW_VENDOR meshtastic_HardwareModel_TBEAM_1_WATT
-// Awaiting protobuf merge
-// #elif defined(T_BEAM_BPF)
-// #define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
+#elif defined(T_BEAM_BPF)
+#define HW_VENDOR meshtastic_HardwareModel_TBEAM_BPF
 #elif defined(T_LORA_PAGER)
 #define HW_VENDOR meshtastic_HardwareModel_T_LORA_PAGER
 #elif defined(HELTEC_V4)
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
index 9b40baea0a5..8c0647dfef7 100644
--- a/variants/esp32s3/t-beam-bpf/variant.h
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -28,7 +28,7 @@
 // SD Card
 #define HAS_SDCARD
 #define SDCARD_USE_SPI1
-#define SDCARD_CS SPI_CS
+// #define SDCARD_CS SPI_CS (already defined in pins_arduino.h)
 
 // LoRa Radio - SX1278 144-148Mhz
 #define USE_RF95

From b365c94981281325a11afe6f6c04fcabbd6825af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 21 Apr 2026 15:13:43 +0200
Subject: [PATCH 05/22] Add ITU regions for this device and make GPS work.

---
 src/Power.cpp                         | 16 +++++++
 src/graphics/draw/MenuHandler.cpp     |  9 ++++
 src/mesh/MeshRadio.h                  |  2 +-
 src/mesh/NodeDB.cpp                   |  7 +++
 src/mesh/RadioInterface.cpp           | 68 ++++++++++++++++++++++++++-
 variants/esp32s3/t-beam-bpf/variant.h |  7 +--
 6 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/src/Power.cpp b/src/Power.cpp
index 26b9615254e..301eeed07fe 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -1239,6 +1239,22 @@ bool Power::axpChipInit()
             PMU->disablePowerOutput(XPOWERS_DLDO1); // Invalid power channel, it does not exist
             PMU->disablePowerOutput(XPOWERS_DLDO2); // Invalid power channel, it does not exist
             PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        } else if (HW_VENDOR == meshtastic_HardwareModel_TBEAM_BPF) {
+            // T-Beam BPF rail map (per schematic LilyGo_TBeam_BPF r2025-05-08):
+            //   DCDC1  -> ESP32 + OLED 3V3 (always on, protected)
+            //   ALDO2  -> MicroSD 3V3    (OFF at reset, must enable)
+            //   ALDO4  -> L76K GNSS 3V3  (OFF at reset, must enable)
+            //   ALDO1/3, BLDO1/2, DLDO1 -> user headers / unused at boot, leave at reset defaults.
+            // LoRa power is outside the PMU (external P-MOSFET switched by RF95_POWER_EN / IO16).
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO4);
+
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
+
+            // Make sure nothing's driving into an unused rail
+            PMU->disablePowerOutput(XPOWERS_DCDC5);
+            PMU->disablePowerOutput(XPOWERS_DLDO1);
         }
 
         // disable all axp chip interrupt
diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index e92ba48394e..304cefd440e 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -112,6 +112,14 @@ void menuHandler::OnboardMessage()
 
 void menuHandler::LoraRegionPicker(uint32_t duration)
 {
+#ifdef HAS_HAM_2M_ONLY
+    // Hardware is restricted to the amateur 2m band — offer only the two 2m regions
+    // so the user cannot pick a sub-GHz region the RF path cannot emit or receive.
+    static const LoraRegionOption regionOptions[] = {
+        {"ITU1_2M (144-146)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M},
+        {"ITU2/3_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M},
+    };
+#else
     static const LoraRegionOption regionOptions[] = {
         {"Back", OptionsAction::Back},
         {"US", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_US},
@@ -141,6 +149,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
         {"NP_865", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_NP_865},
         {"BR_902", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_BR_902},
     };
+#endif
 
     constexpr size_t regionCount = sizeof(regionOptions) / sizeof(regionOptions[0]);
     static std::array<const char *, regionCount> regionLabels{};
diff --git a/src/mesh/MeshRadio.h b/src/mesh/MeshRadio.h
index 089b4b18979..017a3a207ff 100644
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -26,9 +26,9 @@ struct RegionProfile {
 extern const RegionProfile PROFILE_STD;
 extern const RegionProfile PROFILE_EU868;
 extern const RegionProfile PROFILE_UNDEF;
+extern const RegionProfile PROFILE_HAM;
 // extern const RegionProfile  PROFILE_LITE;
 // extern const RegionProfile  PROFILE_NARROW;
-// extern const RegionProfile  PROFILE_HAM;
 
 // Map from old region names to new region enums
 struct RegionInfo {
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 6e57e89f6e1..3d7f6a32a74 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1124,6 +1124,13 @@ void NodeDB::installDefaultDeviceState()
     memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
     owner.has_is_unmessagable = true;
     owner.is_unmessagable = false;
+
+#ifdef HAS_HAM_2M_ONLY
+    // Ham-band-only hardware defaults to licensed operation. The user can still flip this off later
+    // (e.g. a commercial operator on an adjacent allocation who wants to keep encryption on) — we
+    // only set the default here, not on every boot.
+    owner.is_licensed = true;
+#endif
 }
 
 // We reserve a few nodenums for future use
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index b7b672d8b02..cafc7ca4d25 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -54,6 +54,7 @@ static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_UNDEF[] = {meshtas
 const RegionProfile PROFILE_STD = {PRESETS_STD, 0, 0, true, false, 0, 0, 0, 0};
 const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 0, 0, 0};
 const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 0, 0, 0};
+const RegionProfile PROFILE_HAM = {PRESETS_STD, 0, 0, false, true, 0, 0, 0, 0};
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr)                   \
     {                                                                                                                            \
@@ -223,6 +224,19 @@ const RegionInfo regions[] = {
     */
     RDEF(BR_902, 902.0f, 907.5f, 100, 30, false, false, PROFILE_STD),
 
+    /*
+        ITU Region 1 (Europe, Africa, Middle East, former USSR) amateur 2m allocation: 144.000 - 146.000 MHz.
+        Power limit is the regulatory ceiling (1 W / 30 dBm) — individual hardware will cap below this
+        via its own PA curve; the field here is just the legal upper bound.
+    */
+    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM),
+
+    /*
+        ITU Region 2 (Americas) and Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
+        Typical admin rules (e.g. US FCC Part 97) allow well above 30 dBm for licensed operators.
+    */
+    RDEF(ITU23_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM),
+
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
     */
@@ -505,6 +519,23 @@ std::unique_ptr<RadioInterface> initLoRa()
             rebootAtMsec = millis() + 5000;
         }
     }
+
+    // Hardware/region crosscheck for the amateur 2m band: ham-only boards must run a 2m region,
+    // and boards without 2m support must not run one. In either mismatch, drop to UNSET so the
+    // first-start picker runs and the user re-selects a legal region for the hardware.
+    const bool is2mRegion = config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M ||
+                            config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M;
+#ifdef HAS_HAM_2M_ONLY
+    const bool mismatch = !is2mRegion && config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+#else
+    const bool mismatch = is2mRegion;
+#endif
+    if (mismatch) {
+        LOG_WARN("Saved region incompatible with this hardware's RF path. Revert to unset");
+        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+        nodeDB->saveToDisk(SEGMENT_CONFIG);
+    }
+
     return rIf;
 }
 
@@ -787,7 +818,14 @@ bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &lo
     const RegionInfo *newRegion = getRegion(loraConfig.region);
 
     // If you are not licensed, you can't use ham regions.
-    if (newRegion->profile->licensedOnly && !devicestate.owner.is_licensed) {
+    // Exception: on hardware that can *only* operate on a ham band (e.g. T-Beam BPF), the user has
+    // no other region to choose, so allow unlicensed selection — a commercial operator on adjacent
+    // frequencies can still use the band plan and keep encryption enabled.
+    bool allowUnlicensedHam = false;
+#ifdef HAS_HAM_2M_ONLY
+    allowUnlicensedHam = true;
+#endif
+    if (newRegion->profile->licensedOnly && !devicestate.owner.is_licensed && !allowUnlicensedHam) {
         char err_string[160];
         snprintf(err_string, sizeof(err_string), "Region %s requires licensed mode", newRegion->name);
         LOG_ERROR("%s", err_string);
@@ -796,6 +834,34 @@ bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &lo
         return false;
     }
 
+    const bool is2mRegion = loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M ||
+                            loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M;
+
+#ifdef HAS_HAM_2M_ONLY
+    // This hardware's front-end / band-pass filter only passes 144-148 MHz. Any other region
+    // selection would key the radio on a frequency the RF path cannot emit or receive.
+    if (!is2mRegion && loraConfig.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+        char err_string[160];
+        snprintf(err_string, sizeof(err_string), "Region %s not supported: this hardware is 2m-only", newRegion->name);
+        LOG_ERROR("%s", err_string);
+        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+        sendErrorNotification(err_string);
+        return false;
+    }
+#else
+    // Conversely, the 2m ham regions are illegal RF output for hardware not designed for that band
+    // (e.g. selecting ITU23_2M on a 915 MHz node would transmit at ~3x the expected frequency with
+    // an untuned antenna and filter). Refuse the selection entirely.
+    if (is2mRegion) {
+        char err_string[160];
+        snprintf(err_string, sizeof(err_string), "Region %s requires 2m-band hardware", newRegion->name);
+        LOG_ERROR("%s", err_string);
+        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+        sendErrorNotification(err_string);
+        return false;
+    }
+#endif
+
     return true;
 }
 
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
index 8c0647dfef7..1b1524145ae 100644
--- a/variants/esp32s3/t-beam-bpf/variant.h
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -1,14 +1,15 @@
 // LilyGo T-Beam-BPF variant.h
 // Configuration based on LilyGO utilities.h and RF documentation
 
-// TODO Lock to 2M (144mhz) ham "region"
-// #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_HAM_2M
+// Hardware is restricted to the amateur 2m band (144-148 MHz).
+#define HAS_HAM_2M_ONLY 1
 
 // I2C for OLED display (SH1106 at 0x3C)
 #define I2C_SDA 8
 #define I2C_SCL 9
 
-// GPS - Quectel L76K
+// GPS - Quectel L76K. Per schematic sheet 7:
+
 #define GPS_RX_PIN 5
 #define GPS_TX_PIN 6
 #define GPS_1PPS_PIN 7

From 5fa9b05d708b2f924273a8470f8afc4e407b8764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 21 Apr 2026 17:26:57 +0200
Subject: [PATCH 06/22] Switch pin after defining it as output

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 src/mesh/RF95Interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/RF95Interface.cpp b/src/mesh/RF95Interface.cpp
index be948526f5e..9ea470365f7 100644
--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -114,8 +114,8 @@ void RF95Interface::setTransmitEnable(bool txon)
 bool RF95Interface::init()
 {
 #ifdef RF95_POWER_EN
-    digitalWrite(RF95_POWER_EN, HIGH);
     pinMode(RF95_POWER_EN, OUTPUT);
+    digitalWrite(RF95_POWER_EN, HIGH);
 #endif
 
     RadioLibInterface::init();

From a4eb6b0b6398ed5bef9fe5c043fae692f0ef5a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 21 Apr 2026 17:32:40 +0200
Subject: [PATCH 07/22] Lora CS is indeed 1, SD Card CS is 10

---
 variants/esp32s3/t-beam-bpf/pins_arduino.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variants/esp32s3/t-beam-bpf/pins_arduino.h b/variants/esp32s3/t-beam-bpf/pins_arduino.h
index 39d98bbaad6..195ef289633 100644
--- a/variants/esp32s3/t-beam-bpf/pins_arduino.h
+++ b/variants/esp32s3/t-beam-bpf/pins_arduino.h
@@ -15,7 +15,7 @@ static const uint8_t SDA = 8;
 static const uint8_t SCL = 9;
 
 // Default SPI mapped to Radio/SD
-static const uint8_t SS = 15; // LoRa CS
+static const uint8_t SS = 1; // LoRa CS
 static const uint8_t MOSI = 11;
 static const uint8_t MISO = 13;
 static const uint8_t SCK = 12;

From 39908bfbd2aa6902eedb1f5739d8f9e815f94362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Tue, 21 Apr 2026 21:22:33 +0200
Subject: [PATCH 08/22] Include the back option.

---
 src/graphics/draw/MenuHandler.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index 304cefd440e..5b5200ff42b 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -116,8 +116,9 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
     // Hardware is restricted to the amateur 2m band — offer only the two 2m regions
     // so the user cannot pick a sub-GHz region the RF path cannot emit or receive.
     static const LoraRegionOption regionOptions[] = {
+        {"Back", OptionsAction::Back},
         {"ITU1_2M (144-146)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M},
-        {"ITU2/3_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M},
+        {"ITU23_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M},
     };
 #else
     static const LoraRegionOption regionOptions[] = {

From 76a79dd8ec218d781a3f7f1e8c85ea1ac5aa4ef8 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Mon, 18 May 2026 15:47:14 -0400
Subject: [PATCH 09/22] Fix compilation with pioarduino (USB_MODE)

---
 boards/t-beam-bpf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boards/t-beam-bpf.json b/boards/t-beam-bpf.json
index 2d7889b492d..50afb7900af 100644
--- a/boards/t-beam-bpf.json
+++ b/boards/t-beam-bpf.json
@@ -9,7 +9,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_BPF",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

From 1d595beab7fa63a11a6c95ae7004b3834a502ecf Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Thu, 21 May 2026 18:13:05 -0400
Subject: [PATCH 10/22] Default ham to narrow_fast

---
 src/mesh/MeshRadio.h        | 2 +-
 src/mesh/RadioInterface.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesh/MeshRadio.h b/src/mesh/MeshRadio.h
index a0090673dea..b54b072a217 100644
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -46,7 +46,7 @@ extern const RegionProfile PROFILE_EU868;
 extern const RegionProfile PROFILE_UNDEF;
 extern const RegionProfile PROFILE_LITE;
 extern const RegionProfile PROFILE_NARROW;
-extern const RegionProfile  PROFILE_HAM;
+extern const RegionProfile PROFILE_HAM;
 
 // Map from old region names to new region enums
 struct RegionInfo {
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 8f910822fcf..3ff99568076 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -231,13 +231,13 @@ const RegionInfo regions[] = {
         Power limit is the regulatory ceiling (1 W / 30 dBm) — individual hardware will cap below this
         via its own PA curve; the field here is just the legal upper bound.
     */
-    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM),
+    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
 
     /*
         ITU Region 2 (Americas) and Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules (e.g. US FCC Part 97) allow well above 30 dBm for licensed operators.
     */
-    RDEF(ITU23_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM),
+    RDEF(ITU23_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
 
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.

From 2e5f44db16a5fe9c6d237d4f3905af2eff8de9af Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Thu, 21 May 2026 18:34:16 -0400
Subject: [PATCH 11/22] Default PROFILE_HAM to slot 17

This is an appropriate default in the USA but not the EU.

The slot override really should follow the region itself, not the regionprofile.
---
 src/mesh/RadioInterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 3ff99568076..18cff3628f4 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -56,7 +56,7 @@ const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 1, 1
 const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 1, 1, 0};
 const RegionProfile PROFILE_LITE = {PRESETS_LITE, 0.4, 0.0375f, false, false, 0, 10, 10, 0};
 const RegionProfile PROFILE_NARROW = {PRESETS_NARROW, 0, 0.0104f, true, false, 0, 1, 1, 1};
-const RegionProfile PROFILE_HAM = {PRESETS_NARROW, 0, 0, false, true, 0, 1, 1, 1};
+const RegionProfile PROFILE_HAM = {PRESETS_NARROW, 0, 0, false, true, 0, 1, 1, 17};
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr, default_preset)   \
     {                                                                                                                            \

From aad1a27cbf424e07d69fb48a4b0f48b370c5d082 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Tue, 26 May 2026 20:19:05 -0400
Subject: [PATCH 12/22] Fix for ITU 2/3 split

---
 src/graphics/draw/MenuHandler.cpp              |  9 ++++++---
 .../InkHUD/Applets/System/Menu/MenuApplet.cpp  | 15 +++++++++++++++
 src/mesh/RadioInterface.cpp                    | 18 +++++++++++++-----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index 42c8a18e0d1..65bc167c6c1 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -177,12 +177,13 @@ void menuHandler::OnboardMessage()
 void menuHandler::LoraRegionPicker(uint32_t duration)
 {
 #ifdef HAS_HAM_2M_ONLY
-    // Hardware is restricted to the amateur 2m band — offer only the two 2m regions
+    // Hardware is restricted to the amateur 2m band — offer only the 2m regions
     // so the user cannot pick a sub-GHz region the RF path cannot emit or receive.
     static const LoraRegionOption regionOptions[] = {
         {"Back", OptionsAction::Back},
         {"ITU1_2M (144-146)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M},
-        {"ITU23_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M},
+        {"ITU2_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU2_2M},
+        {"ITU3_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M},
     };
 #else
     static const LoraRegionOption regionOptions[] = {
@@ -215,7 +216,9 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
         {"KZ_863", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_KZ_863},
         {"NP_865", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_NP_865},
         {"BR_902", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_BR_902},
-
+        {"ITU1_2M (144-146)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M},
+        {"ITU2_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU2_2M},
+        {"ITU3_2M (144-148)", OptionsAction::Select, meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M},
     };
 #endif
 
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index b70853151a0..be133acef80 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -783,6 +783,18 @@ void InkHUD::MenuApplet::execute(MenuItem item)
     case SET_REGION_NARROW_868:
         applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_N_868);
         break;
+    
+    case SET_REGION_ITU1_2M:
+        applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M);
+        break;
+
+    case SET_REGION_ITU2_2M:
+        applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_ITU2_2M);
+        break;
+
+    case SET_REGION_ITU3_2M:
+        applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M);
+        break;
 
     // Roles
     case SET_ROLE_CLIENT:
@@ -1469,6 +1481,9 @@ void InkHUD::MenuApplet::showPage(MenuPage page)
         items.push_back(MenuItem("KZ 863", MenuAction::SET_REGION_KZ_863, MenuPage::EXIT));
         items.push_back(MenuItem("NP 865", MenuAction::SET_REGION_NP_865, MenuPage::EXIT));
         items.push_back(MenuItem("BR 902", MenuAction::SET_REGION_BR_902, MenuPage::EXIT));
+        items.push_back(MenuItem("ITU1_2M (144-146)", MenuAction::SET_REGION_ITU1_2M, MenuPage::EXIT));
+        items.push_back(MenuItem("ITU2_2M (144-148)", MenuAction::SET_REGION_ITU2_2M, MenuPage::EXIT));
+        items.push_back(MenuItem("ITU3_2M (144-148)", MenuAction::SET_REGION_ITU3_2M, MenuPage::EXIT));
         items.push_back(MenuItem("Exit", MenuPage::EXIT));
         break;
 
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 18cff3628f4..6234596d0f8 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -234,10 +234,16 @@ const RegionInfo regions[] = {
     RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
 
     /*
-        ITU Region 2 (Americas) and Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
+        ITU Region 2 (Americas) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules (e.g. US FCC Part 97) allow well above 30 dBm for licensed operators.
     */
-    RDEF(ITU23_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
+    RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
+
+    /*
+        ITU Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
+        Typical admin rules allow well above 30 dBm for licensed operators.
+    */
+    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST)),
 
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
@@ -554,7 +560,8 @@ std::unique_ptr<RadioInterface> initLoRa()
     // and boards without 2m support must not run one. In either mismatch, drop to UNSET so the
     // first-start picker runs and the user re-selects a legal region for the hardware.
     const bool is2mRegion = config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M ||
-                            config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M;
+                            config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU2_2M ||
+                            config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M;
 #ifdef HAS_HAM_2M_ONLY
     const bool mismatch = !is2mRegion && config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET;
 #else
@@ -882,7 +889,8 @@ bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &lo
     }
 
     const bool is2mRegion = loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M ||
-                            loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M;
+                            loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU2_2M ||
+                            loraConfig.region == meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M;
 
 #ifdef HAS_HAM_2M_ONLY
     // This hardware's front-end / band-pass filter only passes 144-148 MHz. Any other region
@@ -897,7 +905,7 @@ bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &lo
     }
 #else
     // Conversely, the 2m ham regions are illegal RF output for hardware not designed for that band
-    // (e.g. selecting ITU23_2M on a 915 MHz node would transmit at ~3x the expected frequency with
+    // (e.g. selecting ITU2_2M on a 915 MHz node would transmit at ~3x the expected frequency with
     // an untuned antenna and filter). Refuse the selection entirely.
     if (is2mRegion) {
         char err_string[160];

From 4a734821629c0660772e2dd5406778419c2f009c Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Tue, 26 May 2026 22:07:47 -0400
Subject: [PATCH 13/22] Add ITU region options to MenuAction enum

---
 src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
index fc1aef02a0b..e373166c18a 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuAction.h
@@ -66,6 +66,9 @@ enum MenuAction {
     SET_REGION_BR_902,
     SET_REGION_EU_866,
     SET_REGION_NARROW_868,
+    SET_REGION_ITU1_2M,
+    SET_REGION_ITU2_2M,
+    SET_REGION_ITU3_2M,
     // Device Roles
     SET_ROLE_CLIENT,
     SET_ROLE_CLIENT_MUTE,

From f0a67c5cb0e69ccddec4c73f0eab1df105438b71 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Tue, 26 May 2026 22:46:56 -0400
Subject: [PATCH 14/22] Add HAS_HAM_2M definition to variant headers for 2M
 support

---
 src/mesh/RadioInterface.cpp              | 4 ++++
 variants/esp32/tlora_v2_1_16/variant.h   | 3 +++
 variants/esp32s3/t-beam-bpf/variant.h    | 3 +++
 variants/esp32s3/tbeam-s3-core/variant.h | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 6234596d0f8..02ee2c71ebb 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -564,6 +564,10 @@ std::unique_ptr<RadioInterface> initLoRa()
                             config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_ITU3_2M;
 #ifdef HAS_HAM_2M_ONLY
     const bool mismatch = !is2mRegion && config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+#elif defined(HAS_HAM_2M) && !defined(HAS_HAM_2M_ONLY)
+    // If hardware specifies HAS_HAM_2M without HAS_HAM_2M_ONLY, it supports 2m but isn't restricted to it.
+    // In this case, we allow any region.
+    const bool mismatch = false;
 #else
     const bool mismatch = is2mRegion;
 #endif
diff --git a/variants/esp32/tlora_v2_1_16/variant.h b/variants/esp32/tlora_v2_1_16/variant.h
index 27d2fb5ab8a..dde154858d7 100644
--- a/variants/esp32/tlora_v2_1_16/variant.h
+++ b/variants/esp32/tlora_v2_1_16/variant.h
@@ -2,6 +2,9 @@
 #define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_SAMPLES 30
 
+// A variant has 2M support
+#define HAS_HAM_2M 1
+
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
 #define ADC_MULTIPLIER 2
 
diff --git a/variants/esp32s3/t-beam-bpf/variant.h b/variants/esp32s3/t-beam-bpf/variant.h
index 1b1524145ae..4cd0501c016 100644
--- a/variants/esp32s3/t-beam-bpf/variant.h
+++ b/variants/esp32s3/t-beam-bpf/variant.h
@@ -1,6 +1,9 @@
 // LilyGo T-Beam-BPF variant.h
 // Configuration based on LilyGO utilities.h and RF documentation
 
+// Hardware has 2M support
+#define HAS_HAM_2M 1
+
 // Hardware is restricted to the amateur 2m band (144-148 MHz).
 #define HAS_HAM_2M_ONLY 1
 
diff --git a/variants/esp32s3/tbeam-s3-core/variant.h b/variants/esp32s3/tbeam-s3-core/variant.h
index 11e4633643f..a3bb0c5ec6e 100644
--- a/variants/esp32s3/tbeam-s3-core/variant.h
+++ b/variants/esp32s3/tbeam-s3-core/variant.h
@@ -9,6 +9,9 @@
 #define BUTTON_PIN 0 // The middle button GPIO on the T-Beam S3
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
+// A variant has 2M support
+#define HAS_HAM_2M 1
+
 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
 #define USE_SX1262

From 8ef885a7ba39b986c3c99d55e40e1f1a0fe279c3 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Sat, 30 May 2026 17:24:15 -0400
Subject: [PATCH 15/22] Re-add PROFILE_HAM regionprofile

Accidentally removed in last merge
---
 src/mesh/RadioInterface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 59a05488551..7cdd8d6f5b8 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -56,6 +56,7 @@ const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 1, 1
 const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 1, 1};
 const RegionProfile PROFILE_LITE = {PRESETS_LITE, 0.4, 0.0375f, false, false, 0, 10, 10};
 const RegionProfile PROFILE_NARROW = {PRESETS_NARROW, 0, 0.0104f, true, false, 0, 1, 1};
+const RegionProfile PROFILE_HAM = {PRESETS_NARROW, 0, 0, false, true, 0, 1, 1};
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr, default_preset,   \
              override_slot)                                                                                                      \

From 94b343d3d8d5bae21064b3ddbdacd54fc0b12e1e Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Sat, 30 May 2026 17:29:41 -0400
Subject: [PATCH 16/22] Trunk fmt

---
 src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index be133acef80..0c9d84711fa 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -783,7 +783,7 @@ void InkHUD::MenuApplet::execute(MenuItem item)
     case SET_REGION_NARROW_868:
         applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_N_868);
         break;
-    
+
     case SET_REGION_ITU1_2M:
         applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M);
         break;

From 0bce1e937fde52156e620b8246f6974426af1ac5 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Sat, 30 May 2026 18:04:31 -0400
Subject: [PATCH 17/22] Initial default slots

---
 src/mesh/RadioInterface.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 7cdd8d6f5b8..e44fb65d0e1 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -231,20 +231,30 @@ const RegionInfo regions[] = {
         ITU Region 1 (Europe, Africa, Middle East, former USSR) amateur 2m allocation: 144.000 - 146.000 MHz.
         Power limit is the regulatory ceiling (1 W / 30 dBm) — individual hardware will cap below this
         via its own PA curve; the field here is just the legal upper bound.
+
+        Default slot: 9 (144.531 MHz)
+        https://www.iaru-r1.org/wp-content/uploads/2020/12/VHF-Bandplan.pdf
     */
-    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 0),
+    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 9),
 
     /*
         ITU Region 2 (Americas) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules (e.g. US FCC Part 97) allow well above 30 dBm for licensed operators.
+
+        Default slot: 17 (145.031 MHz)
+        https://www.arrl.org/band-plan
     */
     RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 17),
 
     /*
         ITU Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules allow well above 30 dBm for licensed operators.
+
+        Default slot: 11 (144.656 MHz)
+        https://www.iaru.org/wp-content/uploads/2020/01/R3-004-IARU-Region-3-Bandplan-rev.2.pdf
+        https://www.wia.org.au/members/bandplans/data/documents/WIA%20Australian%20Band%20Plan%202026.pdf
     */
-    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 0),
+    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 11),
 
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.

From 211af899bdcb73c5f30dfbcdaa90c67c4dd78112 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 3 Jun 2026 11:55:57 -0400
Subject: [PATCH 18/22] Switch to TinyFast

Still need to flesh out the default channels
---
 src/mesh/MeshRadio.h        | 1 -
 src/mesh/RadioInterface.cpp | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mesh/MeshRadio.h b/src/mesh/MeshRadio.h
index 2ec46c44318..4b9d58af72d 100644
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -44,7 +44,6 @@ extern const RegionProfile PROFILE_EU868;
 extern const RegionProfile PROFILE_UNDEF;
 extern const RegionProfile PROFILE_LITE;
 extern const RegionProfile PROFILE_NARROW;
-extern const RegionProfile PROFILE_HAM;
 extern const RegionProfile PROFILE_HAM_20KHZ;
 
 // Map from old region names to new region enums
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 47f2539ef75..ddd9c2553a7 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -58,7 +58,6 @@ const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 1, 1
 const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 1, 1};
 const RegionProfile PROFILE_LITE = {PRESETS_LITE, 0.4, 0.0375f, false, false, 0, 10, 10};
 const RegionProfile PROFILE_NARROW = {PRESETS_NARROW, 0, 0.0104f, true, false, 0, 1, 1};
-const RegionProfile PROFILE_HAM = {PRESETS_NARROW, 0, 0, false, true, 0, 1, 1};
 // Ham '20kHz' profile. 15.625kHz bandwidth coerced to 20kHz via padding.
 const RegionProfile PROFILE_HAM_20KHZ = {PRESETS_TINY, 0, 0.0021875f, false, true, 0, 2, 2};
 
@@ -239,7 +238,7 @@ const RegionInfo regions[] = {
         Default slot: 9 (144.531 MHz)
         https://www.iaru-r1.org/wp-content/uploads/2020/12/VHF-Bandplan.pdf
     */
-    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 9),
+    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
 
     /*
         ITU Region 2 (Americas) amateur 2m allocation: 144.000 - 148.000 MHz.
@@ -248,7 +247,7 @@ const RegionInfo regions[] = {
         Default slot: 17 (145.031 MHz)
         https://www.arrl.org/band-plan
     */
-    RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 17),
+    RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
 
     /*
         ITU Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
@@ -258,7 +257,7 @@ const RegionInfo regions[] = {
         https://www.iaru.org/wp-content/uploads/2020/01/R3-004-IARU-Region-3-Bandplan-rev.2.pdf
         https://www.wia.org.au/members/bandplans/data/documents/WIA%20Australian%20Band%20Plan%202026.pdf
     */
-    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM, PRESET(NARROW_FAST), 11),
+    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
 
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.

From 0a2e4c7e0f555a25126b7d8d92000e514c2694c9 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 3 Jun 2026 12:31:11 -0400
Subject: [PATCH 19/22] Adjust slotOverrides for TinyFast

---
 src/mesh/RadioInterface.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index ddd9c2553a7..46c14e0e9be 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -235,29 +235,29 @@ const RegionInfo regions[] = {
         Power limit is the regulatory ceiling (1 W / 30 dBm) — individual hardware will cap below this
         via its own PA curve; the field here is just the legal upper bound.
 
-        Default slot: 9 (144.531 MHz)
+        Default slot: 26 (144.510 MHz)
         https://www.iaru-r1.org/wp-content/uploads/2020/12/VHF-Bandplan.pdf
     */
-    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
+    RDEF(ITU1_2M, 144.0f, 146.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 26),
 
     /*
         ITU Region 2 (Americas) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules (e.g. US FCC Part 97) allow well above 30 dBm for licensed operators.
 
-        Default slot: 17 (145.031 MHz)
+        Default slot: 51 (145.010 MHz)
         https://www.arrl.org/band-plan
     */
-    RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
+    RDEF(ITU2_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 51),
 
     /*
         ITU Region 3 (Asia/Pacific) amateur 2m allocation: 144.000 - 148.000 MHz.
         Typical admin rules allow well above 30 dBm for licensed operators.
 
-        Default slot: 11 (144.656 MHz)
+        Default slot: 33 (144.650 MHz)
         https://www.iaru.org/wp-content/uploads/2020/01/R3-004-IARU-Region-3-Bandplan-rev.2.pdf
         https://www.wia.org.au/members/bandplans/data/documents/WIA%20Australian%20Band%20Plan%202026.pdf
     */
-    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 1),
+    RDEF(ITU3_2M, 144.0f, 148.0f, 100, 30, false, false, PROFILE_HAM_20KHZ, PRESET(TINY_FAST), 33),
 
     /*
        2.4 GHZ WLAN Band equivalent. Only for SX128x chips.

From 2ca305d439aed88386b28ebdff7f24909c08b30c Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 3 Jun 2026 13:49:44 -0400
Subject: [PATCH 20/22] RadioLib doesn't accept 15.625 kHz

Use 15.6 instead
---
 src/mesh/MeshRadio.h                     | 6 +++---
 src/mesh/RadioInterface.cpp              | 4 ++--
 test/test_radio/test_main.cpp            | 2 +-
 variants/esp32s3/tbeam-s3-core/variant.h | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mesh/MeshRadio.h b/src/mesh/MeshRadio.h
index 4b9d58af72d..553230250c4 100644
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -129,7 +129,7 @@ static inline float bwCodeToKHz(uint16_t bwCode)
     if (bwCode == 10)
         return 10.4f;
     if (bwCode == 16)
-        return 15.625f;
+        return 15.6f;
     if (bwCode == 21)
         return 20.8f;
     if (bwCode == 31)
@@ -241,12 +241,12 @@ static inline void modemPresetToParams(meshtastic_Config_LoRaConfig_ModemPreset
         sf = 8;
         break;
     case PRESET(TINY_FAST):
-        bwKHz = 15.625f;
+        bwKHz = 15.6f;
         cr = 5;
         sf = 7;
         break;
     case PRESET(TINY_SLOW):
-        bwKHz = 15.625f;
+        bwKHz = 15.6f;
         cr = 6;
         sf = 8;
         break;
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 46c14e0e9be..db3618ea253 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -58,8 +58,8 @@ const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 1, 1
 const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 1, 1};
 const RegionProfile PROFILE_LITE = {PRESETS_LITE, 0.4, 0.0375f, false, false, 0, 10, 10};
 const RegionProfile PROFILE_NARROW = {PRESETS_NARROW, 0, 0.0104f, true, false, 0, 1, 1};
-// Ham '20kHz' profile. 15.625kHz bandwidth coerced to 20kHz via padding.
-const RegionProfile PROFILE_HAM_20KHZ = {PRESETS_TINY, 0, 0.0021875f, false, true, 0, 2, 2};
+// Ham '20kHz' profile. 15.6kHz bandwidth coerced to 20kHz via padding.
+const RegionProfile PROFILE_HAM_20KHZ = {PRESETS_TINY, 0, 0.0022f, false, true, 0, 2, 2};
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr, default_preset,   \
              override_slot)                                                                                                      \
diff --git a/test/test_radio/test_main.cpp b/test/test_radio/test_main.cpp
index a0ad704c4e9..104e6b36b1c 100644
--- a/test/test_radio/test_main.cpp
+++ b/test/test_radio/test_main.cpp
@@ -35,7 +35,7 @@ static void test_bwCodeToKHz_specialMappings()
 {
     TEST_ASSERT_FLOAT_WITHIN(0.0001f, 7.8f, bwCodeToKHz(8));
     TEST_ASSERT_FLOAT_WITHIN(0.0001f, 10.4f, bwCodeToKHz(10));
-    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 15.625f, bwCodeToKHz(16));
+    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 15.6f, bwCodeToKHz(16));
     TEST_ASSERT_FLOAT_WITHIN(0.0001f, 20.8f, bwCodeToKHz(21));
     TEST_ASSERT_FLOAT_WITHIN(0.0001f, 31.25f, bwCodeToKHz(31));
     TEST_ASSERT_FLOAT_WITHIN(0.0001f, 41.7f, bwCodeToKHz(42));
diff --git a/variants/esp32s3/tbeam-s3-core/variant.h b/variants/esp32s3/tbeam-s3-core/variant.h
index a3bb0c5ec6e..32f4d88d79c 100644
--- a/variants/esp32s3/tbeam-s3-core/variant.h
+++ b/variants/esp32s3/tbeam-s3-core/variant.h
@@ -17,6 +17,7 @@
 #define USE_SX1262
 #define USE_SX1268
 #define USE_LR1121
+#define USE_RF95
 
 #define LORA_DIO0 -1 // a No connect on the SX1262 module
 #define LORA_RESET 5

From 5778a469cfbba8bd2ff33a55864624938da7d0ca Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 3 Jun 2026 15:59:37 -0400
Subject: [PATCH 21/22] Set RF95 pins for T-Beam Supreme

May cause regressions!!
---
 src/RF95Configuration.h                  | 12 +++++++++++-
 variants/esp32s3/tbeam-s3-core/variant.h |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/RF95Configuration.h b/src/RF95Configuration.h
index 5c525814bbc..f7c5751bd21 100644
--- a/src/RF95Configuration.h
+++ b/src/RF95Configuration.h
@@ -1,6 +1,16 @@
 // TODO refactor this out with better radio configuration system
 #ifdef USE_RF95
+
+#ifndef RF95_RESET
 #define RF95_RESET LORA_RESET
-#define RF95_IRQ LORA_DIO0  // on SX1262 version this is a no connect DIO0
+#endif
+
+#ifndef RF95_IRQ
+#define RF95_IRQ LORA_DIO0 // on SX1262 version this is a no connect DIO0
+#endif
+
+#ifndef RF95_DIO1
 #define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95, but used for pure SX127x
 #endif
+
+#endif
diff --git a/variants/esp32s3/tbeam-s3-core/variant.h b/variants/esp32s3/tbeam-s3-core/variant.h
index 32f4d88d79c..dfa313761ae 100644
--- a/variants/esp32s3/tbeam-s3-core/variant.h
+++ b/variants/esp32s3/tbeam-s3-core/variant.h
@@ -25,6 +25,12 @@
 #define LORA_DIO2 4 // SX1262 BUSY
 #define LORA_DIO3   // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
 
+#ifdef USE_RF95
+#define RF95_IRQ 2
+#define RF95_RESET LORA_RESET
+#define RF95_DIO1 LORA_DIO1
+#endif
+
 #ifdef USE_SX1262
 #define SX126X_CS 10 // FIXME - we really should define LORA_CS instead
 #define SX126X_DIO1 LORA_DIO1

From 1aab2d880d1a84c5b04395b87172f197eed3b808 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Wed, 3 Jun 2026 20:40:43 -0400
Subject: [PATCH 22/22] Remove other-variant changes (BPF-only)

These have been moved to other PRs
---
 variants/esp32/tlora_v2_1_16/variant.h   |  3 ---
 variants/esp32s3/tbeam-s3-core/variant.h | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/variants/esp32/tlora_v2_1_16/variant.h b/variants/esp32/tlora_v2_1_16/variant.h
index dde154858d7..27d2fb5ab8a 100644
--- a/variants/esp32/tlora_v2_1_16/variant.h
+++ b/variants/esp32/tlora_v2_1_16/variant.h
@@ -2,9 +2,6 @@
 #define ADC_CHANNEL ADC_CHANNEL_7
 #define BATTERY_SENSE_SAMPLES 30
 
-// A variant has 2M support
-#define HAS_HAM_2M 1
-
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
 #define ADC_MULTIPLIER 2
 
diff --git a/variants/esp32s3/tbeam-s3-core/variant.h b/variants/esp32s3/tbeam-s3-core/variant.h
index dfa313761ae..11e4633643f 100644
--- a/variants/esp32s3/tbeam-s3-core/variant.h
+++ b/variants/esp32s3/tbeam-s3-core/variant.h
@@ -9,15 +9,11 @@
 #define BUTTON_PIN 0 // The middle button GPIO on the T-Beam S3
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.
 
-// A variant has 2M support
-#define HAS_HAM_2M 1
-
 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
 #define USE_SX1262
 #define USE_SX1268
 #define USE_LR1121
-#define USE_RF95
 
 #define LORA_DIO0 -1 // a No connect on the SX1262 module
 #define LORA_RESET 5
@@ -25,12 +21,6 @@
 #define LORA_DIO2 4 // SX1262 BUSY
 #define LORA_DIO3   // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
 
-#ifdef USE_RF95
-#define RF95_IRQ 2
-#define RF95_RESET LORA_RESET
-#define RF95_DIO1 LORA_DIO1
-#endif
-
 #ifdef USE_SX1262
 #define SX126X_CS 10 // FIXME - we really should define LORA_CS instead
 #define SX126X_DIO1 LORA_DIO1