Merge pull request #448 from meshtastic/ModuleSettings

adds ModuleSettings and position_precision to ChannelSettings
meshtastic · Feb 22, 2024 · 24edea6 · 24edea6
2 parents b888899 + df08595
commit 24edea6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto
@@ -81,6 +81,21 @@ message ChannelSettings {
    * If true, messages seen on the internet will be forwarded to the local mesh.
    */
   bool downlink_enabled = 6;
+
+  /*
+   * Per-channel module settings.
+   */
+   ModuleSettings module_settings = 7;
+}
+
+/*
+ * This message is specifically for modules to store per-channel configuration data.
+ */
+message ModuleSettings {
+/*
+ * Bits of precision for the location sent in position packets.
+ */
+  uint32 position_precision = 1;
 }
 
 /*
@@ -132,4 +147,4 @@ message Channel {
    * TODO: REPLACE
    */
   Role role = 3;
-}
+}
diff --git a/meshtastic/config.options b/meshtastic/config.options
@@ -12,5 +12,3 @@
 *LoRaConfig.channel_num int_size:16
 
 *PowerConfig.device_battery_ina_address int_size:8
-
-*PositionConfig.channel_precision max_count:8
diff --git a/meshtastic/config.proto b/meshtastic/config.proto
@@ -342,11 +342,6 @@ message Config {
      * Set where GPS is enabled, disabled, or not present
      */
     GpsMode gps_mode = 13;
-
-    /*
-     * Set GPS precision in bits per channel, or 0 for disabled
-     */
-    repeated uint32 channel_precision = 14;
   }
 
   /*

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
@@ -203,6 +203,11 @@ message Position {
    *   detect lost updates if needed
    */
   uint32 seq_number = 22;
+
+  /*
+   * Indicates the bits of precision set by the sending node
+   */
+  uint32 precision_bits = 23;
 }
 
 /*