From bd3e8b2fc80c35c8bc92f55e8b1f3afa443f3027 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 14 May 2025 13:28:57 -0500 Subject: [PATCH 1/5] Explicit map report opt-in --- meshtastic/module_config.proto | 5 +++++ meshtastic/mqtt.proto | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 50b4640..06ca899 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -95,6 +95,11 @@ message ModuleConfig { * Bits of precision for the location sent (default of 32 is full precision). */ uint32 position_precision = 2; + + /* + * Whether we should report our location to the map + */ + optional bool should_report_location = 3; } /* diff --git a/meshtastic/mqtt.proto b/meshtastic/mqtt.proto index 2dbc820..00c2b2e 100644 --- a/meshtastic/mqtt.proto +++ b/meshtastic/mqtt.proto @@ -103,4 +103,9 @@ message MapReport { * Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT) */ uint32 num_online_local_nodes = 13; + + /* + * User has opted in to share their location (map report) with the mqtt server + */ + bool has_opted_in = 14; } From 1e507865aaab8cb686e0dda03a8f095fab6eca62 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 14 May 2025 13:31:31 -0500 Subject: [PATCH 2/5] Clarification --- meshtastic/mqtt.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/meshtastic/mqtt.proto b/meshtastic/mqtt.proto index 00c2b2e..7cbf5d0 100644 --- a/meshtastic/mqtt.proto +++ b/meshtastic/mqtt.proto @@ -106,6 +106,7 @@ message MapReport { /* * User has opted in to share their location (map report) with the mqtt server + * Controlled by map_report.should_report_location */ bool has_opted_in = 14; } From a8da85a73f2a016b7c27b46adb3346db99373d78 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 14 May 2025 13:32:22 -0500 Subject: [PATCH 3/5] Clarification --- meshtastic/mqtt.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/mqtt.proto b/meshtastic/mqtt.proto index 7cbf5d0..4edf0c4 100644 --- a/meshtastic/mqtt.proto +++ b/meshtastic/mqtt.proto @@ -108,5 +108,5 @@ message MapReport { * User has opted in to share their location (map report) with the mqtt server * Controlled by map_report.should_report_location */ - bool has_opted_in = 14; + bool has_opted_report_location = 14; } From 3a35144931d64674f7978a391d0358a8d8aa5dde Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 14 May 2025 14:13:12 -0500 Subject: [PATCH 4/5] Update module_config.proto --- meshtastic/module_config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 06ca899..588def6 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -99,7 +99,7 @@ message ModuleConfig { /* * Whether we should report our location to the map */ - optional bool should_report_location = 3; + bool should_report_location = 3; } /* From f76d353f383a2e5de43a6f08562e499706603fc3 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 14 May 2025 14:13:51 -0500 Subject: [PATCH 5/5] Update module_config.proto --- meshtastic/module_config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 588def6..e6c1694 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -97,7 +97,7 @@ message ModuleConfig { uint32 position_precision = 2; /* - * Whether we should report our location to the map + * Whether we have opted-in to report our location to the map */ bool should_report_location = 3; }