mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-20 08:41:41 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
334f4705db
@ -1 +1 @@
|
||||
Subproject commit b4e24c3a868f9e5fd782d2e256b05456d578923b
|
||||
Subproject commit b4044f8f9f3681d4d20521dbe13ee42c96eae353
|
@ -628,8 +628,13 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
|
||||
meshtastic_Config_PositionConfig_PositionFlags_SPEED | meshtastic_Config_PositionConfig_PositionFlags_HEADING |
|
||||
meshtastic_Config_PositionConfig_PositionFlags_DOP | meshtastic_Config_PositionConfig_PositionFlags_SATINVIEW);
|
||||
|
||||
// Set default value for 'Mesh via UDP'
|
||||
#if HAS_UDP_MULTICAST
|
||||
#ifdef USERPREFS_NETWORK_ENABLED_PROTOCOLS
|
||||
config.network.enabled_protocols = USERPREFS_NETWORK_ENABLED_PROTOCOLS;
|
||||
#else
|
||||
config.network.enabled_protocols = 1;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef USERPREFS_NETWORK_WIFI_ENABLED
|
||||
|
Loading…
Reference in New Issue
Block a user