Merge branch 'master' into thinknode-m5

This commit is contained in:
Jonathan Bennett 2025-08-03 17:08:20 -05:00 committed by GitHub
commit 917e352915
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -65,8 +65,15 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
bool hasGPS(); bool hasGPS();
uint32_t lastSentReply = 0; // Last time we sent a position reply (used for reply throttling only) uint32_t lastSentReply = 0; // Last time we sent a position reply (used for reply throttling only)
#if USERPREFS_EVENT_MODE
// In event mode we want to prevent excessive position broadcasts
// we set the minimum interval to 5m
const uint32_t minimumTimeThreshold =
max(300000, Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30));
#else
const uint32_t minimumTimeThreshold = const uint32_t minimumTimeThreshold =
Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30); Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
#endif
}; };
struct SmartPosition { struct SmartPosition {