mirror of
https://github.com/meshtastic/firmware.git
synced 2026-05-30 03:34:57 -04:00
8384659608
* fix: apply all LoRa config changes live without rebooting All LoRa radio settings (SF, BW, CR, frequency, power, preset, sx126x_rx_boosted_gain) now apply immediately via reconfigure() without requiring a node reboot. - AdminModule: requiresReboot = false for all LoRa config changes; LoRa changes were already handled by the configChanged observer calling reconfigure() but the reboot flag was set unnecessarily - AdminModule: validate LORA_24 region against radio hardware at config time; reject with BAD_REQUEST if hardware lacks 2.4 GHz capability (wideLora() returns false or no radio instance) - SX126xInterface/LR11x0Interface: apply sx126x_rx_boosted_gain in reconfigure(); register 0x08AC is writable in STDBY mode (SX1261/2 datasheet §9.6); retention registers written so setting survives warm-sleep cycles; log warning on setter failure - DebugRenderer: show BW/SF/CR on debug screen when custom modem is active instead of the preset name - DisplayFormatters: clarify comment on getModemPresetDisplayName * fix: remove redundant reboot after LoRa config changes in on-device menus Region, frequency slot, and radio preset pickers in MenuHandler all called reloadConfig() then immediately set rebootAtMsec. reloadConfig() already fires the configChanged observer which calls reconfigure(), so the forced reboot was unnecessary — same rationale as the parent commit. * fix: guard LORA_24 region selection against hardware capability in on-device menu Without a reboot, reconfigure() now applies region changes directly. Previously getRadio() caught the LORA_24-on-sub-GHz mismatch post-reboot and reverted to UNSET — that safety net is gone. Add an explicit wideLora() check in LoraRegionPicker so sub-GHz-only hardware silently ignores LORA_24 selection instead of attempting a live reconfigure with an invalid frequency. --------- Co-authored-by: elwimen <elwimen@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
87 lines
3.0 KiB
C++
87 lines
3.0 KiB
C++
#include "DisplayFormatters.h"
|
|
|
|
const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName,
|
|
bool usePreset)
|
|
{
|
|
|
|
// 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";
|
|
}
|
|
|
|
switch (preset) {
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
|
|
return useShortName ? "ShortT" : "ShortTurbo";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
|
|
return useShortName ? "ShortS" : "ShortSlow";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
|
|
return useShortName ? "ShortF" : "ShortFast";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
|
|
return useShortName ? "MedS" : "MediumSlow";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
|
|
return useShortName ? "MedF" : "MediumFast";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
|
|
return useShortName ? "LongS" : "LongSlow";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
|
|
return useShortName ? "LongF" : "LongFast";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
|
|
return useShortName ? "LongT" : "LongTurbo";
|
|
break;
|
|
case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
|
|
return useShortName ? "LongM" : "LongMod";
|
|
break;
|
|
default:
|
|
return useShortName ? "Custom" : "Invalid";
|
|
break;
|
|
}
|
|
}
|
|
|
|
const char *DisplayFormatters::getDeviceRole(meshtastic_Config_DeviceConfig_Role role)
|
|
{
|
|
switch (role) {
|
|
case meshtastic_Config_DeviceConfig_Role_CLIENT:
|
|
return "Client";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE:
|
|
return "Client Mute";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN:
|
|
return "Client Hidden";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_CLIENT_BASE:
|
|
return "Client Base";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND:
|
|
return "Lost and Found";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_TRACKER:
|
|
return "Tracker";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_SENSOR:
|
|
return "Sensor";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_TAK:
|
|
return "TAK";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_TAK_TRACKER:
|
|
return "TAK Tracker";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_ROUTER:
|
|
return "Router";
|
|
break;
|
|
case meshtastic_Config_DeviceConfig_Role_ROUTER_LATE:
|
|
return "Router Late";
|
|
break;
|
|
default:
|
|
return "Unknown";
|
|
break;
|
|
}
|
|
} |