From 82810841aa3050bb6ee8d66f57e29f25ac7e9a03 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Tue, 22 Jul 2025 23:51:44 -0500 Subject: [PATCH] Deprecate smart gps config -- Always Smart! --- src/mesh/NodeDB.cpp | 9 --------- src/modules/PositionModule.cpp | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 38e213167..e10ae5e56 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -644,11 +644,6 @@ void NodeDB::installDefaultConfig(bool preserveKey = false) config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED; #else config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED; -#endif -#ifdef USERPREFS_CONFIG_SMART_POSITION_ENABLED - config.position.position_broadcast_smart_enabled = USERPREFS_CONFIG_SMART_POSITION_ENABLED; -#else - config.position.position_broadcast_smart_enabled = true; #endif config.position.broadcast_smart_minimum_distance = 100; config.position.broadcast_smart_minimum_interval_secs = 30; @@ -917,11 +912,9 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role) moduleConfig.telemetry.environment_measurement_enabled = true; moduleConfig.telemetry.environment_update_interval = 300; } else if (role == meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND) { - config.position.position_broadcast_smart_enabled = false; config.position.position_broadcast_secs = 300; // Every 5 minutes } else if (role == meshtastic_Config_DeviceConfig_Role_TAK) { config.device.node_info_broadcast_secs = ONE_DAY; - config.position.position_broadcast_smart_enabled = false; config.position.position_broadcast_secs = ONE_DAY; // Remove Altitude MSL from flags since CoTs use HAE (height above ellipsoid) config.position.position_flags = @@ -936,7 +929,6 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role) owner.has_is_unmessagable = true; owner.is_unmessagable = true; config.device.node_info_broadcast_secs = ONE_DAY; - config.position.position_broadcast_smart_enabled = true; config.position.position_broadcast_secs = 3 * 60; // Every 3 minutes config.position.broadcast_smart_minimum_distance = 20; config.position.broadcast_smart_minimum_interval_secs = 15; @@ -948,7 +940,6 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role) } else if (role == meshtastic_Config_DeviceConfig_Role_CLIENT_HIDDEN) { config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY; config.device.node_info_broadcast_secs = MAX_INTERVAL; - config.position.position_broadcast_smart_enabled = false; config.position.position_broadcast_secs = MAX_INTERVAL; moduleConfig.neighbor_info.update_interval = MAX_INTERVAL; moduleConfig.telemetry.device_update_interval = MAX_INTERVAL; diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp index 8b6a9f19c..3555c65ec 100644 --- a/src/modules/PositionModule.cpp +++ b/src/modules/PositionModule.cpp @@ -428,7 +428,7 @@ int32_t PositionModule::runOnce() sendLostAndFoundText(); } } - } else if (config.position.position_broadcast_smart_enabled) { + } else { const meshtastic_NodeInfoLite *node2 = service->refreshLocalMeshNode(); // should guarantee there is now a position if (nodeDB->hasValidPosition(node2)) {