diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 241f2cd10..daa18e6af 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,7 +52,7 @@ jobs:
node-version: 24
- name: Setup pnpm
- uses: pnpm/action-setup@v4
+ uses: pnpm/action-setup@v5
with:
version: latest
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 91cf49b2b..0385ffd6a 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -8,15 +8,15 @@ plugins:
uri: https://github.com/trunk-io/plugins
lint:
enabled:
- - checkov@3.2.508
- - renovate@43.76.3
+ - checkov@3.2.510
+ - renovate@43.84.0
- prettier@3.8.1
- trufflehog@3.93.8
- yamllint@1.38.0
- bandit@1.9.4
- trivy@0.69.3
- taplo@0.10.0
- - ruff@0.15.6
+ - ruff@0.15.7
- isort@8.0.1
- markdownlint@0.48.0
- oxipng@10.1.0
diff --git a/boards/heltec_mesh_node_t096.json b/boards/heltec_mesh_node_t096.json
new file mode 100644
index 000000000..1e417c5b4
--- /dev/null
+++ b/boards/heltec_mesh_node_t096.json
@@ -0,0 +1,54 @@
+{
+ "build": {
+ "arduino": {
+ "ldscript": "nrf52840_s140_v6.ld"
+ },
+ "core": "nRF5",
+ "cpu": "cortex-m4",
+ "extra_flags": "-DNRF52840_XXAA",
+ "f_cpu": "64000000L",
+ "hwids": [
+ ["0x239A", "0x4405"],
+ ["0x239A", "0x0029"],
+ ["0x239A", "0x002A"],
+ ["0x2886", "0x1667"]
+ ],
+ "usb_product": "HT-n5262G",
+ "mcu": "nrf52840",
+ "variant": "heltec_mesh_node_t096",
+ "variants_dir": "variants",
+ "bsp": {
+ "name": "adafruit"
+ },
+ "softdevice": {
+ "sd_flags": "-DS140",
+ "sd_name": "s140",
+ "sd_version": "6.1.1",
+ "sd_fwid": "0x00B6"
+ },
+ "bootloader": {
+ "settings_addr": "0xFF000"
+ }
+ },
+ "connectivity": ["bluetooth"],
+ "debug": {
+ "jlink_device": "nRF52840_xxAA",
+ "onboard_tools": ["jlink"],
+ "svd_path": "nrf52840.svd",
+ "openocd_target": "nrf52840-mdk-rs"
+ },
+ "frameworks": ["arduino"],
+ "name": "Heltec nrf (Adafruit BSP)",
+ "upload": {
+ "maximum_ram_size": 248832,
+ "maximum_size": 815104,
+ "speed": 115200,
+ "protocol": "nrfutil",
+ "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+ "use_1200bps_touch": true,
+ "require_upload_port": true,
+ "wait_for_upload_port": true
+ },
+ "url": "https://heltec.org/",
+ "vendor": "Heltec"
+}
diff --git a/platformio.ini b/platformio.ini
index db3782390..f9add198b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -126,7 +126,7 @@ lib_deps =
[device-ui_base]
lib_deps =
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
- https://github.com/meshtastic/device-ui/archive/622b034d8791153de9d16a473723cb8625d35839.zip
+ https://github.com/meshtastic/device-ui/archive/f36d2a953524e372b78c5b4147ec55f38716964e.zip
; Common libs for environmental measurements in telemetry module
[environmental_base]
diff --git a/protobufs b/protobufs
index eba2d94c8..cb1f89372 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit eba2d94c8d53e798f560e12d63d0457e1e22759e
+Subproject commit cb1f89372a70b0d4b4f8caf05aec28de8d4a13e0
diff --git a/src/DisplayFormatters.cpp b/src/DisplayFormatters.cpp
index d88f9fc9f..fdcf840dc 100644
--- a/src/DisplayFormatters.cpp
+++ b/src/DisplayFormatters.cpp
@@ -4,7 +4,8 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
bool usePreset)
{
- // If use_preset is false, always return "Custom"
+ // If use_preset is false, always return "Custom" — callers such as RadioInterface and Channels
+ // rely on this being a stable literal for channel-name hashing and default-channel detection.
if (!usePreset) {
return "Custom";
}
diff --git a/src/RedirectablePrint.cpp b/src/RedirectablePrint.cpp
index 672c8334c..6ff7bbb18 100644
--- a/src/RedirectablePrint.cpp
+++ b/src/RedirectablePrint.cpp
@@ -345,7 +345,7 @@ void RedirectablePrint::log(const char *logLevel, const char *format, ...)
return;
}
-void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16_t len)
+void RedirectablePrint::hexDump(const char *logLevel, const unsigned char *buf, uint16_t len)
{
const char alphabet[17] = "0123456789abcdef";
log(logLevel, " +------------------------------------------------+ +----------------+");
diff --git a/src/RedirectablePrint.h b/src/RedirectablePrint.h
index 45b62b7af..c66226171 100644
--- a/src/RedirectablePrint.h
+++ b/src/RedirectablePrint.h
@@ -44,7 +44,7 @@ class RedirectablePrint : public Print
/** like printf but va_list based */
size_t vprintf(const char *logLevel, const char *format, va_list arg);
- void hexDump(const char *logLevel, unsigned char *buf, uint16_t len);
+ void hexDump(const char *logLevel, const unsigned char *buf, uint16_t len);
std::string mt_sprintf(const std::string fmt_str, ...);
diff --git a/src/configuration.h b/src/configuration.h
index 8936b9d98..11be86007 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -156,8 +156,19 @@ along with this program. If not, see .
#ifdef USE_KCT8103L_PA
// Power Amps are often non-linear, so we can use an array of values for the power curve
+#if defined(HELTEC_WIRELESS_TRACKER_V2)
#define NUM_PA_POINTS 22
#define TX_GAIN_LORA 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 13, 13, 12, 12, 11, 10, 9, 8, 7
+#elif defined(HELTEC_MESH_NODE_T096)
+#define NUM_PA_POINTS 22
+#define TX_GAIN_LORA 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 13, 13, 12, 11, 10, 9, 8, 7
+#else
+// If a board enables USE_KCT8103L_PA but does not match a known variant and has
+// not already provided a PA curve, fail at compile time to avoid unsafe defaults.
+#if !defined(NUM_PA_POINTS) || !defined(TX_GAIN_LORA)
+#error "USE_KCT8103L_PA is defined, but no PA gain curve (NUM_PA_POINTS / TX_GAIN_LORA) is configured for this board."
+#endif
+#endif
#endif
#ifdef RAK13302
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 06862a2c4..2e00c11ce 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -341,7 +341,9 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
type = DPS310;
break;
}
- break;
+ if (type == DPS310) {
+ break;
+ }
default:
registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1); // GET_ID
switch (registerValue) {
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 1260d8b15..cf5511a33 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -103,6 +103,14 @@ static int32_t gpsSwitch()
if (gps) {
int currentState = digitalRead(PIN_GPS_SWITCH);
+ // Respect explicit NOT_PRESENT mode and do not let the hardware switch re-enable GPS.
+ if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT) {
+ gps->disable();
+ lastState = currentState;
+ firstrun = false;
+ return 1000;
+ }
+
// if the switch is set to zero, disable the GPS Thread
if (firstrun)
if (currentState == LOW)
diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp
index 1c2eb72d4..005ead292 100644
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -1348,7 +1348,7 @@ void TFTDisplay::sendCommand(uint8_t com)
digitalWrite(portduino_config.displayBacklight.pin, TFT_BACKLIGHT_ON);
#elif defined(HACKADAY_COMMUNICATOR)
tft->displayOn();
-#elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
+#elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE) && !defined(HELTEC_MESH_NODE_T096)
tft->wakeup();
tft->powerSaveOff();
#endif
@@ -1359,7 +1359,7 @@ void TFTDisplay::sendCommand(uint8_t com)
#ifdef UNPHONE
unphone.backlight(true); // using unPhone library
#endif
-#ifdef RAK14014
+#if defined(RAK14014) || defined(HELTEC_MESH_NODE_T096)
#elif !defined(M5STACK) && !defined(ST7789_CS) && \
!defined(HACKADAY_COMMUNICATOR) // T-Deck gets brightness set in Screen.cpp in the handleSetOn function
tft->setBrightness(172);
@@ -1375,7 +1375,7 @@ void TFTDisplay::sendCommand(uint8_t com)
digitalWrite(portduino_config.displayBacklight.pin, !TFT_BACKLIGHT_ON);
#elif defined(HACKADAY_COMMUNICATOR)
tft->displayOff();
-#elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
+#elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE) && !defined(HELTEC_MESH_NODE_T096)
tft->sleep();
tft->powerSaveOn();
#endif
@@ -1386,7 +1386,7 @@ void TFTDisplay::sendCommand(uint8_t com)
#ifdef UNPHONE
unphone.backlight(false); // using unPhone library
#endif
-#ifdef RAK14014
+#if defined(RAK14014) || defined(HELTEC_MESH_NODE_T096)
#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
tft->setBrightness(0);
#endif
@@ -1401,7 +1401,7 @@ void TFTDisplay::sendCommand(uint8_t com)
void TFTDisplay::setDisplayBrightness(uint8_t _brightness)
{
-#ifdef RAK14014
+#if defined(RAK14014) || defined(HELTEC_MESH_NODE_T096)
// todo
#elif !defined(HACKADAY_COMMUNICATOR)
tft->setBrightness(_brightness);
@@ -1421,7 +1421,7 @@ bool TFTDisplay::hasTouch(void)
{
#ifdef RAK14014
return true;
-#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR) && !defined(HELTEC_MESH_NODE_T096)
return tft->touch() != nullptr;
#else
return false;
@@ -1440,7 +1440,7 @@ bool TFTDisplay::getTouch(int16_t *x, int16_t *y)
} else {
return false;
}
-#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR) && !defined(HELTEC_MESH_NODE_T096)
return tft->getTouch(x, y);
#else
return false;
@@ -1457,7 +1457,7 @@ bool TFTDisplay::connect()
{
concurrency::LockGuard g(spiLock);
LOG_INFO("Do TFT init");
-#ifdef RAK14014
+#if defined(RAK14014) || defined(HELTEC_MESH_NODE_T096)
tft = new TFT_eSPI;
#elif defined(HACKADAY_COMMUNICATOR)
bus = new Arduino_ESP32SPI(TFT_DC, TFT_CS, 38 /* SCK */, 21 /* MOSI */, GFX_NOT_DEFINED /* MISO */, HSPI /* spi_num */);
@@ -1494,7 +1494,7 @@ bool TFTDisplay::connect()
ft6336u.begin();
pinMode(SCREEN_TOUCH_INT, INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(SCREEN_TOUCH_INT), rak14014_tpIntHandle, FALLING);
-#elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2)
+#elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2) || defined(HELTEC_MESH_NODE_T096)
tft->setRotation(1); // T-Deck has the TFT in landscape
#elif defined(T_WATCH_S3)
tft->setRotation(2); // T-Watch S3 left-handed orientation
diff --git a/src/graphics/draw/DebugRenderer.cpp b/src/graphics/draw/DebugRenderer.cpp
index 2069c71ec..27a50d3f9 100644
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -408,7 +408,16 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
display->drawString(nameX, getTextPositions(display)[line++], device_role);
// === Third Row: Radio Preset ===
- auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, config.lora.use_preset);
+ // For custom modem settings show the actual parameters; for presets use the preset name.
+ char modeStr[16];
+ if (!config.lora.use_preset) {
+ snprintf(modeStr, sizeof(modeStr), "BW%u-SF%u-CR%u", static_cast(config.lora.bandwidth),
+ static_cast(config.lora.spread_factor), static_cast(config.lora.coding_rate));
+ } else {
+ strncpy(modeStr, DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, true),
+ sizeof(modeStr) - 1);
+ modeStr[sizeof(modeStr) - 1] = '\0';
+ }
char regionradiopreset[25];
const char *region = myRegion ? myRegion->name : NULL;
@@ -416,7 +425,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
if (currentResolution == ScreenResolution::UltraLow) {
snprintf(regionradiopreset, sizeof(regionradiopreset), "%s", region);
} else {
- snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
+ snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, modeStr);
}
}
textWidth = display->getStringWidth(regionradiopreset);
diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index f57c39512..daefff8ee 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -18,6 +18,7 @@
#include "main.h"
#include "mesh/Default.h"
#include "mesh/MeshTypes.h"
+#include "mesh/RadioLibInterface.h"
#include "modules/AdminModule.h"
#include "modules/CannedMessageModule.h"
#include "modules/ExternalNotificationModule.h"
@@ -25,6 +26,7 @@
#include "modules/TraceRouteModule.h"
#include
#include
+#include
#include
#include
@@ -159,31 +161,20 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
return;
}
+ // Guard: without a reboot, reconfigure() applies the region directly.
+ // Reject LORA_24 on sub-GHz-only hardware — getRadio() used to catch this post-reboot.
+ if (selectedRegion == meshtastic_Config_LoRaConfig_RegionCode_LORA_24 &&
+ !(RadioLibInterface::instance && RadioLibInterface::instance->wideLora())) {
+ LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring LORA_24 selection");
+ return;
+ }
+
config.lora.region = selectedRegion;
auto changes = SEGMENT_CONFIG;
- // FIXME: This should be a method consolidated with the same logic in the admin message as well
- // This is needed as we wait til picking the LoRa region to generate keys for the first time.
#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
- if (!owner.is_licensed) {
- bool keygenSuccess = false;
- if (config.security.private_key.size == 32) {
- // public key is derived from private, so this will always have the same result.
- if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
- keygenSuccess = true;
- }
-
- } else {
- LOG_INFO("Generate new PKI keys");
- crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
- keygenSuccess = true;
- }
- if (keygenSuccess) {
- config.security.public_key.size = 32;
- config.security.private_key.size = 32;
- owner.public_key.size = 32;
- memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
- }
+ if (crypto) {
+ crypto->ensurePkiKeys(config.security, owner);
}
#endif
config.lora.tx_enabled = true;
@@ -199,7 +190,6 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
}
service->reloadConfig(changes);
- rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
});
bannerOptions.durationMs = duration;
@@ -265,13 +255,24 @@ void menuHandler::FrequencySlotPicker()
optionsEnumArray[options++] = 0;
// Calculate number of channels (copied from RadioInterface::applyModemConfig())
+
meshtastic_Config_LoRaConfig &loraConfig = config.lora;
double bw = loraConfig.use_preset ? modemPresetToBwKHz(loraConfig.modem_preset, myRegion->wideLora)
: bwCodeToKHz(loraConfig.bandwidth);
uint32_t numChannels = 0;
if (myRegion) {
- numChannels = (uint32_t)floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000.0)));
+ // Match RadioInterface::applyModemConfig(): include padding, add spacing in numerator, and use round()
+ const double spacing = myRegion->profile->spacing;
+ const double padding = myRegion->profile->padding;
+ const double channelBandwidthMHz = bw / 1000.0;
+ const double numerator = (myRegion->freqEnd - myRegion->freqStart) + spacing;
+ const double denominator = spacing + (padding * 2) + channelBandwidthMHz;
+ if (denominator > 0.0) {
+ numChannels = static_cast(round(numerator / denominator));
+ } else {
+ LOG_WARN("Invalid region configuration: non-positive channel spacing/width");
+ }
} else {
LOG_WARN("Region not set, cannot calculate number of channels");
return;
@@ -307,7 +308,6 @@ void menuHandler::FrequencySlotPicker()
config.lora.channel_num = selected;
service->reloadConfig(SEGMENT_CONFIG);
- rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
};
screen->showOverlayBanner(bannerOptions);
@@ -346,7 +346,6 @@ void menuHandler::radioPresetPicker()
config.lora.channel_num = 0; // Reset to default channel for the preset
config.lora.override_frequency = 0; // Clear any custom frequency
service->reloadConfig(SEGMENT_CONFIG);
- rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
});
screen->showOverlayBanner(bannerOptions);
diff --git a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
index b2ef1f714..d489d21ee 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp
@@ -177,24 +177,8 @@ static void applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode region)
auto changes = SEGMENT_CONFIG;
#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
- if (!owner.is_licensed) {
- bool keygenSuccess = false;
-
- if (config.security.private_key.size == 32) {
- if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
- keygenSuccess = true;
- }
- } else {
- crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
- keygenSuccess = true;
- }
-
- if (keygenSuccess) {
- config.security.public_key.size = 32;
- config.security.private_key.size = 32;
- owner.public_key.size = 32;
- memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
- }
+ if (crypto) {
+ crypto->ensurePkiKeys(config.security, owner);
}
#endif
diff --git a/src/input/InputBroker.cpp b/src/input/InputBroker.cpp
index acf79f149..e3125ca12 100644
--- a/src/input/InputBroker.cpp
+++ b/src/input/InputBroker.cpp
@@ -34,7 +34,7 @@
#if defined(BUTTON_PIN_TOUCH)
ButtonThread *TouchButtonThread = nullptr;
-#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
+#if defined(PIN_EINK_EN)
static bool touchBacklightWasOn = false;
static bool touchBacklightActive = false;
#endif
@@ -220,8 +220,8 @@ void InputBroker::Init()
};
touchConfig.singlePress = INPUT_BROKER_NONE;
touchConfig.longPress = INPUT_BROKER_BACK;
-#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
- // On T-Echo Plus the touch pad should only drive the backlight, not UI navigation/sounds
+#if defined(PIN_EINK_EN)
+ // Touch pad drives the backlight on devices with e-ink backlight pin
touchConfig.longPress = INPUT_BROKER_NONE;
touchConfig.suppressLeadUpSound = true;
touchConfig.onPress = []() {
diff --git a/src/mesh/CryptoEngine.cpp b/src/mesh/CryptoEngine.cpp
index 72216a63c..4a613b644 100644
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -61,6 +61,33 @@ bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
}
return true;
}
+
+bool CryptoEngine::ensurePkiKeys(meshtastic_Config_SecurityConfig &security, meshtastic_User &user)
+{
+ if (user.is_licensed) {
+ return false;
+ }
+
+ bool keygenSuccess = false;
+ if (security.private_key.size == 32) {
+ if (regeneratePublicKey(security.public_key.bytes, security.private_key.bytes)) {
+ keygenSuccess = true;
+ }
+ } else {
+ LOG_INFO("Generate new PKI keys");
+ generateKeyPair(security.public_key.bytes, security.private_key.bytes);
+ keygenSuccess = true;
+ }
+
+ if (keygenSuccess) {
+ security.public_key.size = 32;
+ security.private_key.size = 32;
+ user.public_key.size = 32;
+ memcpy(user.public_key.bytes, security.public_key.bytes, 32);
+ }
+
+ return keygenSuccess;
+}
#endif
/**
diff --git a/src/mesh/CryptoEngine.h b/src/mesh/CryptoEngine.h
index 19d572355..f40400331 100644
--- a/src/mesh/CryptoEngine.h
+++ b/src/mesh/CryptoEngine.h
@@ -36,6 +36,7 @@ class CryptoEngine
#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
virtual void generateKeyPair(uint8_t *pubKey, uint8_t *privKey);
virtual bool regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey);
+ virtual bool ensurePkiKeys(meshtastic_Config_SecurityConfig &security, meshtastic_User &user);
#endif
void setDHPrivateKey(uint8_t *_private_key);
diff --git a/src/mesh/Default.h b/src/mesh/Default.h
index f4633790e..069ffc0eb 100644
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -13,12 +13,12 @@
#define TEN_SECONDS_MS 10 * 1000
#define MAX_INTERVAL INT32_MAX // FIXME: INT32_MAX to avoid overflow issues with Apple clients but should be UINT32_MAX
-#define min_default_telemetry_interval_secs 30 * 60
+#define min_default_telemetry_interval_secs IF_ROUTER(ONE_DAY / 2, 30 * 60)
#define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
#define default_telemetry_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)
#define default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)
#define default_broadcast_smart_minimum_interval_secs 5 * 60
-#define min_default_broadcast_interval_secs 60 * 60
+#define min_default_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 60 * 60)
#define min_default_broadcast_smart_minimum_interval_secs 5 * 60
#define default_wait_bluetooth_secs IF_ROUTER(1, 60)
#define default_sds_secs IF_ROUTER(ONE_DAY, UINT32_MAX) // Default to forever super deep sleep
diff --git a/src/mesh/FloodingRouter.cpp b/src/mesh/FloodingRouter.cpp
index 78602a9ec..13f98299f 100644
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -91,10 +91,27 @@ void FloodingRouter::reprocessPacket(const meshtastic_MeshPacket *p)
{
if (nodeDB)
nodeDB->updateFrom(*p);
+
#if !MESHTASTIC_EXCLUDE_TRACEROUTE
+ if (traceRouteModule && p->which_payload_variant != meshtastic_MeshPacket_decoded_tag) {
+ // If we got a packet that is not decoded, try to decode it so we can check for traceroute.
+ auto decodedState = perhapsDecode(const_cast(p));
+ if (decodedState == DecodeState::DECODE_SUCCESS) {
+ // parsing was successful, print for debugging
+ printPacket("reprocessPacket(DUP)", p);
+ } else {
+ // Fatal decoding error, we can't do anything with this packet
+ LOG_WARN(
+ "FloodingRouter::reprocessPacket: Fatal decode error (state=%d, id=0x%08x, from=%u), can't check for traceroute",
+ static_cast(decodedState), p->id, getFrom(p));
+ return;
+ }
+ }
+
if (traceRouteModule && p->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
- p->decoded.portnum == meshtastic_PortNum_TRACEROUTE_APP)
+ p->decoded.portnum == meshtastic_PortNum_TRACEROUTE_APP) {
traceRouteModule->processUpgradedPacket(*p);
+ }
#endif
}
diff --git a/src/mesh/LR11x0Interface.cpp b/src/mesh/LR11x0Interface.cpp
index 4fec06da4..9f808da26 100644
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -192,6 +192,11 @@ template bool LR11x0Interface::reconfigure()
err = lora.setOutputPower(power);
assert(err == RADIOLIB_ERR_NONE);
+ // Apply RX gain mode — valid in STDBY, matches resetAGC() pattern
+ err = lora.setRxBoostedGainMode(config.lora.sx126x_rx_boosted_gain);
+ if (err != RADIOLIB_ERR_NONE)
+ LOG_WARN("LR11x0 setRxBoostedGainMode %s%d", radioLibErr, err);
+
startReceive(); // restart receiving
return RADIOLIB_ERR_NONE;
diff --git a/src/mesh/LoRaFEMInterface.cpp b/src/mesh/LoRaFEMInterface.cpp
index bad795c3a..b44c7539b 100644
--- a/src/mesh/LoRaFEMInterface.cpp
+++ b/src/mesh/LoRaFEMInterface.cpp
@@ -25,7 +25,7 @@ void LoRaFEMInterface::init(void)
pinMode(LORA_KCT8103L_PA_CSD, OUTPUT);
digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
pinMode(LORA_KCT8103L_PA_CTX, OUTPUT);
- digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+ digitalWrite(LORA_KCT8103L_PA_CTX, LOW); // LNA enabled by default
setLnaCanControl(true);
} else if (digitalRead(LORA_KCT8103L_PA_CSD) == LOW) {
// FEM is GC1109
@@ -66,7 +66,7 @@ void LoRaFEMInterface::init(void)
pinMode(LORA_KCT8103L_PA_CSD, OUTPUT);
digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
pinMode(LORA_KCT8103L_PA_CTX, OUTPUT);
- digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
+ digitalWrite(LORA_KCT8103L_PA_CTX, LOW); // LNA enabled by default
setLnaCanControl(true);
#endif
}
@@ -173,14 +173,16 @@ void LoRaFEMInterface::setRxModeEnableWhenMCUSleep(void)
#endif
#elif defined(USE_KCT8103L_PA)
digitalWrite(LORA_KCT8103L_PA_CSD, HIGH);
- rtc_gpio_hold_en((gpio_num_t)LORA_KCT8103L_PA_CSD);
if (lna_enabled) {
digitalWrite(LORA_KCT8103L_PA_CTX, LOW);
} else {
digitalWrite(LORA_KCT8103L_PA_CTX, HIGH);
}
+#if defined(ARCH_ESP32)
+ rtc_gpio_hold_en((gpio_num_t)LORA_KCT8103L_PA_CSD);
rtc_gpio_hold_en((gpio_num_t)LORA_KCT8103L_PA_CTX);
#endif
+#endif
}
void LoRaFEMInterface::setLNAEnable(bool enabled)
diff --git a/src/mesh/LoRaFEMInterface.h b/src/mesh/LoRaFEMInterface.h
index 9024abd3a..14220c6e3 100644
--- a/src/mesh/LoRaFEMInterface.h
+++ b/src/mesh/LoRaFEMInterface.h
@@ -22,7 +22,7 @@ class LoRaFEMInterface
private:
LoRaFEMType fem_type;
- bool lna_enabled = false;
+ bool lna_enabled = true;
bool lna_can_control = false;
};
extern LoRaFEMInterface loraFEMInterface;
diff --git a/src/mesh/MeshRadio.h b/src/mesh/MeshRadio.h
index 07d956878..3c3a4cf65 100644
--- a/src/mesh/MeshRadio.h
+++ b/src/mesh/MeshRadio.h
@@ -5,18 +5,52 @@
#include "PointerQueue.h"
#include "configuration.h"
+// Sentinel marking the end of a modem preset array
+static constexpr meshtastic_Config_LoRaConfig_ModemPreset MODEM_PRESET_END =
+ static_cast(0xFF);
+
+// Region profile: bundles the preset list with regulatory parameters shared across regions
+struct RegionProfile {
+ const meshtastic_Config_LoRaConfig_ModemPreset *presets; // sentinel-terminated; first entry is the default
+ float spacing; // gaps between radio channels
+ float padding; // padding at each side of the "operating channel"
+ bool audioPermitted;
+ bool licensedOnly; // a region profile for licensed operators only
+ int8_t textThrottle; // throttle for text - future expansion
+ int8_t positionThrottle; // throttle for location data - future expansion
+ int8_t telemetryThrottle; // throttle for telemetry - future expansion
+ uint8_t overrideSlot; // a per-region override slot for if we need to fix it in place
+};
+
+extern const RegionProfile PROFILE_STD;
+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;
+
// Map from old region names to new region enums
struct RegionInfo {
meshtastic_Config_LoRaConfig_RegionCode code;
float freqStart;
float freqEnd;
- float dutyCycle;
- float spacing;
+ float dutyCycle; // modified by getEffectiveDutyCycle
uint8_t powerLimit; // Or zero for not set
- bool audioPermitted;
bool freqSwitching;
bool wideLora;
+ const RegionProfile *profile;
const char *name; // EU433 etc
+
+ // Preset accessors (delegate through profile)
+ meshtastic_Config_LoRaConfig_ModemPreset getDefaultPreset() const { return profile->presets[0]; }
+ const meshtastic_Config_LoRaConfig_ModemPreset *getAvailablePresets() const { return profile->presets; }
+ size_t getNumPresets() const
+ {
+ size_t n = 0;
+ while (profile->presets[n] != MODEM_PRESET_END)
+ n++;
+ return n;
+ }
};
extern const RegionInfo regions[];
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 605bb6211..01be50c26 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -322,9 +322,9 @@ NodeDB::NodeDB()
// config.network.enabled_protocols = meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST;
// If we are setup to broadcast on any default channel slot (with default frequency slot semantics),
- // ensure that the telemetry intervals are coerced to the minimum value of 30 minutes or more.
+ // ensure that the telemetry intervals are coerced to the role-aware minimum value.
if (channels.hasDefaultChannel()) {
- LOG_DEBUG("Coerce telemetry to min of 30 minutes on defaults");
+ LOG_DEBUG("Coerce telemetry to role-aware minimum on defaults");
moduleConfig.telemetry.device_update_interval = Default::getConfiguredOrMinimumValue(
moduleConfig.telemetry.device_update_interval, min_default_telemetry_interval_secs);
moduleConfig.telemetry.environment_update_interval = Default::getConfiguredOrMinimumValue(
@@ -347,7 +347,7 @@ NodeDB::NodeDB()
}
}
if (positionUsesDefaultChannel) {
- LOG_DEBUG("Coerce position broadcasts to min of 1 hour and smart broadcast min of 5 minutes on defaults");
+ LOG_DEBUG("Coerce position broadcasts to role-aware minimum and smart broadcast min of 5 minutes on defaults");
config.position.position_broadcast_secs =
Default::getConfiguredOrMinimumValue(config.position.position_broadcast_secs, min_default_broadcast_interval_secs);
config.position.broadcast_smart_minimum_interval_secs = Default::getConfiguredOrMinimumValue(
@@ -569,7 +569,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
config.lora.override_duty_cycle = false;
config.lora.config_ok_to_mqtt = false;
#if HAS_LORA_FEM
- config.lora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED;
+ config.lora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_ENABLED;
#else
config.lora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT;
#endif
@@ -1299,7 +1299,7 @@ void NodeDB::loadFromDisk()
// Coerce LoRa config fields derived from presets while bootstrapping.
// Some clients/UI components display bandwidth/spread_factor directly from config even in preset mode.
if (config.has_lora && config.lora.use_preset) {
- RadioInterface::bootstrapLoRaConfigFromPreset(config.lora);
+ RadioInterface::clampConfigLora(config.lora);
}
#if defined(USERPREFS_LORA_TX_DISABLED) && USERPREFS_LORA_TX_DISABLED
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 4defd00ed..9ce944002 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#ifdef ARCH_PORTDUINO
#include "platform/portduino/PortduinoGlue.h"
@@ -32,10 +33,32 @@
#include "STM32WLE5JCInterface.h"
#endif
-#define RDEF(name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching, wide_lora) \
+static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_STD[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO, MODEM_PRESET_END};
+
+static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_EU_868[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, MODEM_PRESET_END};
+
+static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_UNDEF[] = {meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,
+ MODEM_PRESET_END};
+
+// Region profiles: bundle preset list + regulatory parameters shared across regions
+// presets, spacing, padding, audio, licensed, text throttle, position throttle, telemetry throttle, override slot
+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};
+
+#define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr) \
{ \
- meshtastic_Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, \
- frequency_switching, wide_lora, #name \
+ meshtastic_Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, \
+ wide_lora, &profile_ptr, #name \
}
const RegionInfo regions[] = {
@@ -43,7 +66,7 @@ const RegionInfo regions[] = {
https://link.springer.com/content/pdf/bbm%3A978-1-4842-4357-2%2F1.pdf
https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/
*/
- RDEF(US, 902.0f, 928.0f, 100, 0, 30, true, false, false),
+ RDEF(US, 902.0f, 928.0f, 100, 30, false, false, PROFILE_STD),
/*
EN300220 ETSI V3.2.1 [Table B.1, Item H, p. 21]
@@ -51,8 +74,7 @@ const RegionInfo regions[] = {
https://www.etsi.org/deliver/etsi_en/300200_300299/30022002/03.02.01_60/en_30022002v030201p.pdf
FIXME: https://github.com/meshtastic/firmware/issues/3371
*/
- RDEF(EU_433, 433.0f, 434.0f, 10, 0, 10, true, false, false),
-
+ RDEF(EU_433, 433.0f, 434.0f, 10, 10, false, false, PROFILE_STD),
/*
https://www.thethingsnetwork.org/docs/lorawan/duty-cycle/
https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/
@@ -67,33 +89,33 @@ const RegionInfo regions[] = {
AFA) to avoid a duty cycle. (Please refer to line P page 22 of this document.)
https://www.etsi.org/deliver/etsi_en/300200_300299/30022002/03.01.01_60/en_30022002v030101p.pdf
*/
- RDEF(EU_868, 869.4f, 869.65f, 10, 0, 27, false, false, false),
+ RDEF(EU_868, 869.4f, 869.65f, 10, 27, false, false, PROFILE_EU868),
/*
https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
*/
- RDEF(CN, 470.0f, 510.0f, 100, 0, 19, true, false, false),
+ RDEF(CN, 470.0f, 510.0f, 100, 19, false, false, PROFILE_STD),
/*
https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
https://www.arib.or.jp/english/html/overview/doc/5-STD-T108v1_5-E1.pdf
https://qiita.com/ammo0613/items/d952154f1195b64dc29f
*/
- RDEF(JP, 920.5f, 923.5f, 100, 0, 13, true, false, false),
+ RDEF(JP, 920.5f, 923.5f, 100, 13, false, false, PROFILE_STD),
/*
https://www.iot.org.au/wp/wp-content/uploads/2016/12/IoTSpectrumFactSheet.pdf
https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
Also used in Brazil.
*/
- RDEF(ANZ, 915.0f, 928.0f, 100, 0, 30, true, false, false),
+ RDEF(ANZ, 915.0f, 928.0f, 100, 30, false, false, PROFILE_STD),
/*
433.05 - 434.79 MHz, 25mW EIRP max, No duty cycle restrictions
AU Low Interference Potential https://www.acma.gov.au/licences/low-interference-potential-devices-lipd-class-licence
NZ General User Radio Licence for Short Range Devices https://gazette.govt.nz/notice/id/2022-go3100
*/
- RDEF(ANZ_433, 433.05f, 434.79f, 100, 0, 14, true, false, false),
+ RDEF(ANZ_433, 433.05f, 434.79f, 100, 14, false, false, PROFILE_STD),
/*
https://digital.gov.ru/uploaded/files/prilozhenie-12-k-reshenyu-gkrch-18-46-03-1.pdf
@@ -101,13 +123,13 @@ const RegionInfo regions[] = {
Note:
- We do LBT, so 100% is allowed.
*/
- RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),
+ RDEF(RU, 868.7f, 869.2f, 100, 20, false, false, PROFILE_STD),
/*
https://www.law.go.kr/LSW/admRulLsInfoP.do?admRulId=53943&efYd=0
https://resources.lora-alliance.org/technical-specifications/rp002-1-0-4-regional-parameters
*/
- RDEF(KR, 920.0f, 923.0f, 100, 0, 23, true, false, false),
+ RDEF(KR, 920.0f, 923.0f, 100, 23, false, false, PROFILE_STD),
/*
Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.
@@ -115,42 +137,38 @@ const RegionInfo regions[] = {
https://www.ncc.gov.tw/english/files/23070/102_5190_230703_1_doc_C.PDF
https://gazette.nat.gov.tw/egFront/e_detail.do?metaid=147283
*/
- RDEF(TW, 920.0f, 925.0f, 100, 0, 27, true, false, false),
+ RDEF(TW, 920.0f, 925.0f, 100, 27, false, false, PROFILE_STD),
/*
https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
*/
- RDEF(IN, 865.0f, 867.0f, 100, 0, 30, true, false, false),
+ RDEF(IN, 865.0f, 867.0f, 100, 30, false, false, PROFILE_STD),
/*
https://rrf.rsm.govt.nz/smart-web/smart/page/-smart/domain/licence/LicenceSummary.wdk?id=219752
https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
*/
- RDEF(NZ_865, 864.0f, 868.0f, 100, 0, 36, true, false, false),
+ RDEF(NZ_865, 864.0f, 868.0f, 100, 36, false, false, PROFILE_STD),
/*
https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
*/
- RDEF(TH, 920.0f, 925.0f, 100, 0, 16, true, false, false),
+ RDEF(TH, 920.0f, 925.0f, 100, 16, false, false, PROFILE_STD),
/*
433,05-434,7 Mhz 10 mW
- https://nkrzi.gov.ua/images/upload/256/5810/PDF_UUZ_19_01_2016.pdf
- */
- RDEF(UA_433, 433.0f, 434.7f, 10, 0, 10, true, false, false),
-
- /*
868,0-868,6 Mhz 25 mW
https://nkrzi.gov.ua/images/upload/256/5810/PDF_UUZ_19_01_2016.pdf
*/
- RDEF(UA_868, 868.0f, 868.6f, 1, 0, 14, true, false, false),
+ RDEF(UA_433, 433.0f, 434.7f, 10, 10, false, false, PROFILE_STD),
+ RDEF(UA_868, 868.0f, 868.6f, 1, 14, false, false, PROFILE_STD),
/*
Malaysia
433 - 435 MHz at 100mW, no restrictions.
https://www.mcmc.gov.my/skmmgovmy/media/General/pdf/Short-Range-Devices-Specification.pdf
*/
- RDEF(MY_433, 433.0f, 435.0f, 100, 0, 20, true, false, false),
+ RDEF(MY_433, 433.0f, 435.0f, 100, 20, false, false, PROFILE_STD),
/*
Malaysia
@@ -159,14 +177,14 @@ const RegionInfo regions[] = {
Frequency hopping is used for 919 - 923 MHz.
https://www.mcmc.gov.my/skmmgovmy/media/General/pdf/Short-Range-Devices-Specification.pdf
*/
- RDEF(MY_919, 919.0f, 924.0f, 100, 0, 27, true, true, false),
+ RDEF(MY_919, 919.0f, 924.0f, 100, 27, true, false, PROFILE_STD),
/*
Singapore
SG_923 Band 30d: 917 - 925 MHz at 100mW, no restrictions.
https://www.imda.gov.sg/-/media/imda/files/regulation-licensing-and-consultations/ict-standards/telecommunication-standards/radio-comms/imdatssrd.pdf
*/
- RDEF(SG_923, 917.0f, 925.0f, 100, 0, 20, true, false, false),
+ RDEF(SG_923, 917.0f, 925.0f, 100, 20, false, false, PROFILE_STD),
/*
Philippines
@@ -176,8 +194,9 @@ const RegionInfo regions[] = {
https://github.com/meshtastic/firmware/issues/4948#issuecomment-2394926135
*/
- RDEF(PH_433, 433.0f, 434.7f, 100, 0, 10, true, false, false), RDEF(PH_868, 868.0f, 869.4f, 100, 0, 14, true, false, false),
- RDEF(PH_915, 915.0f, 918.0f, 100, 0, 24, true, false, false),
+ RDEF(PH_433, 433.0f, 434.7f, 100, 10, false, false, PROFILE_STD),
+ RDEF(PH_868, 868.0f, 869.4f, 100, 14, false, false, PROFILE_STD),
+ RDEF(PH_915, 915.0f, 918.0f, 100, 24, false, false, PROFILE_STD),
/*
Kazakhstan
@@ -185,37 +204,38 @@ const RegionInfo regions[] = {
863 - 868 MHz <25 mW EIRP, 500kHz channels allowed, must not be used at airfields
https://github.com/meshtastic/firmware/issues/7204
*/
- RDEF(KZ_433, 433.075f, 434.775f, 100, 0, 10, true, false, false),
- RDEF(KZ_863, 863.0f, 868.0f, 100, 0, 30, true, false, false),
+ RDEF(KZ_433, 433.075f, 434.775f, 100, 10, false, false, PROFILE_STD),
+ RDEF(KZ_863, 863.0f, 868.0f, 100, 30, false, false, PROFILE_STD),
/*
Nepal
865 MHz to 868 MHz frequency band for IoT (Internet of Things), M2M (Machine-to-Machine), and smart metering use,
specifically in non-cellular mode. https://www.nta.gov.np/uploads/contents/Radio-Frequency-Policy-2080-English.pdf
*/
- RDEF(NP_865, 865.0f, 868.0f, 100, 0, 30, true, false, false),
+ RDEF(NP_865, 865.0f, 868.0f, 100, 30, false, false, PROFILE_STD),
/*
Brazil
902 - 907.5 MHz , 1W power limit, no duty cycle restrictions
https://github.com/meshtastic/firmware/issues/3741
*/
- RDEF(BR_902, 902.0f, 907.5f, 100, 0, 30, true, false, false),
+ RDEF(BR_902, 902.0f, 907.5f, 100, 30, false, false, PROFILE_STD),
/*
2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
*/
- RDEF(LORA_24, 2400.0f, 2483.5f, 100, 0, 10, true, false, true),
+ RDEF(LORA_24, 2400.0f, 2483.5f, 100, 10, false, true, PROFILE_STD),
/*
This needs to be last. Same as US.
*/
- RDEF(UNSET, 902.0f, 928.0f, 100, 0, 30, true, false, false)
+ RDEF(UNSET, 902.0f, 928.0f, 100, 30, false, false, PROFILE_UNDEF)
};
const RegionInfo *myRegion;
bool RadioInterface::uses_default_frequency_slot = true;
+bool RadioInterface::uses_custom_channel_name = false;
static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1];
@@ -501,45 +521,14 @@ void initRegion()
myRegion = r;
}
-void RadioInterface::bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig)
+const RegionInfo *getRegion(meshtastic_Config_LoRaConfig_RegionCode code)
{
- if (!loraConfig.use_preset) {
- return;
- }
-
- // Find region info to determine whether "wide" LoRa is permitted (2.4 GHz uses wider bandwidth codes).
const RegionInfo *r = regions;
- for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != loraConfig.region; r++)
+ for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != code; r++)
;
-
- const bool regionWideLora = r->wideLora;
-
- float bwKHz = 0;
- uint8_t sf = 0;
- uint8_t cr = 0;
- modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
-
- // If selected preset requests a bandwidth larger than the region span, fall back to LONG_FAST.
- if (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && (r->freqEnd - r->freqStart) < (bwKHz / 1000.0f)) {
- loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
- modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
- }
-
- loraConfig.bandwidth = bwKHzToCode(bwKHz);
- loraConfig.spread_factor = sf;
+ return r;
}
-/**
- * ## LoRaWAN for North America
-
-LoRaWAN defines 64, 125 kHz channels from 902.3 to 914.9 MHz increments.
-
-The maximum output power for North America is +30 dBM.
-
-The band is from 902 to 928 MHz. It mentions channel number and its respective channel frequency. All the 13 channels are
-separated by 2.16 MHz with respect to the adjacent channels. Channel zero starts at 903.08 MHz center frequency.
-*/
-
uint32_t RadioInterface::getPacketTime(const meshtastic_MeshPacket *p, bool received)
{
uint32_t pl = 0;
@@ -749,7 +738,7 @@ void RadioInterface::saveFreq(float freq)
}
/**
- * Save our channel for later reuse.
+ * Save our frequency slot (aka channel) for later reuse.
*/
void RadioInterface::saveChannelNum(uint32_t channel_num)
{
@@ -772,113 +761,297 @@ uint32_t RadioInterface::getChannelNum()
return savedChannelNum;
}
+/**
+ * Send an error-level client notification. Safe to call when service is null (e.g. in tests).
+ */
+static void sendErrorNotification(const char *msg)
+{
+ if (!service)
+ return;
+ meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
+ if (!cn)
+ return;
+ cn->level = meshtastic_LogRecord_Level_ERROR;
+ snprintf(cn->message, sizeof(cn->message), "%s", msg);
+ service->sendClientNotification(cn);
+}
+
+/**
+ * Checks if a region is valid for the current settings.
+ * Returns false if not compatible.
+ */
+bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &loraConfig)
+{
+ 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) {
+ char err_string[160];
+ snprintf(err_string, sizeof(err_string), "Region %s requires licensed mode", newRegion->name);
+ LOG_ERROR("%s", err_string);
+ RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+ sendErrorNotification(err_string);
+ return false;
+ }
+
+ return true;
+}
+
+/**
+ * Internal helper: validate or clamp a LoRa config against its region.
+ * When clamp==false, returns false on first error (pure validation).
+ * When clamp==true, fixes invalid settings in-place and returns true.
+ */
+bool RadioInterface::checkOrClampConfigLora(meshtastic_Config_LoRaConfig &loraConfig, bool clamp)
+{
+ char err_string[160];
+ float check_bw;
+
+ const RegionInfo *newRegion = getRegion(loraConfig.region);
+
+ const char *presetName = DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
+
+ // Check preset validity (only when use_preset is true)
+ if (loraConfig.use_preset) {
+ check_bw = modemPresetToBwKHz(loraConfig.modem_preset, newRegion->wideLora);
+
+ bool preset_valid = false;
+ for (size_t i = 0; i < newRegion->getNumPresets(); i++) {
+ if (loraConfig.modem_preset == newRegion->getAvailablePresets()[i]) {
+ preset_valid = true;
+ break;
+ }
+ }
+ if (!preset_valid) {
+ const char *defaultName = DisplayFormatters::getModemPresetDisplayName(newRegion->getDefaultPreset(), false, true);
+ if (clamp) {
+ snprintf(err_string, sizeof(err_string), "Preset %s invalid for %s, using %s", presetName, newRegion->name,
+ defaultName);
+ } else {
+ snprintf(err_string, sizeof(err_string), "Preset %s invalid for %s", presetName, newRegion->name);
+ }
+ LOG_ERROR("%s", err_string);
+ RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+ sendErrorNotification(err_string);
+
+ if (clamp) {
+ loraConfig.modem_preset = newRegion->getDefaultPreset();
+ check_bw = modemPresetToBwKHz(loraConfig.modem_preset, newRegion->wideLora);
+ } else {
+ return false;
+ }
+ }
+ } else {
+ check_bw = bwCodeToKHz(loraConfig.bandwidth);
+ }
+
+ // Calculate width of slots (aka channels) based on bandwidth and any spacing or padding required by the region:
+ // spacing = gap between slots (0 for continuous spectrum) and at the beginning of the band
+ // padding = gap at the beginning and end of the slots (0 for no padding)
+ float freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (check_bw / 1000); // in MHz
+ uint32_t numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
+
+ // Check if the region supports the requested bandwidth
+ if ((newRegion->freqEnd - newRegion->freqStart) < freqSlotWidth) {
+ const float regionSpanKHz = (newRegion->freqEnd - newRegion->freqStart) * 1000.0f;
+ snprintf(err_string, sizeof(err_string), "%s span %.0fkHz < requested %.0fkHz", newRegion->name, regionSpanKHz, check_bw);
+ LOG_ERROR("%s", err_string);
+ RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+ sendErrorNotification(err_string);
+
+ if (clamp) {
+ loraConfig.bandwidth = bwKHzToCode(modemPresetToBwKHz(newRegion->getDefaultPreset(), newRegion->wideLora));
+ check_bw = bwCodeToKHz(loraConfig.bandwidth);
+
+ // Recompute slot width and number of slots based on the new bandwidth
+ freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (check_bw / 1000); // in MHz
+ numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
+ } else {
+ return false;
+ }
+ }
+
+ const char *channelName = channels.getName(channels.getPrimaryIndex());
+ const char *presetNameDisplay =
+ DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
+ uint32_t channelNameHashSlot = hash(channelName) % numFreqSlots;
+ uint32_t presetNameHashSlot = hash(presetNameDisplay) % numFreqSlots;
+
+ if (loraConfig.override_frequency == 0) {
+
+ // Check if we use the default frequency slot
+ uses_default_frequency_slot =
+ (loraConfig.channel_num == 0) || // user choice unset, no frequency override, so use default
+ (newRegion->profile->overrideSlot != 0 &&
+ loraConfig.channel_num == newRegion->profile->overrideSlot) || // user setting matches override
+ ((newRegion->profile->overrideSlot == 0) &&
+ ((uint32_t)(loraConfig.channel_num - 1) == presetNameHashSlot)); // user setting matches preset hash, no override
+
+ // check if user setting different to preset name
+ uses_custom_channel_name = (strcmp(channelName, presetNameDisplay) != 0);
+
+ if (loraConfig.channel_num > numFreqSlots) {
+ snprintf(err_string, sizeof(err_string), "Channel number %u invalid for %s, max is %u", loraConfig.channel_num,
+ newRegion->name, numFreqSlots);
+ LOG_ERROR("%s", err_string);
+ RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
+ sendErrorNotification(err_string);
+
+ if (clamp) {
+ if (uses_custom_channel_name) { // clamp to channel name hash
+ loraConfig.channel_num =
+ channelNameHashSlot + 1; // channel_num is 1-based, but hash slot is 0-based, so add 1
+ } else if ((loraConfig.use_preset) && (newRegion->profile->overrideSlot != 0)) { // clamp to preset override slot
+ loraConfig.channel_num =
+ newRegion->profile->overrideSlot; // use the override slot specified by the region profile
+ uses_default_frequency_slot = true;
+ } else if (loraConfig.use_preset) { // clamp to preset slot
+ loraConfig.channel_num = presetNameHashSlot + 1; // channel_num is 1-based, but hash slot is 0-based, so add 1
+ uses_default_frequency_slot = true;
+ } else { // if not using preset, and no custom channel name, just clamp to default anyway
+ uses_default_frequency_slot = true;
+ };
+ } else {
+ return false;
+ }
+ } // end of channel number check
+ } else {
+ // if we have a frequency override, we ignore the channel number and just use the override frequency
+ snprintf(err_string, sizeof(err_string), "Frequency override in place, using %.3f", loraConfig.override_frequency);
+ }
+ return true;
+}
+
+bool RadioInterface::validateConfigLora(const meshtastic_Config_LoRaConfig &loraConfig)
+{
+ auto copy = loraConfig;
+ return checkOrClampConfigLora(copy, false);
+}
+
+void RadioInterface::clampConfigLora(meshtastic_Config_LoRaConfig &loraConfig)
+{
+ checkOrClampConfigLora(loraConfig, true);
+}
+
/**
* Pull our channel settings etc... from protobufs to the dumb interface settings
+ * Note: this must be given only settings which have been validated or clamped!
*/
void RadioInterface::applyModemConfig()
{
// Set up default configuration
// No Sync Words in LORA mode
meshtastic_Config_LoRaConfig &loraConfig = config.lora;
- bool validConfig = false; // We need to check for a valid configuration
- while (!validConfig) {
- if (loraConfig.use_preset) {
- modemPresetToParams(loraConfig.modem_preset, myRegion->wideLora, bw, sf, cr);
- if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate != cr) {
- cr = loraConfig.coding_rate;
- LOG_INFO("Using custom Coding Rate %u", cr);
- }
- } else {
- sf = loraConfig.spread_factor;
+ const RegionInfo *newRegion = getRegion(loraConfig.region);
+ myRegion = newRegion;
+
+ if (loraConfig.use_preset) {
+ if (!validateConfigLora(loraConfig)) {
+ loraConfig.modem_preset = newRegion->getDefaultPreset();
+ }
+ uint8_t newcr;
+ modemPresetToParams(loraConfig.modem_preset, newRegion->wideLora, bw, sf, newcr);
+ // If custom CR is being used already, check if the new preset is higher
+ if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate < newcr) {
+ cr = newcr;
+ LOG_INFO("Default Coding Rate is higher than custom setting, using %u", cr);
+ }
+ // If the custom CR is higher than the preset, use it
+ else if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate > newcr) {
cr = loraConfig.coding_rate;
- bw = bwCodeToKHz(loraConfig.bandwidth);
- }
-
- if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {
- const float regionSpanKHz = (myRegion->freqEnd - myRegion->freqStart) * 1000.0f;
- const float requestedBwKHz = bw;
- const bool isWideRequest = requestedBwKHz >= 499.5f; // treat as 500 kHz preset
- const char *presetName =
- DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
-
- char err_string[160];
- if (isWideRequest) {
- snprintf(err_string, sizeof(err_string), "%s region too narrow for 500kHz preset (%s). Falling back to LongFast.",
- myRegion->name, presetName);
- } else {
- snprintf(err_string, sizeof(err_string), "%s region span %.0fkHz < requested %.0fkHz. Falling back to LongFast.",
- myRegion->name, regionSpanKHz, requestedBwKHz);
- }
- LOG_ERROR("%s", err_string);
- RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-
- meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
- cn->level = meshtastic_LogRecord_Level_ERROR;
- snprintf(cn->message, sizeof(cn->message), "%s", err_string);
- service->sendClientNotification(cn);
-
- // Set to default modem preset
- loraConfig.use_preset = true;
- loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+ LOG_INFO("Using custom Coding Rate %u", cr);
} else {
- validConfig = true;
+ cr = loraConfig.coding_rate;
}
+
+ } else { // if not using preset, then just use the custom settings
+ if (validateConfigLora(loraConfig)) {
+ } else {
+ LOG_WARN("Invalid LoRa config settings, cannot apply requested modem config - falling back to %s defaults",
+ newRegion->name);
+ clampConfigLora(loraConfig);
+ }
+ bw = bwCodeToKHz(loraConfig.bandwidth);
+ sf = loraConfig.spread_factor;
+ cr = loraConfig.coding_rate;
}
power = loraConfig.tx_power;
- if ((power == 0) || ((power > myRegion->powerLimit) && !devicestate.owner.is_licensed))
- power = myRegion->powerLimit;
+ if ((power == 0) || ((power > newRegion->powerLimit) && !devicestate.owner.is_licensed))
+ power = newRegion->powerLimit;
if (power == 0)
- power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of myRegion defaults
+ power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of newRegion defaults
// to 0, currently no region has an actual power limit of 0 [dBm] so we can assume regions which have this
// variable set to 0 don't have a valid power limit)
// Set final tx_power back onto config
loraConfig.tx_power = (int8_t)power; // cppcheck-suppress assignmentAddressToInteger
- // Calculate the number of channels
- uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));
+ uint32_t channel_num;
+ float freq;
- // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
- const char *channelName = channels.getName(channels.getPrimaryIndex());
- // channel_num is actually (channel_num - 1), since modulus (%) returns values from 0 to (numChannels - 1)
- uint32_t channel_num = (loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName)) % numChannels;
+ // Calculate number of frequency slots (aka Channels):
+ // spacing = gap between channels (0 for continuous spectrum) and at the beginning of the band
+ // padding = gap at the beginning and end of the channel (0 for no padding)
+ float freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (bw / 1000); // in MHz
+ uint32_t numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
- // Check if we use the default frequency slot
- RadioInterface::uses_default_frequency_slot =
- channel_num ==
- hash(DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, config.lora.use_preset)) % numChannels;
-
- // Old frequency selection formula
- // float freq = myRegion->freqStart + ((((myRegion->freqEnd - myRegion->freqStart) / numChannels) / 2) * channel_num);
-
- // New frequency selection formula
- float freq = myRegion->freqStart + (bw / 2000) + (channel_num * (bw / 1000));
+ // Calculate hash of channel name and preset name to pick a default frequency slot if user has not specified one.
+ // Note that channel_num is actually (channel_num - 1), i.e. zero-based, since modulus (%) returns values from 0 to
+ // (numFreqSlots - 1).
+ uint32_t presetNameHashSlot =
+ hash(DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset)) % numFreqSlots;
// override if we have a verbatim frequency
if (loraConfig.override_frequency) {
freq = loraConfig.override_frequency;
channel_num = -1;
+ uses_default_frequency_slot = false;
+ } else {
+
+ // If user has not manually specified a frequency slot, or has not specified one that is different than the default or the
+ // override for the new region, then use the default or override. If the user has not specified one, but has specified a
+ // custom channel name, then use the hash of that channel name to pick a frequency slot. Note that channel_num is actually
+ // (channel_num - 1), i.e. zero-based, since modulus (%) returns values from 0 to (numFreqSlots - 1).
+ // NB: channel_num is also know as frequency slot but it's too late to fix now.
+ if (uses_default_frequency_slot) {
+ // if there's an override slot, use that
+ if (newRegion->profile->overrideSlot != 0) {
+ channel_num = newRegion->profile->overrideSlot - 1;
+ } else {
+ channel_num = presetNameHashSlot;
+ }
+ } else { // use the manually defined one
+ channel_num = loraConfig.channel_num - 1;
+ }
+
+ // Calculate frequency: freqStart is band edge, add half bandwidth (plus optional padding) to get middle of first channel
+ // subsequent channels are spaced by freqSlotWidth
+ freq = newRegion->freqStart + (bw / 2000) + newRegion->profile->padding + (channel_num * freqSlotWidth); // in MHz
}
saveChannelNum(channel_num);
saveFreq(freq + loraConfig.frequency_offset);
+ const char *channelName = channels.getName(channels.getPrimaryIndex());
slotTimeMsec = computeSlotTimeMsec();
preambleTimeMsec = preambleLength * (pow_of_2(sf) / bw);
LOG_INFO("Radio freq=%.3f, config.lora.frequency_offset=%.3f", freq, loraConfig.frequency_offset);
- LOG_INFO("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d", myRegion->name, channelName, loraConfig.modem_preset,
+ LOG_INFO("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d", newRegion->name, channelName, loraConfig.modem_preset,
channel_num, power);
- LOG_INFO("myRegion->freqStart -> myRegion->freqEnd: %f -> %f (%f MHz)", myRegion->freqStart, myRegion->freqEnd,
- myRegion->freqEnd - myRegion->freqStart);
- LOG_INFO("numChannels: %d x %.3fkHz", numChannels, bw);
+ LOG_INFO("newRegion->freqStart -> newRegion->freqEnd: %f -> %f (%f MHz)", newRegion->freqStart, newRegion->freqEnd,
+ newRegion->freqEnd - newRegion->freqStart);
+ LOG_INFO("numFreqSlots: %d x %.3fkHz", numFreqSlots, bw);
+ if (newRegion->profile->overrideSlot != 0) {
+ LOG_INFO("Using region override slot: %d", newRegion->profile->overrideSlot);
+ }
LOG_INFO("channel_num: %d", channel_num + 1);
LOG_INFO("frequency: %f", getFreq());
LOG_INFO("Slot time: %u msec, preamble time: %u msec", slotTimeMsec, preambleTimeMsec);
-}
+} // end of applyModemConfig
/** Slottime is the time to detect a transmission has started, consisting of:
- CAD duration;
@@ -992,4 +1165,4 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)
sendingPacket = p;
return p->encrypted.size + sizeof(PacketHeader);
-}
+}
\ No newline at end of file
diff --git a/src/mesh/RadioInterface.h b/src/mesh/RadioInterface.h
index 8f793f47a..a7176f388 100644
--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -127,7 +127,7 @@ class RadioInterface
* Coerce LoRa config fields (bandwidth/spread_factor) derived from presets.
* This is used during early bootstrapping so UIs that display these fields directly remain consistent.
*/
- static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig);
+ // static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig); // maybe superseded?
/**
* Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
@@ -234,6 +234,20 @@ class RadioInterface
// Whether we use the default frequency slot given our LoRa config (region and modem preset)
static bool uses_default_frequency_slot;
+ // Whether we have a custom channel name
+ static bool uses_custom_channel_name;
+
+ static bool checkOrClampConfigLora(meshtastic_Config_LoRaConfig &loraConfig, bool clamp);
+
+ // Check if a candidate region is compatible and valid.
+ static bool validateConfigRegion(const meshtastic_Config_LoRaConfig &loraConfig);
+
+ // Check if a candidate radio configuration is valid.
+ static bool validateConfigLora(const meshtastic_Config_LoRaConfig &loraConfig);
+
+ // Make a candidate radio configuration valid, even if it isn't.
+ static void clampConfigLora(meshtastic_Config_LoRaConfig &loraConfig);
+
protected:
int8_t power = 17; // Set by applyModemConfig()
diff --git a/src/mesh/SX126xInterface.cpp b/src/mesh/SX126xInterface.cpp
index 4dd90b6e6..a4e82011e 100644
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -60,7 +60,7 @@ template bool SX126xInterface::init()
loraFEMInterface.init();
// Apply saved FEM LNA mode from config
if (loraFEMInterface.isLnaCanControl()) {
- loraFEMInterface.setLNAEnable(config.lora.fem_lna_mode == meshtastic_Config_LoRaConfig_FEM_LNA_Mode_ENABLED);
+ loraFEMInterface.setLNAEnable(config.lora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED);
}
#endif
@@ -253,6 +253,11 @@ template bool SX126xInterface::reconfigure()
LOG_ERROR("SX126X setOutputPower %s%d", radioLibErr, err);
assert(err == RADIOLIB_ERR_NONE);
+ // Apply RX gain mode — valid in STDBY (datasheet §9.6), matches resetAGC() pattern
+ err = lora.setRxBoostedGainMode(config.lora.sx126x_rx_boosted_gain);
+ if (err != RADIOLIB_ERR_NONE)
+ LOG_WARN("SX126X setRxBoostedGainMode %s%d", radioLibErr, err);
+
startReceive(); // restart receiving
return RADIOLIB_ERR_NONE;
diff --git a/src/mesh/api/ServerAPI.cpp b/src/mesh/api/ServerAPI.cpp
index 7bb1a8108..f3e7854ca 100644
--- a/src/mesh/api/ServerAPI.cpp
+++ b/src/mesh/api/ServerAPI.cpp
@@ -1,7 +1,10 @@
#include "ServerAPI.h"
+#include "Throttle.h"
#include "configuration.h"
#include
+static constexpr uint32_t TCP_IDLE_TIMEOUT_MS = 15 * 60 * 1000UL;
+
template
ServerAPI::ServerAPI(T &_client) : StreamAPI(&client), concurrency::OSThread("ServerAPI"), client(_client)
{
@@ -28,6 +31,12 @@ template bool ServerAPI::checkIsConnected()
template int32_t ServerAPI::runOnce()
{
if (client.connected()) {
+ if (lastContactMsec > 0 && !Throttle::isWithinTimespanMs(lastContactMsec, TCP_IDLE_TIMEOUT_MS)) {
+ LOG_WARN("TCP connection timeout, no data for %lu ms", (unsigned long)(millis() - lastContactMsec));
+ close();
+ enabled = false;
+ return 0;
+ }
return StreamAPI::runOncePart();
} else {
LOG_INFO("Client dropped connection, suspend API service");
@@ -57,7 +66,7 @@ template int32_t APIServerPort::runOnce()
#else
auto client = U::available();
#endif
-#elif defined(ARCH_RP2040)
+#elif defined(ARCH_RP2040) || defined(ARCH_NRF52)
auto client = U::accept();
#else
auto client = U::available();
diff --git a/src/mesh/api/ethServerAPI.cpp b/src/mesh/api/ethServerAPI.cpp
index 10ff06df2..43ed74cf8 100644
--- a/src/mesh/api/ethServerAPI.cpp
+++ b/src/mesh/api/ethServerAPI.cpp
@@ -17,6 +17,15 @@ void initApiServer(int port)
}
}
+void deInitApiServer()
+{
+ if (apiPort) {
+ LOG_INFO("Deinit API server");
+ delete apiPort;
+ apiPort = nullptr;
+ }
+}
+
ethServerAPI::ethServerAPI(EthernetClient &_client) : ServerAPI(_client)
{
LOG_INFO("Incoming ethernet connection");
diff --git a/src/mesh/api/ethServerAPI.h b/src/mesh/api/ethServerAPI.h
index c616c87be..8f81ee6ff 100644
--- a/src/mesh/api/ethServerAPI.h
+++ b/src/mesh/api/ethServerAPI.h
@@ -24,4 +24,5 @@ class ethServerPort : public APIServerPort
};
void initApiServer(int port = SERVER_API_DEFAULT_PORT);
+void deInitApiServer();
#endif
diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
index a811ec16c..80741810a 100644
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -32,6 +32,69 @@ static Periodic *ethEvent;
static int32_t reconnectETH()
{
if (config.network.eth_enabled) {
+
+ // Detect W5100S chip reset by verifying the MAC address register.
+ // PoE power instability can brownout the W5100S while the MCU keeps running,
+ // causing all chip registers (MAC, IP, sockets) to revert to defaults.
+ uint8_t currentMac[6];
+ Ethernet.MACAddress(currentMac);
+
+ uint8_t expectedMac[6];
+ getMacAddr(expectedMac);
+ expectedMac[0] &= 0xfe;
+
+ if (memcmp(currentMac, expectedMac, 6) != 0) {
+ LOG_WARN("W5100S MAC mismatch (chip reset detected), reinitializing Ethernet");
+
+ syslog.disable();
+#if !MESHTASTIC_EXCLUDE_SOCKETAPI
+ deInitApiServer();
+#endif
+#if HAS_UDP_MULTICAST
+ if (udpHandler) {
+ udpHandler->stop();
+ }
+#endif
+
+ ethStartupComplete = false;
+#ifndef DISABLE_NTP
+ ntp_renew = 0;
+#endif
+
+#ifdef PIN_ETHERNET_RESET
+ pinMode(PIN_ETHERNET_RESET, OUTPUT);
+ digitalWrite(PIN_ETHERNET_RESET, LOW);
+ delay(100);
+ digitalWrite(PIN_ETHERNET_RESET, HIGH);
+ delay(100);
+#endif
+
+#ifdef RAK11310
+ ETH_SPI_PORT.setSCK(PIN_SPI0_SCK);
+ ETH_SPI_PORT.setTX(PIN_SPI0_MOSI);
+ ETH_SPI_PORT.setRX(PIN_SPI0_MISO);
+ ETH_SPI_PORT.begin();
+#endif
+ Ethernet.init(ETH_SPI_PORT, PIN_ETHERNET_SS);
+
+ int status = 0;
+ if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_DHCP) {
+ status = Ethernet.begin(expectedMac);
+ } else if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC) {
+ Ethernet.begin(expectedMac, config.network.ipv4_config.ip, config.network.ipv4_config.dns,
+ config.network.ipv4_config.gateway, config.network.ipv4_config.subnet);
+ status = 1;
+ }
+
+ if (status == 0) {
+ LOG_ERROR("Ethernet re-initialization failed, will retry");
+ return 5000;
+ }
+
+ LOG_INFO("Ethernet reinitialized - IP %u.%u.%u.%u", Ethernet.localIP()[0], Ethernet.localIP()[1],
+ Ethernet.localIP()[2], Ethernet.localIP()[3]);
+ }
+
Ethernet.maintain();
if (!ethStartupComplete) {
// Start web server
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 4c68b2005..477c3b31b 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -306,6 +306,8 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_MINI_EPAPER_S3 = 125,
/* LilyGo T-Display S3 Pro LR1121 */
meshtastic_HardwareModel_TDISPLAY_S3_PRO = 126,
+ /* Heltec Mesh Node T096 board features an nRF52840 CPU and a TFT screen. */
+ meshtastic_HardwareModel_HELTEC_MESH_NODE_T096 = 127,
/* ------------------------------------------------------------------------------------------------------------------------------------------
Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
------------------------------------------------------------------------------------------------------------------------------------------ */
diff --git a/src/mesh/udp/UdpMulticastHandler.h b/src/mesh/udp/UdpMulticastHandler.h
index a5b0ef360..493cc5353 100644
--- a/src/mesh/udp/UdpMulticastHandler.h
+++ b/src/mesh/udp/UdpMulticastHandler.h
@@ -69,7 +69,7 @@ class UdpMulticastHandler final
// FIXME(PORTDUINO): arduino lacks IPAddress::toString()
LOG_DEBUG("UDP broadcast from: %s, len=%u", packet.remoteIP().toString().c_str(), packetLength);
#endif
- meshtastic_MeshPacket mp;
+ meshtastic_MeshPacket mp = meshtastic_MeshPacket_init_zero;
LOG_DEBUG("Decoding MeshPacket from UDP len=%u", packetLength);
bool isPacketDecoded = pb_decode_from_bytes(packet.data(), packetLength, &meshtastic_MeshPacket_msg, &mp);
if (isPacketDecoded && router && mp.which_payload_variant == meshtastic_MeshPacket_encrypted_tag) {
@@ -79,9 +79,6 @@ class UdpMulticastHandler final
return;
}
mp.transport_mechanism = meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MULTICAST_UDP;
- mp.pki_encrypted = false;
- mp.public_key.size = 0;
- memset(mp.public_key.bytes, 0, sizeof(mp.public_key.bytes));
UniquePacketPoolPacket p = packetPool.allocUniqueCopy(mp);
// Unset received SNR/RSSI
p->rx_snr = 0;
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 6ffde70db..e3a501097 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -24,7 +24,9 @@
#include "Default.h"
#include "MeshRadio.h"
+#include "RadioInterface.h"
#include "TypeConversions.h"
+#include "mesh/RadioLibInterface.h"
#if !MESHTASTIC_EXCLUDE_MQTT
#include "mqtt/MQTT.h"
@@ -197,10 +199,35 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
handleSetOwner(r->set_owner);
break;
- case meshtastic_AdminMessage_set_config_tag:
+ case meshtastic_AdminMessage_set_config_tag: {
LOG_DEBUG("Client set config");
- handleSetConfig(r->set_config);
+
+ // Non-LoRa configs need no further validation.
+ if (r->set_config.which_payload_variant != meshtastic_Config_lora_tag) {
+ LOG_DEBUG("Non-LoRa config, applying directly");
+ handleSetConfig(r->set_config, fromOthers);
+ break;
+ }
+
+ // Only LORA_24 requires hardware capability validation.
+ if (r->set_config.payload_variant.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24) {
+ LOG_DEBUG("LoRa config, region is not LORA_24, applying directly");
+ handleSetConfig(r->set_config, fromOthers);
+ break;
+ }
+
+ // Hardware supports 2.4 GHz — apply the config.
+ // Fail closed: null instance is treated as incapable.
+ if (RadioLibInterface::instance && RadioLibInterface::instance->wideLora()) {
+ LOG_DEBUG("LORA_24 requested, radio hardware supports 2.4 GHz, applying");
+ handleSetConfig(r->set_config, fromOthers);
+ break;
+ }
+
+ LOG_WARN("Radio hardware does not support 2.4 GHz; rejecting LORA_24 region");
+ myReply = allocErrorResponse(meshtastic_Routing_Error_BAD_REQUEST, &mp);
break;
+ }
case meshtastic_AdminMessage_set_module_config_tag:
LOG_DEBUG("Client set module config");
@@ -626,7 +653,7 @@ void AdminModule::handleSetOwner(const meshtastic_User &o)
}
}
-void AdminModule::handleSetConfig(const meshtastic_Config &c)
+void AdminModule::handleSetConfig(const meshtastic_Config &c, bool fromOthers)
{
auto changes = SEGMENT_CONFIG;
auto existingRole = config.device.role;
@@ -768,18 +795,57 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
validatedLora.spread_factor = LORA_SF_DEFAULT;
}
- // If no lora radio parameters change, don't need to reboot
- if (oldLoraConfig.use_preset == validatedLora.use_preset && oldLoraConfig.region == validatedLora.region &&
- oldLoraConfig.modem_preset == validatedLora.modem_preset && oldLoraConfig.bandwidth == validatedLora.bandwidth &&
- oldLoraConfig.spread_factor == validatedLora.spread_factor &&
- oldLoraConfig.coding_rate == validatedLora.coding_rate && oldLoraConfig.tx_power == validatedLora.tx_power &&
- oldLoraConfig.frequency_offset == validatedLora.frequency_offset &&
- oldLoraConfig.override_frequency == validatedLora.override_frequency &&
- oldLoraConfig.channel_num == validatedLora.channel_num &&
- oldLoraConfig.sx126x_rx_boosted_gain == validatedLora.sx126x_rx_boosted_gain) {
- requiresReboot = false;
+ // If we're setting a new region, check the region is valid and then init the region or discard the change
+ if (validatedLora.region != myRegion->code) {
+ // Region has changed so check whether it is valid for e.g. licensing conditions and if the lora config is valid
+ if (RadioInterface::validateConfigRegion(validatedLora) && RadioInterface::validateConfigLora(validatedLora)) {
+ // If we're setting region for the first time, init the region and regenerate the keys
+ if (isRegionUnset && validatedLora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
+ if (crypto) {
+ crypto->ensurePkiKeys(config.security, owner);
+ }
+#endif
+ // new region is valid and we're coming from an unset region, so enable tx
+ validatedLora.tx_enabled = true;
+ }
+ // If we're unsetting the region for some reason, disable tx
+ if (!isRegionUnset && validatedLora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+ validatedLora.tx_enabled = false;
+ }
+ // Ensure initRegion() uses the newly validated region
+ config.lora.region = validatedLora.region;
+ initRegion();
+ if (myRegion->dutyCycle < 100) {
+ validatedLora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
+ }
+ if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
+ // Default root is in use, so subscribe to the appropriate MQTT topic for this region
+ sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
+ }
+ changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
+ } else {
+ // Region validation has failed, so just copy all of the old config over the new config
+ validatedLora = oldLoraConfig;
+ }
+ } // end of new region handling
+
+ if (!RadioInterface::validateConfigLora(validatedLora)) {
+ if (fromOthers) {
+ LOG_WARN("Invalid LoRa config received from another node, rejecting changes");
+ // modem_preset set to use the old setting if the check fails
+ validatedLora.modem_preset = oldLoraConfig.modem_preset;
+ } else {
+ LOG_WARN("Invalid LoRa config received from client, using corrected values");
+ RadioInterface::clampConfigLora(validatedLora);
+ }
+ // use_preset and bandwidth are coerced into valid values by the check.
}
+ // All LoRa radio changes apply live via configChanged observer → reconfigure().
+ // reconfigure() puts the radio in standby, reprograms all modem parameters, and restarts receive.
+ requiresReboot = false;
+
#if defined(ARCH_PORTDUINO)
// If running on portduino and using SimRadio, do not require reboot
if (SimRadio::instance) {
@@ -795,63 +861,21 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
digitalWrite(RF95_FAN_EN, HIGH ^ 0);
}
#endif
- config.lora = validatedLora;
#if HAS_LORA_FEM
// Apply FEM LNA mode from config (only meaningful on hardware that supports it)
+ // Note that a rejected lora config will revert this as well.
if (loraFEMInterface.isLnaCanControl()) {
- loraFEMInterface.setLNAEnable(config.lora.fem_lna_mode == meshtastic_Config_LoRaConfig_FEM_LNA_Mode_ENABLED);
- } else if (config.lora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT) {
+ loraFEMInterface.setLNAEnable(validatedLora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED);
+ } else if (validatedLora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT) {
// Hardware FEM does not support LNA control; normalize stored config to match actual capability
LOG_WARN("FEM LNA mode configured but current FEM does not support LNA control; normalizing to NOT_PRESENT");
- config.lora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT;
+ validatedLora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT;
}
#endif
- // If we're setting region for the first time, init the region and regenerate the keys
- if (isRegionUnset && config.lora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
- if (!owner.is_licensed) {
- bool keygenSuccess = false;
- if (config.security.private_key.size == 32) {
- if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
- keygenSuccess = true;
- }
- } else {
- LOG_INFO("Generate new PKI keys");
- crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
- keygenSuccess = true;
- }
- if (keygenSuccess) {
- config.security.public_key.size = 32;
- config.security.private_key.size = 32;
- owner.public_key.size = 32;
- memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
- }
- }
-#endif
- config.lora.tx_enabled = true;
- initRegion();
- if (myRegion->dutyCycle < 100) {
- config.lora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
- }
- // Compare the entire string, we are sure of the length as a topic has never been set
- if (strcmp(moduleConfig.mqtt.root, default_mqtt_root) == 0) {
- sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
- changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
- }
- }
- if (config.lora.region != myRegion->code) {
- // Region has changed so check whether there is a regulatory one we should be using instead.
- // Additionally as a side-effect, assume a new value under myRegion
- initRegion();
- if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
- // Default root is in use, so subscribe to the appropriate MQTT topic for this region
- sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
- }
+ config.lora = validatedLora; // Finally, return the validated config back to the main config
- changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
- }
break;
}
case meshtastic_Config_bluetooth_tag:
@@ -899,10 +923,10 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
}
if (requiresReboot && !hasOpenEditTransaction) {
disableBluetooth();
- }
+ } // end of switch case which_payload_variant
saveChanges(changes, requiresReboot);
-}
+} // end of handleSetConfig
bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
{
@@ -1127,83 +1151,85 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;
if (req.decoded.want_response) {
+ const char *configName = "?";
switch (configType) {
case meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG:
- LOG_INFO("Get module config: MQTT");
+ configName = "MQTT";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_mqtt_tag;
res.get_module_config_response.payload_variant.mqtt = moduleConfig.mqtt;
break;
case meshtastic_AdminMessage_ModuleConfigType_SERIAL_CONFIG:
- LOG_INFO("Get module config: Serial");
+ configName = "Serial";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_serial_tag;
res.get_module_config_response.payload_variant.serial = moduleConfig.serial;
break;
case meshtastic_AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG:
- LOG_INFO("Get module config: External Notification");
+ configName = "External Notification";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_external_notification_tag;
res.get_module_config_response.payload_variant.external_notification = moduleConfig.external_notification;
break;
case meshtastic_AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG:
- LOG_INFO("Get module config: Store & Forward");
+ configName = "Store & Forward";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_store_forward_tag;
res.get_module_config_response.payload_variant.store_forward = moduleConfig.store_forward;
break;
case meshtastic_AdminMessage_ModuleConfigType_RANGETEST_CONFIG:
- LOG_INFO("Get module config: Range Test");
+ configName = "Range Test";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_range_test_tag;
res.get_module_config_response.payload_variant.range_test = moduleConfig.range_test;
break;
case meshtastic_AdminMessage_ModuleConfigType_TELEMETRY_CONFIG:
- LOG_INFO("Get module config: Telemetry");
+ configName = "Telemetry";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_telemetry_tag;
res.get_module_config_response.payload_variant.telemetry = moduleConfig.telemetry;
break;
case meshtastic_AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG:
- LOG_INFO("Get module config: Canned Message");
+ configName = "Canned Message";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_canned_message_tag;
res.get_module_config_response.payload_variant.canned_message = moduleConfig.canned_message;
break;
case meshtastic_AdminMessage_ModuleConfigType_AUDIO_CONFIG:
- LOG_INFO("Get module config: Audio");
+ configName = "Audio";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_audio_tag;
res.get_module_config_response.payload_variant.audio = moduleConfig.audio;
break;
case meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG:
- LOG_INFO("Get module config: Remote Hardware");
+ configName = "Remote Hardware";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_remote_hardware_tag;
res.get_module_config_response.payload_variant.remote_hardware = moduleConfig.remote_hardware;
break;
case meshtastic_AdminMessage_ModuleConfigType_NEIGHBORINFO_CONFIG:
- LOG_INFO("Get module config: Neighbor Info");
+ configName = "Neighbor Info";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_neighbor_info_tag;
res.get_module_config_response.payload_variant.neighbor_info = moduleConfig.neighbor_info;
break;
case meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG:
- LOG_INFO("Get module config: Detection Sensor");
+ configName = "Detection Sensor";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_detection_sensor_tag;
res.get_module_config_response.payload_variant.detection_sensor = moduleConfig.detection_sensor;
break;
case meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG:
- LOG_INFO("Get module config: Ambient Lighting");
+ configName = "Ambient Lighting";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_ambient_lighting_tag;
res.get_module_config_response.payload_variant.ambient_lighting = moduleConfig.ambient_lighting;
break;
case meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG:
- LOG_INFO("Get module config: Paxcounter");
+ configName = "Paxcounter";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_paxcounter_tag;
res.get_module_config_response.payload_variant.paxcounter = moduleConfig.paxcounter;
break;
case meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG:
- LOG_INFO("Get module config: StatusMessage");
+ configName = "StatusMessage";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_statusmessage_tag;
res.get_module_config_response.payload_variant.statusmessage = moduleConfig.statusmessage;
break;
case meshtastic_AdminMessage_ModuleConfigType_TRAFFICMANAGEMENT_CONFIG:
- LOG_INFO("Get module config: Traffic Management");
+ configName = "Traffic Management";
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_traffic_management_tag;
res.get_module_config_response.payload_variant.traffic_management = moduleConfig.traffic_management;
break;
}
+ LOG_INFO("Get module config: %s", configName);
// NOTE: The phone app needs to know the ls_secsvalue so it can properly expect sleep behavior.
// So even if we internally use 0 to represent 'use default' we still need to send the value we are
@@ -1386,23 +1412,17 @@ void AdminModule::handleStoreDeviceUIConfig(const meshtastic_DeviceUIConfig &uic
void AdminModule::handleSetHamMode(const meshtastic_HamParameters &p)
{
// Validate ham parameters before setting since this would bypass validation in the owner struct
- if (*p.call_sign) {
- const char *start = p.call_sign;
- // Skip all whitespace
- while (*start && isspace((unsigned char)*start))
- start++;
- if (*start == '\0') {
- LOG_WARN("Rejected ham call_sign: must contain at least 1 non-whitespace character");
- return;
- }
- }
- if (*p.short_name) {
- const char *start = p.short_name;
- while (*start && isspace((unsigned char)*start))
- start++;
- if (*start == '\0') {
- LOG_WARN("Rejected ham short_name: must contain at least 1 non-whitespace character");
- return;
+ const char *fieldsToCheck[] = {p.call_sign, p.short_name};
+ const char *fieldNames[] = {"call_sign", "short_name"};
+ for (int i = 0; i < 2; i++) {
+ if (*fieldsToCheck[i]) {
+ const char *start = fieldsToCheck[i];
+ while (*start && isspace((unsigned char)*start))
+ start++;
+ if (*start == '\0') {
+ LOG_WARN("Rejected ham %s: must contain at least 1 non-whitespace character", fieldNames[i]);
+ return;
+ }
}
}
diff --git a/src/modules/AdminModule.h b/src/modules/AdminModule.h
index c446887b3..5c690abbd 100644
--- a/src/modules/AdminModule.h
+++ b/src/modules/AdminModule.h
@@ -60,7 +60,11 @@ class AdminModule : public ProtobufModule, public Obser
*/
void handleSetOwner(const meshtastic_User &o);
void handleSetChannel(const meshtastic_Channel &cc);
- void handleSetConfig(const meshtastic_Config &c);
+
+ protected:
+ void handleSetConfig(const meshtastic_Config &c, bool fromOthers);
+
+ private:
bool handleSetModuleConfig(const meshtastic_ModuleConfig &c);
void handleSetChannel();
void handleSetHamMode(const meshtastic_HamParameters &req);
diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
index 79bda557c..f41fafdee 100644
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -30,7 +30,8 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
auto p = *pptr;
- if (mp.decoded.want_response) {
+ // Suppress replies to senders we've replied to recently (12H window)
+ if (mp.decoded.want_response && !isFromUs(&mp)) {
const NodeNum sender = getFrom(&mp);
const uint32_t now = mp.rx_time ? mp.rx_time : getTime();
auto it = lastNodeInfoSeen.find(sender);
@@ -119,7 +120,13 @@ void NodeInfoModule::sendOurNodeInfo(NodeNum dest, bool wantReplies, uint8_t cha
meshtastic_MeshPacket *NodeInfoModule::allocReply()
{
- if (suppressReplyForCurrentRequest) {
+ // Only apply suppression when actually replying to someone else's request, not for periodic broadcasts.
+ const bool isReplyingToExternalRequest = currentRequest &&
+ currentRequest->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
+ currentRequest->decoded.portnum == meshtastic_PortNum_NODEINFO_APP &&
+ currentRequest->decoded.want_response && !isFromUs(currentRequest);
+
+ if (suppressReplyForCurrentRequest && isReplyingToExternalRequest) {
LOG_DEBUG("Skip send NodeInfo since we heard the requester <12h ago");
ignoreRequest = true;
suppressReplyForCurrentRequest = false;
diff --git a/src/modules/RoutingModule.cpp b/src/modules/RoutingModule.cpp
index d87cf3a44..85e7f8c06 100644
--- a/src/modules/RoutingModule.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -20,10 +20,11 @@ bool RoutingModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mesh
if ((nodeDB->getMeshNode(mp.from) == NULL || !nodeDB->getMeshNode(mp.from)->has_user) &&
(nodeDB->getMeshNode(mp.to) == NULL || !nodeDB->getMeshNode(mp.to)->has_user))
return false;
- } else if (owner.is_licensed && nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) {
- // Don't let licensed users to rebroadcast packets from unlicensed users
+ } else if (owner.is_licensed && ((nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) ||
+ (nodeDB->getLicenseStatus(mp.to) == UserLicenseStatus::NotLicensed))) {
+ // Don't let licensed users to rebroadcast packets to or from unlicensed users
// If we know they are in-fact unlicensed
- LOG_DEBUG("Packet from unlicensed user, ignoring packet");
+ LOG_DEBUG("Packet to or from unlicensed user, ignoring packet");
return false;
}
diff --git a/src/modules/esp32/AudioModule.cpp b/src/modules/esp32/AudioModule.cpp
index 77cc94359..37e3e9184 100644
--- a/src/modules/esp32/AudioModule.cpp
+++ b/src/modules/esp32/AudioModule.cpp
@@ -100,7 +100,7 @@ AudioModule::AudioModule() : SinglePortModule("Audio", meshtastic_PortNum_AUDIO_
// moduleConfig.audio.i2s_sck = 14;
// moduleConfig.audio.ptt_pin = 39;
- if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
+ if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
LOG_INFO("Set up codec2 in mode %u", (moduleConfig.audio.bitrate ? moduleConfig.audio.bitrate : AUDIO_MODULE_MODE) - 1);
codec2 = codec2_create((moduleConfig.audio.bitrate ? moduleConfig.audio.bitrate : AUDIO_MODULE_MODE) - 1);
memcpy(tx_header.magic, c2_magic, sizeof(c2_magic));
@@ -143,7 +143,7 @@ void AudioModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int
int32_t AudioModule::runOnce()
{
- if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
+ if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
esp_err_t res;
if (firstTime) {
// Set up I2S Processor configuration. This will produce 16bit samples at 8 kHz instead of 12 from the ADC
@@ -270,7 +270,7 @@ void AudioModule::sendPayload(NodeNum dest, bool wantReplies)
ProcessMessage AudioModule::handleReceived(const meshtastic_MeshPacket &mp)
{
- if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
+ if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
auto &p = mp.decoded;
if (!isFromUs(&mp)) {
memcpy(rx_encode_frame, p.payload.bytes, p.payload.size);
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index c8183cfde..ac022a1ab 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -651,22 +651,34 @@ bool MQTT::isValidConfig(const meshtastic_ModuleConfig_MQTTConfig &config, MQTTC
if (config.enabled && !config.proxy_to_client_enabled) {
#if HAS_NETWORKING
- std::unique_ptr clientConnection;
if (config.tls_enabled) {
-#if MQTT_SUPPORTS_TLS
- MQTTClientTLS *tlsClient = new MQTTClientTLS;
- clientConnection.reset(tlsClient);
- tlsClient->setInsecure();
-#else
+#if !MQTT_SUPPORTS_TLS
LOG_ERROR("Invalid MQTT config: tls_enabled is not supported on this node");
return false;
#endif
- } else {
- clientConnection.reset(new MQTTClient);
}
- std::unique_ptr pubSub(new PubSubClient);
+ // Perform a lightweight TCP connectivity check without using connectPubSub(),
+ // which mutates the module's isConnected state. This only checks if the server
+ // is reachable — it does not establish an MQTT session.
+ // Settings are always saved regardless of the result.
if (isConnectedToNetwork()) {
- return connectPubSub(parsed, *pubSub, (client != nullptr) ? *client : *clientConnection);
+ MQTTClient testClient;
+ if (!testClient.connect(parsed.serverAddr.c_str(), parsed.serverPort)) {
+ const char *warning = "Could not reach the MQTT server. Settings will be saved, but please verify the server "
+ "address and credentials.";
+ LOG_WARN(warning);
+#if !IS_RUNNING_TESTS
+ meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
+ if (cn) {
+ cn->level = meshtastic_LogRecord_Level_WARNING;
+ cn->time = getValidTime(RTCQualityFromNet);
+ strncpy(cn->message, warning, sizeof(cn->message) - 1);
+ cn->message[sizeof(cn->message) - 1] = '\0';
+ service->sendClientNotification(cn);
+ }
+#endif
+ }
+ testClient.stop();
}
#else
const char *warning = "Invalid MQTT config: proxy_to_client_enabled must be enabled on nodes that do not have a network";
diff --git a/test/test_admin_radio/test_main.cpp b/test/test_admin_radio/test_main.cpp
new file mode 100644
index 000000000..9906bb94c
--- /dev/null
+++ b/test/test_admin_radio/test_main.cpp
@@ -0,0 +1,814 @@
+/**
+ * Tests for the radio configuration validation and clamping functions
+ * introduced in the radio_interface_cherrypick branch.
+ *
+ * Targets:
+ * 1. getRegion()
+ * 2. RadioInterface::validateConfigRegion()
+ * 3. RadioInterface::validateConfigLora()
+ * 4. RadioInterface::clampConfigLora()
+ * 5. RegionInfo preset lists (PRESETS_STD, PRESETS_EU_868, PRESETS_UNDEF)
+ * 6. Channel spacing calculation (placeholder for future protobuf changes)
+ */
+
+#include "MeshRadio.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "RadioInterface.h"
+#include "TestUtil.h"
+#include "modules/AdminModule.h"
+#include
+
+#include "meshtastic/config.pb.h"
+
+class MockMeshService : public MeshService
+{
+ public:
+ void sendClientNotification(meshtastic_ClientNotification *n) override { releaseClientNotificationToPool(n); }
+};
+
+static MockMeshService *mockMeshService;
+
+// -----------------------------------------------------------------------
+// getRegion() tests
+// -----------------------------------------------------------------------
+extern const RegionInfo *getRegion(meshtastic_Config_LoRaConfig_RegionCode code);
+
+static void test_getRegion_returnsCorrectRegion_US()
+{
+ const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ TEST_ASSERT_NOT_NULL(r);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_US, r->code);
+ TEST_ASSERT_EQUAL_STRING("US", r->name);
+}
+
+static void test_getRegion_returnsCorrectRegion_EU868()
+{
+ const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_NOT_NULL(r);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_EU_868, r->code);
+ TEST_ASSERT_EQUAL_STRING("EU_868", r->name);
+}
+
+static void test_getRegion_returnsCorrectRegion_LORA24()
+{
+ const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
+ TEST_ASSERT_NOT_NULL(r);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_LORA_24, r->code);
+ TEST_ASSERT_TRUE(r->wideLora);
+}
+
+static void test_getRegion_unsetCodeReturnsUnsetEntry()
+{
+ const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_UNSET);
+ TEST_ASSERT_NOT_NULL(r);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
+ TEST_ASSERT_EQUAL_STRING("UNSET", r->name);
+}
+
+static void test_getRegion_unknownCodeFallsToUnset()
+{
+ // A code not in the table should iterate to the UNSET sentinel
+ const RegionInfo *r = getRegion((meshtastic_Config_LoRaConfig_RegionCode)255);
+ TEST_ASSERT_NOT_NULL(r);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
+}
+
+// -----------------------------------------------------------------------
+// validateConfigRegion() tests
+// -----------------------------------------------------------------------
+
+static void test_validateConfigRegion_validRegionReturnsTrue()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+
+ // Ensure owner is not licensed (should not matter for non-licensed-only regions)
+ devicestate.owner.is_licensed = false;
+
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigRegion(cfg));
+}
+
+static void test_validateConfigRegion_unsetRegionReturnsTrue()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+
+ devicestate.owner.is_licensed = false;
+
+ // UNSET region has licensedOnly=false, so should pass
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigRegion(cfg));
+}
+
+// -----------------------------------------------------------------------
+// Shadow tables for testing (preset lists → profiles → regions → lookup)
+// -----------------------------------------------------------------------
+
+// A minimal preset list with only one entry
+static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_SINGLE[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,
+ MODEM_PRESET_END,
+};
+
+// A preset list that includes all turbo variants only
+static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_TURBO_ONLY[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
+ MODEM_PRESET_END,
+};
+
+// A restricted list simulating a hypothetical tight-regulation region
+static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_RESTRICTED[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE,
+ MODEM_PRESET_END,
+};
+
+// Mirrors PROFILE_STD but with non-zero spacing/padding for testing
+static const RegionProfile TEST_PROFILE_SPACED = {
+ TEST_PRESETS_SINGLE,
+ /* spacing */ 0.025f,
+ /* padding */ 0.010f,
+ /* audioPermitted */ true,
+ /* licensedOnly */ false,
+ /* textThrottle */ 0,
+ /* positionThrottle */ 0,
+ /* telemetryThrottle */ 0,
+ /* overrideSlot */ 0,
+};
+
+// A licensed-only profile for testing access control
+static const RegionProfile TEST_PROFILE_LICENSED = {
+ TEST_PRESETS_RESTRICTED,
+ /* spacing */ 0.0f,
+ /* padding */ 0.0f,
+ /* audioPermitted */ false,
+ /* licensedOnly */ true,
+ /* textThrottle */ 5,
+ /* positionThrottle */ 10,
+ /* telemetryThrottle */ 10,
+ /* overrideSlot */ 3,
+};
+
+// Turbo-only profile
+static const RegionProfile TEST_PROFILE_TURBO = {
+ TEST_PRESETS_TURBO_ONLY,
+ /* spacing */ 0.0f,
+ /* padding */ 0.0f,
+ /* audioPermitted */ true,
+ /* licensedOnly */ false,
+ /* textThrottle */ 0,
+ /* positionThrottle */ 0,
+ /* telemetryThrottle */ 0,
+ /* overrideSlot */ 0,
+};
+
+static const RegionInfo testRegions[] = {
+ // A wide US-like region with spacing + padding
+ {meshtastic_Config_LoRaConfig_RegionCode_US, 902.0f, 928.0f, 100, 30, false, false, &TEST_PROFILE_SPACED, "TEST_US_SPACED"},
+
+ // A narrow band simulating tight EU regulation
+ {meshtastic_Config_LoRaConfig_RegionCode_EU_868, 869.4f, 869.65f, 10, 14, false, false, &TEST_PROFILE_LICENSED,
+ "TEST_EU_LICENSED"},
+
+ // A wide-LoRa region with turbo-only presets
+ {meshtastic_Config_LoRaConfig_RegionCode_LORA_24, 2400.0f, 2483.5f, 100, 10, false, true, &TEST_PROFILE_TURBO,
+ "TEST_LORA24_TURBO"},
+
+ // Sentinel — must be last
+ {meshtastic_Config_LoRaConfig_RegionCode_UNSET, 902.0f, 928.0f, 100, 30, false, false, &TEST_PROFILE_SPACED, "TEST_UNSET"},
+};
+
+static const RegionInfo *getTestRegion(meshtastic_Config_LoRaConfig_RegionCode code)
+{
+ const RegionInfo *r = testRegions;
+ while (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+ if (r->code == code)
+ return r;
+ r++;
+ }
+ return r; // Returns the UNSET sentinel
+}
+
+// -----------------------------------------------------------------------
+// Shadow table tests
+// -----------------------------------------------------------------------
+
+static void test_shadowTable_spacedProfileHasNonZeroSpacing()
+{
+ const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ TEST_ASSERT_EQUAL_STRING("TEST_US_SPACED", r->name);
+ TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.025f, r->profile->spacing);
+ TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.010f, r->profile->padding);
+}
+
+static void test_shadowTable_licensedProfileFlagsCorrect()
+{
+ const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_TRUE(r->profile->licensedOnly);
+ TEST_ASSERT_FALSE(r->profile->audioPermitted);
+ TEST_ASSERT_EQUAL(3, r->profile->overrideSlot);
+}
+
+static void test_shadowTable_presetCountMatchesExpected()
+{
+ const RegionInfo *spaced = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ TEST_ASSERT_EQUAL(1, spaced->getNumPresets());
+
+ const RegionInfo *licensed = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_EQUAL(2, licensed->getNumPresets());
+
+ const RegionInfo *turbo = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
+ TEST_ASSERT_EQUAL(2, turbo->getNumPresets());
+}
+
+static void test_shadowTable_defaultPresetIsFirstInList()
+{
+ const RegionInfo *spaced = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, spaced->getDefaultPreset());
+
+ const RegionInfo *licensed = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW, licensed->getDefaultPreset());
+
+ const RegionInfo *turbo = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO, turbo->getDefaultPreset());
+}
+
+static void test_shadowTable_channelSpacingWithPadding()
+{
+ // Verify channel count when spacing + padding are non-zero
+ const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ float bw = modemPresetToBwKHz(r->getDefaultPreset(), r->wideLora);
+ float channelSpacing = r->profile->spacing + (r->profile->padding * 2) + (bw / 1000.0f);
+
+ // spacing=0.025, padding=0.010*2=0.020, bw=250kHz=0.250
+ // channelSpacing = 0.025 + 0.020 + 0.250 = 0.295 MHz
+ TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.295f, channelSpacing);
+
+ uint32_t numChannels = (uint32_t)(((r->freqEnd - r->freqStart + r->profile->spacing) / channelSpacing) + 0.5f);
+ // (928 - 902 + 0.025) / 0.295 = 88.2 → 88
+ TEST_ASSERT_EQUAL_UINT32(88, numChannels);
+}
+
+static void test_shadowTable_turboOnlyOnWideLora()
+{
+ const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
+ TEST_ASSERT_TRUE(r->wideLora);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO, r->getDefaultPreset());
+
+ // Verify wide-LoRa bandwidth for SHORT_TURBO
+ float bw = modemPresetToBwKHz(r->getDefaultPreset(), r->wideLora);
+ TEST_ASSERT_FLOAT_WITHIN(0.1f, 1625.0f, bw); // 1625 kHz in wide mode
+}
+
+static void test_shadowTable_unknownCodeFallsToSentinel()
+{
+ const RegionInfo *r = getTestRegion((meshtastic_Config_LoRaConfig_RegionCode)200);
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
+ TEST_ASSERT_EQUAL_STRING("TEST_UNSET", r->name);
+}
+
+// -----------------------------------------------------------------------
+// validateConfigLora() tests
+// -----------------------------------------------------------------------
+
+static void test_validateConfigLora_validPresetForUS()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = true;
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
+}
+
+static void test_validateConfigLora_allStdPresetsValidForUS()
+{
+ meshtastic_Config_LoRaConfig_ModemPreset stdPresets[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
+ };
+
+ for (size_t i = 0; i < sizeof(stdPresets) / sizeof(stdPresets[0]); i++) {
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = true;
+ cfg.modem_preset = stdPresets[i];
+ TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for US");
+ }
+}
+
+static void test_validateConfigLora_turboPresetsInvalidForEU868()
+{
+ // EU_868 has PRESETS_EU_868 which excludes SHORT_TURBO and LONG_TURBO
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = true;
+
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
+ TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "SHORT_TURBO should be invalid for EU_868");
+
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO;
+ TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "LONG_TURBO should be invalid for EU_868");
+}
+
+static void test_validateConfigLora_validPresetsForEU868()
+{
+ meshtastic_Config_LoRaConfig_ModemPreset eu868Presets[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE,
+ };
+
+ for (size_t i = 0; i < sizeof(eu868Presets) / sizeof(eu868Presets[0]); i++) {
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = true;
+ cfg.modem_preset = eu868Presets[i];
+ TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for EU_868");
+ }
+}
+
+static void test_validateConfigLora_customBandwidthTooWideForEU868()
+{
+ // EU_868 spans 869.4 - 869.65 = 0.25 MHz = 250 kHz
+ // A 500 kHz custom BW should be rejected
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = false;
+ cfg.bandwidth = 500;
+ cfg.spread_factor = 11;
+ cfg.coding_rate = 5;
+
+ TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
+}
+
+static void test_validateConfigLora_customBandwidthFitsUS()
+{
+ // US spans 902 - 928 = 26 MHz, so 250 kHz BW fits easily
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = false;
+ cfg.bandwidth = 250;
+ cfg.spread_factor = 11;
+ cfg.coding_rate = 5;
+
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
+}
+
+static void test_validateConfigLora_customBandwidthFitsEU868()
+{
+ // EU_868 spans 250 kHz, 125 kHz BW should fit
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = false;
+ cfg.bandwidth = 125;
+ cfg.spread_factor = 12;
+ cfg.coding_rate = 8;
+
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
+}
+
+static void test_validateConfigLora_bogusPresetRejected()
+{
+ // A fabricated preset value not in any list should be rejected
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = true;
+ cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
+
+ TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
+}
+
+static void test_validateConfigLora_unsetRegionOnlyAcceptsLongFast()
+{
+ // UNSET uses PROFILE_UNDEF which has only LONG_FAST
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+ cfg.use_preset = true;
+
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+ TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "LONG_FAST should be valid for UNSET");
+
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
+ TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "MEDIUM_FAST should be invalid for UNSET");
+
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
+ TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "SHORT_TURBO should be invalid for UNSET");
+}
+
+static void test_validateConfigLora_allPresetsValidForLORA24()
+{
+ // LORA_24 uses PROFILE_STD (9 presets) with wideLora=true
+ meshtastic_Config_LoRaConfig_ModemPreset stdPresets[] = {
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
+ meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
+ };
+
+ for (size_t i = 0; i < sizeof(stdPresets) / sizeof(stdPresets[0]); i++) {
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
+ cfg.use_preset = true;
+ cfg.modem_preset = stdPresets[i];
+ TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for LORA_24");
+ }
+}
+
+// -----------------------------------------------------------------------
+// clampConfigLora() tests
+// -----------------------------------------------------------------------
+
+static void test_clampConfigLora_invalidPresetClampedToDefault()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = true;
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO; // not in EU_868 preset list
+
+ RadioInterface::clampConfigLora(cfg);
+
+ const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_EQUAL(eu868->getDefaultPreset(), cfg.modem_preset);
+}
+
+static void test_clampConfigLora_validPresetUnchanged()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = true;
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
+}
+
+static void test_clampConfigLora_customBwTooWideClampedToDefaultBw()
+{
+ // EU_868 span is 250kHz. A 500kHz custom BW should be clamped to default preset BW.
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.use_preset = false;
+ cfg.bandwidth = 500;
+ cfg.spread_factor = 11;
+ cfg.coding_rate = 5;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ float expectedBw = modemPresetToBwKHz(eu868->getDefaultPreset(), eu868->wideLora);
+ TEST_ASSERT_FLOAT_WITHIN(0.01f, expectedBw, (float)cfg.bandwidth);
+}
+
+static void test_clampConfigLora_customBwValidLeftUnchanged()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.use_preset = false;
+ cfg.bandwidth = 125;
+ cfg.spread_factor = 12;
+ cfg.coding_rate = 8;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ TEST_ASSERT_EQUAL_UINT16(125, cfg.bandwidth);
+}
+
+static void test_clampConfigLora_bogusPresetOnUnsetClampedToLongFast()
+{
+ // UNSET uses PROFILE_UNDEF with only LONG_FAST; any other preset should clamp to it
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
+ cfg.use_preset = true;
+ cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, cfg.modem_preset);
+}
+
+static void test_clampConfigLora_invalidPresetOnLORA24ClampedToDefault()
+{
+ // LORA_24 uses PROFILE_STD; a bogus preset should clamp to LONG_FAST (first in PRESETS_STD)
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
+ cfg.use_preset = true;
+ cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ const RegionInfo *lora24 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
+ TEST_ASSERT_EQUAL(lora24->getDefaultPreset(), cfg.modem_preset);
+}
+
+// -----------------------------------------------------------------------
+// RegionInfo preset list integrity tests
+// -----------------------------------------------------------------------
+
+static void test_presetsStd_hasNineEntries()
+{
+ // PROFILE_STD should have exactly 9 presets
+ const RegionInfo *us = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ TEST_ASSERT_EQUAL(9, us->getNumPresets());
+ TEST_ASSERT_EQUAL_PTR(PROFILE_STD.presets, us->getAvailablePresets());
+}
+
+static void test_presetsEU868_hasSevenEntries()
+{
+ const RegionInfo *eu = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_EQUAL(7, eu->getNumPresets());
+ TEST_ASSERT_EQUAL_PTR(PROFILE_EU868.presets, eu->getAvailablePresets());
+}
+
+static void test_presetsUndef_hasOneEntry()
+{
+ const RegionInfo *unset = getRegion(meshtastic_Config_LoRaConfig_RegionCode_UNSET);
+ TEST_ASSERT_EQUAL(1, unset->getNumPresets());
+ TEST_ASSERT_EQUAL_PTR(PROFILE_UNDEF.presets, unset->getAvailablePresets());
+}
+
+static void test_defaultPresetIsInAvailablePresets()
+{
+ // For every region, the defaultPreset must appear in its own availablePresets list
+ const RegionInfo *r = regions;
+ while (true) {
+ bool found = false;
+ for (size_t i = 0; i < r->getNumPresets(); i++) {
+ if (r->getAvailablePresets()[i] == r->getDefaultPreset()) {
+ found = true;
+ break;
+ }
+ }
+ char msg[80];
+ snprintf(msg, sizeof(msg), "Region %s defaultPreset not in availablePresets", r->name);
+ TEST_ASSERT_TRUE_MESSAGE(found, msg);
+
+ if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
+ break; // UNSET is the sentinel, stop after it
+ r++;
+ }
+}
+
+static void test_regionFieldsAreSane()
+{
+ // Basic sanity check: all regions have freqEnd > freqStart and a non-null name
+ const RegionInfo *r = regions;
+ while (true) {
+ char msg[80];
+ snprintf(msg, sizeof(msg), "Region %s: freqEnd must be > freqStart", r->name);
+ TEST_ASSERT_TRUE_MESSAGE(r->freqEnd > r->freqStart, msg);
+ TEST_ASSERT_NOT_NULL(r->name);
+ TEST_ASSERT_TRUE_MESSAGE(r->getNumPresets() > 0, "numPresets must be > 0");
+ TEST_ASSERT_NOT_NULL(r->getAvailablePresets());
+
+ if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
+ break;
+ r++;
+ }
+}
+
+static void test_onlyLORA24HasWideLora()
+{
+ // Verify that LORA_24 is the only region with wideLora=true
+ const RegionInfo *r = regions;
+ while (true) {
+ char msg[80];
+ if (r->code == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) {
+ snprintf(msg, sizeof(msg), "Region %s should have wideLora=true", r->name);
+ TEST_ASSERT_TRUE_MESSAGE(r->wideLora, msg);
+ } else {
+ snprintf(msg, sizeof(msg), "Region %s should have wideLora=false", r->name);
+ TEST_ASSERT_FALSE_MESSAGE(r->wideLora, msg);
+ }
+
+ if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
+ break;
+ r++;
+ }
+}
+
+// -----------------------------------------------------------------------
+// Channel spacing calculation (placeholder for future protobuf updates)
+// -----------------------------------------------------------------------
+
+static void test_channelSpacingCalculation_US_LONG_FAST()
+{
+ // Current formula: channelSpacing = spacing + (padding * 2) + (bw / 1000)
+ // US: spacing=0, padding=0
+ // LONG_FAST on non-wide region: bw=250 kHz
+ // channelSpacing = 0 + 0 + 0.250 = 0.250 MHz
+ // numChannels = round((928 - 902 + 0) / 0.250) = round(104) = 104
+ const RegionInfo *us = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
+ float bw = modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, us->wideLora);
+ float channelSpacing = us->profile->spacing + (us->profile->padding * 2) + (bw / 1000.0f);
+ uint32_t numChannels = (uint32_t)(((us->freqEnd - us->freqStart + us->profile->spacing) / channelSpacing) + 0.5f);
+
+ TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.250f, channelSpacing);
+ TEST_ASSERT_EQUAL_UINT32(104, numChannels);
+}
+
+static void test_channelSpacingCalculation_EU868_LONG_FAST()
+{
+ // EU_868: freqStart=869.4, freqEnd=869.65, spacing=0, padding=0
+ // LONG_FAST: bw=250 kHz => channelSpacing = 0.250 MHz
+ // numChannels = round((0.25 + 0) / 0.250) = 1
+ const RegionInfo *eu = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ float bw = modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, eu->wideLora);
+ float channelSpacing = eu->profile->spacing + (eu->profile->padding * 2) + (bw / 1000.0f);
+ uint32_t numChannels = (uint32_t)(((eu->freqEnd - eu->freqStart + eu->profile->spacing) / channelSpacing) + 0.5f);
+
+ TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.250f, channelSpacing);
+ TEST_ASSERT_EQUAL_UINT32(1, numChannels);
+}
+
+// Placeholder: when protobuf region definitions include non-zero padding/spacing,
+// add tests here to verify the channel count and frequency calculations.
+static void test_channelSpacingCalculation_placeholder()
+{
+ // TODO: Once protobuf RegionInfo entries have non-zero padding or spacing values,
+ // verify:
+ // - Channel count matches expected value for each (region, preset) pair
+ // - First channel frequency = freqStart + (bw/2000) + padding
+ // - Nth channel frequency = first + (n * channelSpacing)
+ // - overrideSlot, when non-zero, forces the channel_num
+ TEST_PASS_MESSAGE("Placeholder for future channel spacing tests with updated protobuf region fields");
+}
+
+// -----------------------------------------------------------------------
+// handleSetConfig fromOthers dispatch tests
+// -----------------------------------------------------------------------
+
+class AdminModuleTestShim : public AdminModule
+{
+ public:
+ using AdminModule::handleSetConfig;
+};
+
+static AdminModuleTestShim *testAdmin;
+
+static meshtastic_Config makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode region, bool usePreset,
+ meshtastic_Config_LoRaConfig_ModemPreset preset)
+{
+ meshtastic_Config c = meshtastic_Config_init_zero;
+ c.which_payload_variant = meshtastic_Config_lora_tag;
+ c.payload_variant.lora.region = region;
+ c.payload_variant.lora.use_preset = usePreset;
+ c.payload_variant.lora.modem_preset = preset;
+ return c;
+}
+
+static void test_handleSetConfig_fromOthers_invalidPresetRejected()
+{
+ // Set up a known-good baseline in the global config
+ config.lora = meshtastic_Config_LoRaConfig_init_zero;
+ config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ config.lora.use_preset = true;
+ config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+ initRegion();
+
+ // Build an admin set_config with an invalid preset for EU_868
+ meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO);
+
+ testAdmin->handleSetConfig(c, true); // fromOthers = true
+
+ // fromOthers=true: invalid preset should be rejected, old preset preserved
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, config.lora.modem_preset);
+}
+
+static void test_handleSetConfig_fromLocal_invalidPresetClamped()
+{
+ // Set up a known-good baseline
+ config.lora = meshtastic_Config_LoRaConfig_init_zero;
+ config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ config.lora.use_preset = true;
+ config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+ initRegion();
+
+ // Build an admin set_config with an invalid preset for EU_868
+ meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
+ meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO);
+
+ testAdmin->handleSetConfig(c, false); // fromOthers = false (local client)
+
+ // fromOthers=false: invalid preset should be clamped to the region's default
+ const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
+ TEST_ASSERT_EQUAL(eu868->getDefaultPreset(), config.lora.modem_preset);
+}
+
+static void test_handleSetConfig_fromOthers_validPresetAccepted()
+{
+ // Set up baseline
+ config.lora = meshtastic_Config_LoRaConfig_init_zero;
+ config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ config.lora.use_preset = true;
+ config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+ initRegion();
+
+ // Build an admin set_config with a valid preset for EU_868
+ meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
+ meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST);
+
+ testAdmin->handleSetConfig(c, true); // fromOthers = true
+
+ // Valid preset should be accepted regardless of fromOthers
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, config.lora.modem_preset);
+}
+
+// -----------------------------------------------------------------------
+// Test runner
+// -----------------------------------------------------------------------
+
+void setUp(void)
+{
+ mockMeshService = new MockMeshService();
+ service = mockMeshService;
+ testAdmin = new AdminModuleTestShim();
+}
+void tearDown(void)
+{
+ service = nullptr;
+ delete mockMeshService;
+ mockMeshService = nullptr;
+ delete testAdmin;
+ testAdmin = nullptr;
+}
+
+void setup()
+{
+ delay(10);
+ delay(2000);
+
+ initializeTestEnvironment();
+
+ UNITY_BEGIN();
+
+ // getRegion()
+ RUN_TEST(test_getRegion_returnsCorrectRegion_US);
+ RUN_TEST(test_getRegion_returnsCorrectRegion_EU868);
+ RUN_TEST(test_getRegion_returnsCorrectRegion_LORA24);
+ RUN_TEST(test_getRegion_unsetCodeReturnsUnsetEntry);
+ RUN_TEST(test_getRegion_unknownCodeFallsToUnset);
+
+ // validateConfigRegion()
+ RUN_TEST(test_validateConfigRegion_validRegionReturnsTrue);
+ RUN_TEST(test_validateConfigRegion_unsetRegionReturnsTrue);
+
+ // Shadow table tests
+ RUN_TEST(test_shadowTable_spacedProfileHasNonZeroSpacing);
+ RUN_TEST(test_shadowTable_licensedProfileFlagsCorrect);
+ RUN_TEST(test_shadowTable_presetCountMatchesExpected);
+ RUN_TEST(test_shadowTable_defaultPresetIsFirstInList);
+ RUN_TEST(test_shadowTable_channelSpacingWithPadding);
+ RUN_TEST(test_shadowTable_turboOnlyOnWideLora);
+ RUN_TEST(test_shadowTable_unknownCodeFallsToSentinel);
+
+ // validateConfigLora()
+ RUN_TEST(test_validateConfigLora_validPresetForUS);
+ RUN_TEST(test_validateConfigLora_allStdPresetsValidForUS);
+ RUN_TEST(test_validateConfigLora_turboPresetsInvalidForEU868);
+ RUN_TEST(test_validateConfigLora_validPresetsForEU868);
+ RUN_TEST(test_validateConfigLora_customBandwidthTooWideForEU868);
+ RUN_TEST(test_validateConfigLora_customBandwidthFitsUS);
+ RUN_TEST(test_validateConfigLora_customBandwidthFitsEU868);
+ RUN_TEST(test_validateConfigLora_bogusPresetRejected);
+ RUN_TEST(test_validateConfigLora_unsetRegionOnlyAcceptsLongFast);
+ RUN_TEST(test_validateConfigLora_allPresetsValidForLORA24);
+
+ // clampConfigLora()
+ RUN_TEST(test_clampConfigLora_invalidPresetClampedToDefault);
+ RUN_TEST(test_clampConfigLora_validPresetUnchanged);
+ RUN_TEST(test_clampConfigLora_customBwTooWideClampedToDefaultBw);
+ RUN_TEST(test_clampConfigLora_customBwValidLeftUnchanged);
+ RUN_TEST(test_clampConfigLora_bogusPresetOnUnsetClampedToLongFast);
+ RUN_TEST(test_clampConfigLora_invalidPresetOnLORA24ClampedToDefault);
+
+ // RegionInfo preset list integrity
+ RUN_TEST(test_presetsStd_hasNineEntries);
+ RUN_TEST(test_presetsEU868_hasSevenEntries);
+ RUN_TEST(test_presetsUndef_hasOneEntry);
+ RUN_TEST(test_defaultPresetIsInAvailablePresets);
+ RUN_TEST(test_regionFieldsAreSane);
+ RUN_TEST(test_onlyLORA24HasWideLora);
+
+ // Channel spacing (current + placeholder)
+ RUN_TEST(test_channelSpacingCalculation_US_LONG_FAST);
+ RUN_TEST(test_channelSpacingCalculation_EU868_LONG_FAST);
+ RUN_TEST(test_channelSpacingCalculation_placeholder);
+
+ // handleSetConfig fromOthers dispatch
+ RUN_TEST(test_handleSetConfig_fromOthers_invalidPresetRejected);
+ RUN_TEST(test_handleSetConfig_fromLocal_invalidPresetClamped);
+ RUN_TEST(test_handleSetConfig_fromOthers_validPresetAccepted);
+
+ exit(UNITY_END());
+}
+
+void loop() {}
diff --git a/test/test_default/test_main.cpp b/test/test_default/test_main.cpp
index d832fc809..9da367897 100644
--- a/test/test_default/test_main.cpp
+++ b/test/test_default/test_main.cpp
@@ -10,8 +10,9 @@ static uint32_t computeExpectedMs(uint32_t defaultSeconds, uint32_t numOnlineNod
{
uint32_t baseMs = Default::getConfiguredOrDefaultMs(0, defaultSeconds);
- // Routers don't scale
- if (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER) {
+ // Routers (including ROUTER_LATE) don't scale
+ if (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ||
+ config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER_LATE) {
return baseMs;
}
@@ -93,6 +94,39 @@ void test_client_medium_fast_preset_scaling()
TEST_ASSERT_INT_WITHIN(1, expected, res);
}
+void test_router_uses_router_minimums()
+{
+ config.device.role = meshtastic_Config_DeviceConfig_Role_ROUTER;
+
+ uint32_t telemetry = Default::getConfiguredOrMinimumValue(60, min_default_telemetry_interval_secs);
+ uint32_t position = Default::getConfiguredOrMinimumValue(60, min_default_broadcast_interval_secs);
+
+ TEST_ASSERT_EQUAL_UINT32(ONE_DAY / 2, telemetry);
+ TEST_ASSERT_EQUAL_UINT32(ONE_DAY / 2, position);
+}
+
+void test_router_late_uses_router_minimums()
+{
+ config.device.role = meshtastic_Config_DeviceConfig_Role_ROUTER_LATE;
+
+ uint32_t telemetry = Default::getConfiguredOrMinimumValue(60, min_default_telemetry_interval_secs);
+ uint32_t position = Default::getConfiguredOrMinimumValue(60, min_default_broadcast_interval_secs);
+
+ TEST_ASSERT_EQUAL_UINT32(ONE_DAY / 2, telemetry);
+ TEST_ASSERT_EQUAL_UINT32(ONE_DAY / 2, position);
+}
+
+void test_client_uses_public_channel_minimums()
+{
+ config.device.role = meshtastic_Config_DeviceConfig_Role_CLIENT;
+
+ uint32_t telemetry = Default::getConfiguredOrMinimumValue(60, min_default_telemetry_interval_secs);
+ uint32_t position = Default::getConfiguredOrMinimumValue(60, min_default_broadcast_interval_secs);
+
+ TEST_ASSERT_EQUAL_UINT32(30 * 60, telemetry);
+ TEST_ASSERT_EQUAL_UINT32(60 * 60, position);
+}
+
void setup()
{
// Small delay to match other test mains
@@ -103,6 +137,9 @@ void setup()
RUN_TEST(test_client_below_threshold);
RUN_TEST(test_client_default_preset_scaling);
RUN_TEST(test_client_medium_fast_preset_scaling);
+ RUN_TEST(test_router_uses_router_minimums);
+ RUN_TEST(test_router_late_uses_router_minimums);
+ RUN_TEST(test_client_uses_public_channel_minimums);
exit(UNITY_END());
}
diff --git a/test/test_mqtt/MQTT.cpp b/test/test_mqtt/MQTT.cpp
index 4a2eed87d..edf9a3983 100644
--- a/test/test_mqtt/MQTT.cpp
+++ b/test/test_mqtt/MQTT.cpp
@@ -818,16 +818,13 @@ void test_configEmptyIsValid(void)
TEST_ASSERT_TRUE(MQTT::isValidConfig(config));
}
-// Empty 'enabled' configuration is valid.
+// Empty 'enabled' configuration is valid. A lightweight TCP check may be performed
+// but does not affect the result.
void test_configEnabledEmptyIsValid(void)
{
meshtastic_ModuleConfig_MQTTConfig config = {.enabled = true};
- MockPubSubServer client;
- TEST_ASSERT_TRUE(MQTTUnitTest::isValidConfig(config, &client));
- TEST_ASSERT_TRUE(client.connected_);
- TEST_ASSERT_EQUAL_STRING(default_mqtt_address, client.host_.c_str());
- TEST_ASSERT_EQUAL(1883, client.port_);
+ TEST_ASSERT_TRUE(MQTT::isValidConfig(config));
}
// Configuration with the default server is valid.
@@ -846,38 +843,32 @@ void test_configWithDefaultServerAndInvalidPort(void)
TEST_ASSERT_FALSE(MQTT::isValidConfig(config));
}
-// isValidConfig connects to a custom host and port.
+// Custom host and port is valid. TCP reachability is checked but does not block saving.
void test_configCustomHostAndPort(void)
{
meshtastic_ModuleConfig_MQTTConfig config = {.enabled = true, .address = "server:1234"};
- MockPubSubServer client;
- TEST_ASSERT_TRUE(MQTTUnitTest::isValidConfig(config, &client));
- TEST_ASSERT_TRUE(client.connected_);
- TEST_ASSERT_EQUAL_STRING("server", client.host_.c_str());
- TEST_ASSERT_EQUAL(1234, client.port_);
+ TEST_ASSERT_TRUE(MQTT::isValidConfig(config));
}
-// isValidConfig returns false if a connection cannot be established.
-void test_configWithConnectionFailure(void)
+// An unreachable server is still a valid config — settings always save.
+// A warning notification is sent in non-test builds, but isValidConfig returns true.
+void test_configWithUnreachableServerIsStillValid(void)
{
meshtastic_ModuleConfig_MQTTConfig config = {.enabled = true, .address = "server"};
- MockPubSubServer client;
- client.refuseConnection_ = true;
- TEST_ASSERT_FALSE(MQTTUnitTest::isValidConfig(config, &client));
+ TEST_ASSERT_TRUE(MQTT::isValidConfig(config));
}
// isValidConfig returns true when tls_enabled is supported, or false otherwise.
void test_configWithTLSEnabled(void)
{
meshtastic_ModuleConfig_MQTTConfig config = {.enabled = true, .address = "server", .tls_enabled = true};
- MockPubSubServer client;
#if MQTT_SUPPORTS_TLS
- TEST_ASSERT_TRUE(MQTTUnitTest::isValidConfig(config, &client));
+ TEST_ASSERT_TRUE(MQTT::isValidConfig(config));
#else
- TEST_ASSERT_FALSE(MQTTUnitTest::isValidConfig(config, &client));
+ TEST_ASSERT_FALSE(MQTT::isValidConfig(config));
#endif
}
@@ -927,7 +918,7 @@ void setup()
RUN_TEST(test_configWithDefaultServer);
RUN_TEST(test_configWithDefaultServerAndInvalidPort);
RUN_TEST(test_configCustomHostAndPort);
- RUN_TEST(test_configWithConnectionFailure);
+ RUN_TEST(test_configWithUnreachableServerIsStillValid);
RUN_TEST(test_configWithTLSEnabled);
exit(UNITY_END());
}
diff --git a/test/test_radio/test_main.cpp b/test/test_radio/test_main.cpp
index fbe2b1b13..49eaabe5b 100644
--- a/test/test_radio/test_main.cpp
+++ b/test/test_radio/test_main.cpp
@@ -1,10 +1,19 @@
#include "MeshRadio.h"
+#include "MeshService.h"
#include "RadioInterface.h"
#include "TestUtil.h"
#include
#include "meshtastic/config.pb.h"
+class MockMeshService : public MeshService
+{
+ public:
+ void sendClientNotification(meshtastic_ClientNotification *n) override { releaseClientNotificationToPool(n); }
+};
+
+static MockMeshService *mockMeshService;
+
static void test_bwCodeToKHz_specialMappings()
{
TEST_ASSERT_FLOAT_WITHIN(0.0001f, 31.25f, bwCodeToKHz(31));
@@ -21,7 +30,7 @@ static void test_bwCodeToKHz_passthrough()
TEST_ASSERT_FLOAT_WITHIN(0.0001f, 250.0f, bwCodeToKHz(250));
}
-static void test_bootstrapLoRaConfigFromPreset_noopWhenUsePresetFalse()
+static void test_validateConfigLora_noopWhenUsePresetFalse()
{
meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
cfg.use_preset = false;
@@ -30,55 +39,78 @@ static void test_bootstrapLoRaConfigFromPreset_noopWhenUsePresetFalse()
cfg.bandwidth = 123;
cfg.spread_factor = 8;
- RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
+ RadioInterface::validateConfigLora(cfg);
TEST_ASSERT_EQUAL_UINT16(123, cfg.bandwidth);
TEST_ASSERT_EQUAL_UINT32(8, cfg.spread_factor);
TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
}
-static void test_bootstrapLoRaConfigFromPreset_setsDerivedFields_nonWideRegion()
+static void test_validateConfigLora_validPreset_nonWideRegion()
{
meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
cfg.use_preset = true;
cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
- RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
-
- TEST_ASSERT_EQUAL_UINT16(250, cfg.bandwidth);
- TEST_ASSERT_EQUAL_UINT32(9, cfg.spread_factor);
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
}
-static void test_bootstrapLoRaConfigFromPreset_setsDerivedFields_wideRegion()
+static void test_validateConfigLora_validPreset_wideRegion()
{
meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
cfg.use_preset = true;
cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
- RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
-
- TEST_ASSERT_EQUAL_UINT16(800, cfg.bandwidth);
- TEST_ASSERT_EQUAL_UINT32(9, cfg.spread_factor);
+ TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
}
-static void test_bootstrapLoRaConfigFromPreset_fallsBackIfBandwidthExceedsRegionSpan()
+static void test_validateConfigLora_rejectsInvalidPresetForRegion()
{
meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
cfg.use_preset = true;
cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
- RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
-
- TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, cfg.modem_preset);
- TEST_ASSERT_EQUAL_UINT16(250, cfg.bandwidth);
- TEST_ASSERT_EQUAL_UINT32(11, cfg.spread_factor);
+ TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
}
-void setUp(void) {}
-void tearDown(void) {}
+static void test_clampConfigLora_invalidPresetClampedToDefault()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.use_preset = true;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, cfg.modem_preset);
+}
+
+static void test_clampConfigLora_validPresetUnchanged()
+{
+ meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
+ cfg.use_preset = true;
+ cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
+ cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
+
+ RadioInterface::clampConfigLora(cfg);
+
+ TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
+}
+
+void setUp(void)
+{
+ mockMeshService = new MockMeshService();
+ service = mockMeshService;
+}
+void tearDown(void)
+{
+ service = nullptr;
+ delete mockMeshService;
+ mockMeshService = nullptr;
+}
void setup()
{
@@ -90,10 +122,12 @@ void setup()
UNITY_BEGIN();
RUN_TEST(test_bwCodeToKHz_specialMappings);
RUN_TEST(test_bwCodeToKHz_passthrough);
- RUN_TEST(test_bootstrapLoRaConfigFromPreset_noopWhenUsePresetFalse);
- RUN_TEST(test_bootstrapLoRaConfigFromPreset_setsDerivedFields_nonWideRegion);
- RUN_TEST(test_bootstrapLoRaConfigFromPreset_setsDerivedFields_wideRegion);
- RUN_TEST(test_bootstrapLoRaConfigFromPreset_fallsBackIfBandwidthExceedsRegionSpan);
+ RUN_TEST(test_validateConfigLora_noopWhenUsePresetFalse);
+ RUN_TEST(test_validateConfigLora_validPreset_nonWideRegion);
+ RUN_TEST(test_validateConfigLora_validPreset_wideRegion);
+ RUN_TEST(test_validateConfigLora_rejectsInvalidPresetForRegion);
+ RUN_TEST(test_clampConfigLora_invalidPresetClampedToDefault);
+ RUN_TEST(test_clampConfigLora_validPresetUnchanged);
exit(UNITY_END());
}
diff --git a/variants/esp32/tlora_v1/platformio.ini b/variants/esp32/tlora_v1/platformio.ini
index c45cc2ce9..5f72d634e 100644
--- a/variants/esp32/tlora_v1/platformio.ini
+++ b/variants/esp32/tlora_v1/platformio.ini
@@ -13,4 +13,5 @@ build_flags =
${esp32_base.build_flags}
-D TLORA_V1
-I variants/esp32/tlora_v1
+ -ULED_BUILTIN
upload_speed = 115200
diff --git a/variants/esp32s3/heltec_v4/platformio.ini b/variants/esp32s3/heltec_v4/platformio.ini
index 8d9921d6a..9acf30c21 100644
--- a/variants/esp32s3/heltec_v4/platformio.ini
+++ b/variants/esp32s3/heltec_v4/platformio.ini
@@ -68,7 +68,7 @@ build_flags =
-D INPUTDRIVER_BUTTON_TYPE=0
-D HAS_SCREEN=1
-D HAS_TFT=1
- -D RAM_SIZE=1560
+ -D RAM_SIZE=1860
-D LV_LVGL_H_INCLUDE_SIMPLE
-D LV_CONF_INCLUDE_SIMPLE
-D LV_COMP_CONF_INCLUDE_SIMPLE
@@ -83,9 +83,9 @@ build_flags =
-D USE_PACKET_API
-D LGFX_DRIVER=LGFX_HELTEC_V4_TFT
-D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_HELTEC_V4_TFT.h\"
- -D VIEW_320x240
- -D MAP_FULL_REDRAW
- -D DISPLAY_SIZE=320x240 ; landscape mode
+ -D VIEW_240x320
+ -D DISPLAY_SET_RESOLUTION
+ -D DISPLAY_SIZE=240x320 ; portrait mode
-D LGFX_PIN_SCK=17
-D LGFX_PIN_MOSI=33
-D LGFX_PIN_DC=16
diff --git a/variants/esp32s3/tlora-pager/platformio.ini b/variants/esp32s3/tlora-pager/platformio.ini
index d35562c2f..dc96113b0 100644
--- a/variants/esp32s3/tlora-pager/platformio.ini
+++ b/variants/esp32s3/tlora-pager/platformio.ini
@@ -26,7 +26,6 @@ build_flags = ${esp32s3_base.build_flags}
-D T_LORA_PAGER
-D BOARD_HAS_PSRAM
-D HAS_SDCARD
- -D SDCARD_USE_SPI1
-D ENABLE_ROTARY_PULLUP
-D ENABLE_BUTTON_PULLUP
-D ROTARY_BUXTRONICS
diff --git a/variants/nrf52840/heltec_mesh_node_t096/platformio.ini b/variants/nrf52840/heltec_mesh_node_t096/platformio.ini
new file mode 100644
index 000000000..e1bdd529d
--- /dev/null
+++ b/variants/nrf52840/heltec_mesh_node_t096/platformio.ini
@@ -0,0 +1,34 @@
+; First prototype nrf52840/sx1262 device
+[env:heltec-mesh-node-t096]
+custom_meshtastic_hw_model = 127
+custom_meshtastic_hw_model_slug = HELTEC_MESH_NODE_T096
+custom_meshtastic_architecture = nrf52840
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 1
+custom_meshtastic_display_name = Heltec Mesh Node 096
+custom_meshtastic_images = heltec-mesh-node-t096.svg, heltec-mesh-node-t096-case.svg
+custom_meshtastic_tags = Heltec
+
+extends = nrf52840_base
+board = heltec_mesh_node_t096
+board_level = pr
+debug_tool = jlink
+
+build_flags = ${nrf52840_base.build_flags}
+ -Ivariants/nrf52840/heltec_mesh_node_t096
+ -D HAS_LORA_FEM=1
+ -D HELTEC_MESH_NODE_T096
+ -D USE_TFTDISPLAY=1
+ -D USER_SETUP_LOADED
+ -D ST7735_DRIVER
+ -D ST7735_REDTAB160x80
+ -D TFT_SPI_PORT=SPI1
+ -D TFT_CS=ST7735_CS ; Chip select control
+ -D TFT_DC=ST7735_RS ; Data Command control pin
+ -D TFT_RST=ST7735_RESET ; Reset pin
+ -D TFT_BL=ST7735_BL ; LED back-light
+ -D TFT_BACKLIGHT_ON=LOW
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t096>
+lib_deps =
+ ${nrf52840_base.lib_deps}
+ bodmer/TFT_eSPI@2.5.43 ; renovate: datasource=platformio-registry depName=bodmer/TFT_eSPI
diff --git a/variants/nrf52840/heltec_mesh_node_t096/variant.cpp b/variants/nrf52840/heltec_mesh_node_t096/variant.cpp
new file mode 100644
index 000000000..29158e8ba
--- /dev/null
+++ b/variants/nrf52840/heltec_mesh_node_t096/variant.cpp
@@ -0,0 +1,76 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC. All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+ // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+ 0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+ // P1
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+ // LED1
+ pinMode(PIN_LED1, OUTPUT);
+ ledOff(PIN_LED1);
+}
+
+void variant_shutdown()
+{
+ nrf_gpio_cfg_default(VEXT_ENABLE);
+ nrf_gpio_cfg_default(ST7735_CS);
+ nrf_gpio_cfg_default(ST7735_RS);
+ nrf_gpio_cfg_default(ST7735_SDA);
+ nrf_gpio_cfg_default(ST7735_SCK);
+ nrf_gpio_cfg_default(ST7735_RESET);
+ nrf_gpio_cfg_default(ST7735_BL);
+
+ nrf_gpio_cfg_default(PIN_LED1);
+
+ // nrf_gpio_cfg_default(LORA_PA_POWER);
+ pinMode(LORA_PA_POWER, OUTPUT);
+ digitalWrite(LORA_PA_POWER, LOW);
+
+ nrf_gpio_cfg_default(LORA_KCT8103L_PA_CSD);
+ nrf_gpio_cfg_default(LORA_KCT8103L_PA_CTX);
+
+ pinMode(ADC_CTRL, OUTPUT);
+ digitalWrite(ADC_CTRL, LOW);
+
+ nrf_gpio_cfg_default(SX126X_CS);
+ nrf_gpio_cfg_default(SX126X_DIO1);
+ nrf_gpio_cfg_default(SX126X_BUSY);
+ nrf_gpio_cfg_default(SX126X_RESET);
+
+ nrf_gpio_cfg_default(PIN_SPI_MISO);
+ nrf_gpio_cfg_default(PIN_SPI_MOSI);
+ nrf_gpio_cfg_default(PIN_SPI_SCK);
+
+ nrf_gpio_cfg_default(PIN_GPS_PPS);
+ nrf_gpio_cfg_default(PIN_GPS_RESET);
+ nrf_gpio_cfg_default(PIN_GPS_EN);
+ nrf_gpio_cfg_default(GPS_TX_PIN);
+ nrf_gpio_cfg_default(GPS_RX_PIN);
+}
\ No newline at end of file
diff --git a/variants/nrf52840/heltec_mesh_node_t096/variant.h b/variants/nrf52840/heltec_mesh_node_t096/variant.h
new file mode 100644
index 000000000..04e22af26
--- /dev/null
+++ b/variants/nrf52840/heltec_mesh_node_t096/variant.h
@@ -0,0 +1,202 @@
+/*
+ Copyright (c) 2014-2015 Arduino LLC. All right reserved.
+ Copyright (c) 2016 Sandeep Mistry All right reserved.
+ Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef _VARIANT_HELTEC_NRF_
+#define _VARIANT_HELTEC_NRF_
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+
+/*----------------------------------------------------------------------------
+ * Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#define VEXT_ENABLE (0 + 26)
+#define VEXT_ON_VALUE HIGH
+
+// ST7735S TFT LCD
+#define ST7735_CS (0 + 22)
+#define ST7735_RS (0 + 15) // DC
+#define ST7735_SDA (0 + 17) // MOSI
+#define ST7735_SCK (0 + 20)
+#define ST7735_RESET (0 + 13)
+#define ST7735_MISO -1
+#define ST7735_BUSY -1
+#define ST7735_BL (32 + 12)
+#define SPI_FREQUENCY 40000000
+#define SPI_READ_FREQUENCY 16000000
+#define SCREEN_ROTATE
+#define TFT_HEIGHT 160
+#define TFT_WIDTH 80
+#define TFT_OFFSET_X 24
+#define TFT_OFFSET_Y 0
+#define TFT_INVERT false
+#define SCREEN_TRANSITION_FRAMERATE 3 // fps
+#define DISPLAY_FORCE_SMALL_FONTS
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (0 + 28) // green (confirmed on 1.0 board)
+#define LED_BLUE PIN_LED1 // fake for bluefruit library
+#define LED_GREEN PIN_LED1
+#define LED_STATE_ON 1 // State when LED is lit
+
+// #define HAS_NEOPIXEL // Enable the use of neopixels
+// #define NEOPIXEL_COUNT 2 // How many neopixels are connected
+// #define NEOPIXEL_DATA 14 // gpio pin used to send data to the neopixels
+// #define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 (32 + 10)
+// #define PIN_BUTTON2 (0 + 18) // 0.18 is labeled on the board as RESET but we configure it in the bootloader as a regular
+// GPIO
+
+/*
+No longer populated on PCB
+*/
+#define PIN_SERIAL2_RX (0 + 9)
+#define PIN_SERIAL2_TX (0 + 10)
+
+/*
+ * I2C
+ */
+
+#define WIRE_INTERFACES_COUNT 2
+
+// I2C bus 0
+#define PIN_WIRE_SDA (0 + 7) // SDA
+#define PIN_WIRE_SCL (0 + 8) // SCL
+
+// I2C bus 1
+#define PIN_WIRE1_SDA (0 + 4) // SDA (secondary bus)
+#define PIN_WIRE1_SCL (0 + 27) // SCL (secondary bus)
+
+/*
+ * Lora radio
+ */
+
+#define USE_SX1262
+#define SX126X_CS (0 + 5) // FIXME - we really should define LORA_CS instead
+#define LORA_CS (0 + 5)
+#define SX126X_DIO1 (0 + 21)
+#define SX126X_BUSY (0 + 19)
+#define SX126X_RESET (0 + 16)
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+// ---- KCT8103L RF FRONT END CONFIGURATION ----
+// The heltec_wireless_tracker_v2 uses a KCT8103L FEM chip with integrated PA and LNA
+// RF path: SX1262 -> Pi attenuator -> KCT8103L PA -> Antenna
+// Control logic (from KCT8103L datasheet):
+// Transmit PA: CSD=1, CTX=1, CPS=1
+// Receive LNA: CSD=1, CTX=0, CPS=X (21dB gain, 1.9dB NF)
+// Receive bypass: CSD=1, CTX=1, CPS=0
+// Shutdown: CSD=0, CTX=X, CPS=X
+// Pin mapping:
+// CPS (pin 5) -> SX1262 DIO2: TX/RX path select (automatic via SX126X_DIO2_AS_RF_SWITCH)
+// CSD (pin 4) -> GPIO12: Chip enable (HIGH=on, LOW=shutdown)
+// CTX (pin 6) -> GPIO41: Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
+// VCC0/VCC1 -> Vfem via U3 LDO, controlled by GPIO30
+// KCT8103L FEM: TX/RX path switching is handled by DIO2 -> CPS pin (via SX126X_DIO2_AS_RF_SWITCH)
+
+#define USE_KCT8103L_PA
+#define LORA_PA_POWER (0 + 30) // VFEM_Ctrl - KCT8103L LDO power enable
+#define LORA_KCT8103L_PA_CSD (0 + 12) // CSD - KCT8103L chip enable (HIGH=on)
+#define LORA_KCT8103L_PA_CTX \
+ (32 + 9) // CTX - Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 2
+
+// For LORA, spi 0
+#define PIN_SPI_MISO (0 + 14)
+#define PIN_SPI_MOSI (0 + 11)
+#define PIN_SPI_SCK (32 + 8)
+
+#define PIN_SPI1_MISO \
+ ST7735_MISO // FIXME not really needed, but for now the SPI code requires something to be defined, pick an used GPIO
+#define PIN_SPI1_MOSI ST7735_SDA
+#define PIN_SPI1_SCK ST7735_SCK
+
+/*
+ * GPS pins
+ */
+#define GPS_UC6580
+#define GPS_BAUDRATE 115200
+#define PIN_GPS_RESET (32 + 14) // An output to reset UC6580 GPS. As per datasheet, low for > 100ms will reset the UC6580
+#define GPS_RESET_MODE LOW
+#define PIN_GPS_EN (0 + 6)
+#define GPS_EN_ACTIVE LOW
+#define PERIPHERAL_WARMUP_MS 1000 // Make sure I2C QuickLink has stable power before continuing
+#define PIN_GPS_PPS (32 + 11)
+#define GPS_TX_PIN (0 + 25) // This is for bits going TOWARDS the CPU
+#define GPS_RX_PIN (0 + 23) // This is for bits going TOWARDS the GPS
+
+#define GPS_THREAD_INTERVAL 50
+
+#define PIN_SERIAL1_RX GPS_RX_PIN
+#define PIN_SERIAL1_TX GPS_TX_PIN
+
+#define ADC_CTRL (32 + 15)
+#define ADC_CTRL_ENABLED HIGH
+#define BATTERY_PIN (0 + 3)
+#define ADC_RESOLUTION 14
+
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER (4.916F)
+
+// rf52840 AIN1 = Pin 3
+#define BATTERY_LPCOMP_INPUT NRF_LPCOMP_INPUT_1
+
+// We have AIN1 with a VBAT divider so AIN1 = VBAT * (100/490)
+// We have the device going deep sleep under 3.1V, which is AIN1 = 0.63V
+// So we can wake up when VBAT>=VDD is restored to 3.3V, where AIN2 = 0.67V
+// Ratio 0.67/3.3 = 0.20, so we can pick a bit higher, 2/8 VDD, which means
+// VBAT=4.04V
+#define BATTERY_LPCOMP_THRESHOLD NRF_LPCOMP_REF_SUPPLY_2_8
+
+#define HAS_RTC 0
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ * Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif