From 4f3e5f8b81229f50eb8de22c3d237f621eb5d149 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 26 Nov 2023 14:07:06 -0600 Subject: [PATCH 1/2] Revert "Add role to NodeInfo/Lite" --- meshtastic/deviceonly.proto | 6 ------ meshtastic/mesh.proto | 5 ----- 2 files changed, 11 deletions(-) diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index 864b4b12..4f6b9a98 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -7,7 +7,6 @@ import "meshtastic/localonly.proto"; import "meshtastic/mesh.proto"; import "meshtastic/telemetry.proto"; import "meshtastic/module_config.proto"; -import "meshtastic/config.proto"; option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; @@ -117,11 +116,6 @@ message NodeInfoLite { * local channel index we heard that node on. Only populated if its not the default channel. */ uint32 channel = 7; - - /* - * Indicates that the device's role in the mesh - */ - Config.DeviceConfig.Role role = 8; } /* diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 4d7542cb..e8eda537 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1046,11 +1046,6 @@ message NodeInfo { * local channel index we heard that node on. Only populated if its not the default channel. */ uint32 channel = 7; - - /* - * Indicates that the device's role in the mesh - */ - Config.DeviceConfig.Role role = 8; } /* From 2966ac6fad94f8ecffd21379b33200a4a7513a66 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 26 Nov 2023 14:10:31 -0600 Subject: [PATCH 2/2] Add role to User instead --- meshtastic/mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index e8eda537..6a73ee33 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -512,6 +512,11 @@ message User { * Also, "long_name" should be their licence number. */ bool is_licensed = 6; + + /* + * Indicates that the user's role in the mesh + */ + Config.DeviceConfig.Role role = 7; } /*