From 633ac9de71bc063b24c30425c5b7ce1bf8d1a4b9 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 25 Mar 2024 07:27:22 -0500
Subject: [PATCH 1/3] 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 901ce7db..18e7a3fa 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 f5345c9d..986323cb 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 ba4a6930..c8717465 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;
+}

From ce908d8a45414e7b91504e29369254bf0d5bae83 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 25 Mar 2024 07:41:06 -0500
Subject: [PATCH 2/3] Move to non-namespaced proto

---
 meshtastic/admin.proto           |  1 -
 meshtastic/mesh.proto            | 15 +++++++++++++++
 meshtastic/remote_hardware.proto | 15 ---------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 18e7a3fa..675ac134 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -7,7 +7,6 @@ import "meshtastic/config.proto";
 import "meshtastic/connection_status.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/mesh.proto b/meshtastic/mesh.proto
index 60a39061..605c6817 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1581,3 +1581,18 @@ message DeviceMetadata {
 message Heartbeat {
   
 }
+
+/*
+ * 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 c8717465..ba4a6930 100644
--- a/meshtastic/remote_hardware.proto
+++ b/meshtastic/remote_hardware.proto
@@ -73,18 +73,3 @@ 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;
-}

From 53e1c4f6bda68c11d12d17ba650f8792fc8e2325 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Mon, 25 Mar 2024 07:45:17 -0500
Subject: [PATCH 3/3] Don't need this dep now

---
 meshtastic/deviceonly.proto | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index 986323cb..d2daf31c 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/remote_hardware.proto";
 import "nanopb.proto";
 
 option csharp_namespace = "Meshtastic.Protobufs";