Skip to content

Commit

Permalink
feature: default to fuzzy GPS location on the Default Channel (meshta…
Browse files Browse the repository at this point in the history
…stic#4467)

* feature: default to fuzzy GPS location on the Default Channel

* Default to 13

* 13 default

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
  • Loading branch information
mrfyda and thebentern authored Aug 18, 2024
1 parent a8999d7 commit 7129cee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/mesh/Channels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -363,4 +363,4 @@ bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash)
int16_t Channels::setActiveByIndex(ChannelIndex channelIndex)
{
return setCrypto(channelIndex);
}
}
5 changes: 3 additions & 2 deletions src/modules/PositionModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -470,4 +471,4 @@ void PositionModule::handleNewPosition()
}
}

#endif
#endif
2 changes: 1 addition & 1 deletion userPrefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7129cee

Please sign in to comment.