Merge branch 'master' into master

[create-pull-request] automated change (#6396 )
Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
2025-09-25 02:26:37 +00:00 · 2025-03-25 15:08:19 -05:00 · 2025-03-25 14:55:37 -05:00 · 2025-03-25 11:39:19 -05:00
2 changed files with 6 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b4e24c3a868f9e5fd782d2e256b05456d578923b
+Subproject commit b4044f8f9f3681d4d20521dbe13ee42c96eae353
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@ -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
Author	SHA1	Message	Date
nledevil	334f4705db	Merge branch 'master' into master	2025-03-25 15:08:19 -05:00
github-actions[bot]	eb375d8e62	[create-pull-request] automated change (#6396 ) Some checks are pending CI / build-esp32 (push) Blocked by required conditions Details CI / build-esp32-s3 (push) Blocked by required conditions Details CI / build-esp32-c3 (push) Blocked by required conditions Details CI / build-esp32-c6 (push) Blocked by required conditions Details CI / build-nrf52 (push) Blocked by required conditions Details CI / build-rpi2040 (push) Blocked by required conditions Details CI / build-stm32 (push) Blocked by required conditions Details CI / build-debian-src (push) Waiting to run Details CI / package-pio-deps-native-tft (push) Waiting to run Details CI / test-native (push) Waiting to run Details CI / docker-debian-amd64 (push) Waiting to run Details CI / docker-alpine-amd64 (push) Waiting to run Details CI / docker-debian-arm64 (push) Waiting to run Details CI / docker-debian-armv7 (push) Waiting to run Details CI / after-checks (push) Blocked by required conditions Details CI / gather-artifacts (esp32) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c3) (push) Blocked by required conditions Details CI / gather-artifacts (esp32c6) (push) Blocked by required conditions Details CI / gather-artifacts (esp32s3) (push) Blocked by required conditions Details CI / gather-artifacts (nrf52840) (push) Blocked by required conditions Details CI / gather-artifacts (rp2040) (push) Blocked by required conditions Details CI / gather-artifacts (stm32) (push) Blocked by required conditions Details CI / release-artifacts (push) Blocked by required conditions Details CI / release-firmware (esp32) (push) Blocked by required conditions Details CI / release-firmware (esp32c3) (push) Blocked by required conditions Details CI / release-firmware (esp32c6) (push) Blocked by required conditions Details CI / release-firmware (esp32s3) (push) Blocked by required conditions Details CI / release-firmware (nrf52840) (push) Blocked by required conditions Details CI / release-firmware (rp2040) (push) Blocked by required conditions Details CI / release-firmware (stm32) (push) Blocked by required conditions Details Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-03-25 14:55:37 -05:00
Austin	33f2b7144f	Default to UDP enabled if it's available (#6394 )	2025-03-25 11:39:19 -05:00