From 7129cee944d78387f65a223bb69024253cdc20bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Cort=C3=AAs?= <593860+mrfyda@users.noreply.github.com> Date: Sun, 18 Aug 2024 13:38:54 +0100 Subject: [PATCH] feature: default to fuzzy GPS location on the Default Channel (#4467) * feature: default to fuzzy GPS location on the Default Channel * Default to 13 * 13 default --------- Co-authored-by: Ben Meadors --- src/mesh/Channels.cpp | 4 ++-- src/modules/PositionModule.cpp | 5 +++-- userPrefs.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index 6e721d9b04..bba7571d26 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -97,7 +97,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex) channelSettings.psk.bytes[0] = defaultpskIndex; channelSettings.psk.size = 1; strncpy(channelSettings.name, "", sizeof(channelSettings.name)); - channelSettings.module_settings.position_precision = 32; // default to sending location on the primary channel + channelSettings.module_settings.position_precision = 13; // default to sending location on the primary channel channelSettings.has_module_settings = true; ch.has_settings = true; @@ -363,4 +363,4 @@ bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash) int16_t Channels::setActiveByIndex(ChannelIndex channelIndex) { return setCrypto(channelIndex); -} \ No newline at end of file +} diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp index 5acb5e9d15..f534baf677 100644 --- a/src/modules/PositionModule.cpp +++ b/src/modules/PositionModule.cpp @@ -298,7 +298,8 @@ void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t cha if (channels.getByIndex(channel).settings.has_module_settings) { precision = channels.getByIndex(channel).settings.module_settings.position_precision; } else if (channels.getByIndex(channel).role == meshtastic_Channel_Role_PRIMARY) { - precision = 32; + // backwards compatibility for Primary channels created before position_precision was set by default + precision = 13; } else { precision = 0; } @@ -470,4 +471,4 @@ void PositionModule::handleNewPosition() } } -#endif \ No newline at end of file +#endif diff --git a/userPrefs.h b/userPrefs.h index 3ebbefcaf9..52209deaad 100644 --- a/userPrefs.h +++ b/userPrefs.h @@ -17,7 +17,7 @@ } */ // #define CHANNEL_0_NAME_USERPREFS "DEFCONnect" -// #define CHANNEL_0_PRECISION_USERPREFS 13 +// #define CHANNEL_0_PRECISION_USERPREFS 14 // #define CONFIG_OWNER_LONG_NAME_USERPREFS "My Long Name" // #define CONFIG_OWNER_SHORT_NAME_USERPREFS "MLN"