From 633ac9de71bc063b24c30425c5b7ce1bf8d1a4b9 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Mon, 25 Mar 2024 07:27:22 -0500 Subject: [PATCH] Move remote hardware pins to sever problematic device_only dependency --- meshtastic/admin.proto | 2 +- meshtastic/deviceonly.proto | 16 +--------------- meshtastic/remote_hardware.proto | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 901ce7d..18e7a3f 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -5,9 +5,9 @@ package meshtastic; import "meshtastic/channel.proto"; import "meshtastic/config.proto"; import "meshtastic/connection_status.proto"; -import "meshtastic/deviceonly.proto"; import "meshtastic/mesh.proto"; import "meshtastic/module_config.proto"; +import "meshtastic/remote_hardware.proto"; option csharp_namespace = "Meshtastic.Protobufs"; option go_package = "github.com/meshtastic/go/generated"; diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index f5345c9..986323c 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -7,6 +7,7 @@ import "meshtastic/localonly.proto"; import "meshtastic/mesh.proto"; import "meshtastic/telemetry.proto"; import "meshtastic/module_config.proto"; +import "meshtastic/remote_hardware.proto"; import "nanopb.proto"; option csharp_namespace = "Meshtastic.Protobufs"; @@ -254,18 +255,3 @@ message OEMStore { */ LocalModuleConfig oem_local_module_config = 8; } - -/* - * RemoteHardwarePins associated with a node - */ -message NodeRemoteHardwarePin { - /* - * The node_num exposing the available gpio pin - */ - uint32 node_num = 1; - - /* - * The the available gpio pin for usage with RemoteHardware module - */ - RemoteHardwarePin pin = 2; -} diff --git a/meshtastic/remote_hardware.proto b/meshtastic/remote_hardware.proto index ba4a693..c871746 100644 --- a/meshtastic/remote_hardware.proto +++ b/meshtastic/remote_hardware.proto @@ -73,3 +73,18 @@ message HardwareMessage { */ uint64 gpio_value = 3; } + +/* + * RemoteHardwarePins associated with a node + */ +message NodeRemoteHardwarePin { + /* + * The node_num exposing the available gpio pin + */ + uint32 node_num = 1; + + /* + * The the available gpio pin for usage with RemoteHardware module + */ + RemoteHardwarePin pin = 2; +}