Merge branch 'master' into telemetry-opt-in

2025-12-13 22:32:27 +00:00 · 2025-10-04 11:08:00 -05:00 · 2025-09-27 09:09:39 -05:00 · 2025-09-27 08:33:29 -05:00 · 2025-09-21 18:51:27 -05:00 · 2025-09-20 13:55:45 -05:00
1 changed files with 2 additions and 1 deletions
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -26,7 +26,8 @@ int32_t DeviceTelemetryModule::runOnce()
          Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.device_update_interval,
                                                  default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
        airTime->isTxAllowedChannelUtil(!isImpoliteRole) && airTime->isTxAllowedAirUtil() &&
-        config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN) {
+        config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN &&
+        moduleConfig.telemetry.device_telemetry_enabled) {
        sendTelemetry();
        lastSentToMesh = uptimeLastMs;
    } else if (service->isToPhoneQueueEmpty()) {
Author	SHA1	Message	Date
Ben Meadors	58494df41e	Merge branch 'master' into telemetry-opt-in	2025-10-04 11:08:00 -05:00
Ben Meadors	cc5814533d	Merge branch 'master' into telemetry-opt-in	2025-09-27 09:09:39 -05:00
Ben Meadors	cae07ec31b	Merge branch 'master' into telemetry-opt-in	2025-09-27 08:33:29 -05:00
Ben Meadors	a7c02a2144	Merge branch 'master' into telemetry-opt-in	2025-09-21 18:51:27 -05:00
Ben Meadors	c5ac3897f7	Merge branch 'master' into telemetry-opt-in	2025-09-20 13:55:45 -05:00
Ben Meadors	730a7b9062	Opt in to telemetry going forward	2025-09-20 12:16:27 -05:00