From 2cb0aeb668686edf68cfb8a682b988e7b64ed238 Mon Sep 17 00:00:00 2001 From: charminULTRA Date: Thu, 27 Jul 2023 14:09:17 -0400 Subject: [PATCH 1/8] ALM --- meshtastic/admin.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 191707c2..c8c2a1f4 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -109,6 +109,11 @@ message AdminMessage { * TODO: REPLACE */ REMOTEHARDWARE_CONFIG = 8; + + /* + * TODO: REPLACE + */ + AMBIENTLIGHTING_CONFIG = 10; } /* From 34e550ee2a177e4d8d8443afcc03d5b1d1ba9109 Mon Sep 17 00:00:00 2001 From: charminULTRA Date: Thu, 27 Jul 2023 14:12:37 -0400 Subject: [PATCH 2/8] space --- meshtastic/admin.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index c8c2a1f4..952ecaad 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -113,7 +113,7 @@ message AdminMessage { /* * TODO: REPLACE */ - AMBIENTLIGHTING_CONFIG = 10; + AMBIENTLIGHTING_CONFIG = 10; } /* From 7f047d6357a299f7704debdb2968e7818a1a81e7 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 27 Jul 2023 14:39:13 -0400 Subject: [PATCH 3/8] added expeceted code for neighborinfo for simplicity of merge --- meshtastic/admin.proto | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 952ecaad..ac2fd5dd 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -109,7 +109,12 @@ message AdminMessage { * TODO: REPLACE */ REMOTEHARDWARE_CONFIG = 8; - + + /* + * TODO: REPLACE + */ + NEIGHBORINFO_CONFIG = 9; + /* * TODO: REPLACE */ @@ -330,4 +335,4 @@ message NodeRemoteHardwarePinsResponse { * Nodes and their respective remote hardware GPIO pins */ repeated NodeRemoteHardwarePin node_remote_hardware_pins = 1; -} +} \ No newline at end of file From c48e4085628166943bd94fbf875722cc6605b4cb Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 27 Jul 2023 16:42:58 -0400 Subject: [PATCH 4/8] space fix --- meshtastic/admin.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index ac2fd5dd..e629a877 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -114,7 +114,7 @@ message AdminMessage { * TODO: REPLACE */ NEIGHBORINFO_CONFIG = 9; - + /* * TODO: REPLACE */ From 673832e45c68d8651b626673cc00e11a07c642f5 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:03:43 -0400 Subject: [PATCH 5/8] test --- meshtastic/admin.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index e629a877..a8f87aaf 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -119,6 +119,7 @@ message AdminMessage { * TODO: REPLACE */ AMBIENTLIGHTING_CONFIG = 10; + } /* From b69559e22b1da9fd7bbea62231da2d0069a92950 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:07:05 -0400 Subject: [PATCH 6/8] check --- meshtastic/admin.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index a8f87aaf..e629a877 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -119,7 +119,6 @@ message AdminMessage { * TODO: REPLACE */ AMBIENTLIGHTING_CONFIG = 10; - } /* From 22b6681c86fb6253742af82e1e692d85e8c208d7 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jul 2023 11:07:48 -0400 Subject: [PATCH 7/8] Trying to fix TOKEN error From 4628e5960b3e39196057a3e552c3900837fb58d9 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 30 Jul 2023 11:17:06 -0400 Subject: [PATCH 8/8] leave out neighbor --- meshtastic/admin.proto | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index e629a877..b71588e5 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -110,11 +110,6 @@ message AdminMessage { */ REMOTEHARDWARE_CONFIG = 8; - /* - * TODO: REPLACE - */ - NEIGHBORINFO_CONFIG = 9; - /* * TODO: REPLACE */