Merge branch 'meshtastic:master' into master

Mictronics · Aug 18, 2024 · 728a825 · 728a825
2 parents e155942 + 7129cee
commit 728a825
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
@@ -224,7 +224,6 @@ int32_t ButtonThread::runOnce()
         btnEvent = BUTTON_EVENT_NONE;
     }
 
-    runASAP = false;
     return 50;
 }
 

diff --git 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);
-}
+}
diff --git 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
+#endif
diff --git 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"