pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-06 21:54:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Add REGULATORY_ prefix to LORA_REGIONCODE

Browse Source 
Add REGULATORY_ prefix to LORA_REGIONCODE to prepare for more regulatory configuration options, and update comment block accordingly too.

Signed-off-by: Andrew Yong <me@ndoo.sg>
This commit is contained in:
Andrew Yong 2024-05-08 20:15:06 +08:00
parent 96b286cd48
commit 5554cc46a7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/configuration.h
View File

@ -75,11 +75,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif #endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Regulatory overrides for producing regional builds // Regulatory overrides
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Define if region should override user saved region // Override user saved region, for producing region-locked builds
// #define LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_SG_923 // #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_SG_923
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Feature toggles // Feature toggles

4
src/mesh/RadioInterface.cpp
View File

@ -154,8 +154,8 @@ static uint8_t bytes[MAX_RHPACKETLEN];
void initRegion() void initRegion()
{ {
const RegionInfo *r = regions; const RegionInfo *r = regions;
#ifdef LORA_REGIONCODE #ifdef REGULATORY_LORA_REGIONCODE
for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != LORA_REGIONCODE; r++) for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != REGULATORY_LORA_REGIONCODE; r++)
; ;
LOG_INFO("Wanted region %d, regulatory override to %s\n", config.lora.region, r->name); LOG_INFO("Wanted region %d, regulatory override to %s\n", config.lora.region, r->name);
#else #else