From 9837b5bb01ab8824a66fbb2ccab8613bcaf87ed5 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Tue, 2 Feb 2021 21:19:47 +1100 Subject: [PATCH 1/5] Fix formatting --- mesh.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mesh.proto b/mesh.proto index 68a05c2..3eb8b5b 100644 --- a/mesh.proto +++ b/mesh.proto @@ -959,8 +959,10 @@ enum CriticalErrorCode { */ InvalidRadioSetting = 7; - // Radio transmit hardware failure. We sent data to the radio chip, but it didn't - // reply with an interrupt. + /* + * Radio transmit hardware failure. We sent data to the radio chip, but it didn't + * reply with an interrupt. + */ TransmitFailed = 8; } From 8b9207aa5d50a97b07bab99f35627038d83b04a0 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Tue, 2 Feb 2021 21:22:25 +1100 Subject: [PATCH 2/5] Make oneOf property naming consistant --- mesh.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mesh.proto b/mesh.proto index 3eb8b5b..ce26602 100644 --- a/mesh.proto +++ b/mesh.proto @@ -162,7 +162,7 @@ message SubPacket { /* * Only one of the following fields can be populated at a time */ - oneof payload { + oneof payloadVariant { Data data = 3; @@ -201,7 +201,7 @@ message SubPacket { */ bool want_response = 5; - oneof ack { + oneof ackVariant { /* * This packet is a requested acknoledgement indicating that we have received * the specified message ID. This packet type can be used both for immediate @@ -281,7 +281,7 @@ message MeshPacket { * The numeric IDs for these fields were selected to keep backwards compatibility with old applications. */ - oneof payload { + oneof payloadVariant { SubPacket decoded = 3; bytes encrypted = 8; } @@ -1128,7 +1128,7 @@ message FromRadio { */ uint32 num = 1; - oneof variant { + oneof payloadVariant { MeshPacket packet = 2; @@ -1181,7 +1181,7 @@ message FromRadio { */ message ToRadio { - oneof variant { + oneof payloadVariant { /* * send this packet on the mesh From 8e5d7d1189bf13a547049136cfcca1a24314df06 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 6 Feb 2021 20:39:38 -0800 Subject: [PATCH 3/5] Add configurations for RangeTestPlugin & StoreForwardPlugin --- mesh.proto | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mesh.proto b/mesh.proto index cc2a217..88a78c7 100644 --- a/mesh.proto +++ b/mesh.proto @@ -845,6 +845,21 @@ message RadioConfig { bool ext_notification_plugin_alert_message = 130; bool ext_notification_plugin_alert_bell = 131; + /** + Preferences for the RangeTestPlugin + + FIXME - Move this out of UserPreferences and into a section for plugin configuration. + */ + bool range_test_plugin_enabled = 132; + bool range_test_plugin_sender = 133; + + /** + Preferences for the StoreForwardPlugin + + FIXME - Move this out of UserPreferences and into a section for plugin configuration. + */ + bool store_forward_plugin_enabled = 136; + bool store_forward_plugin_records = 137; } UserPreferences preferences = 1; From 29f4bc5a8092c1454db2103739f33b208942dfbc Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 6 Feb 2021 21:42:17 -0800 Subject: [PATCH 4/5] Changes for range_test_plugin and store_forward_plugin --- mesh.proto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mesh.proto b/mesh.proto index 88a78c7..5c1b4d7 100644 --- a/mesh.proto +++ b/mesh.proto @@ -851,7 +851,8 @@ message RadioConfig { FIXME - Move this out of UserPreferences and into a section for plugin configuration. */ bool range_test_plugin_enabled = 132; - bool range_test_plugin_sender = 133; + uint32 range_test_plugin_sender = 133; + bool range_test_plugin_save = 134; /** Preferences for the StoreForwardPlugin @@ -859,7 +860,7 @@ message RadioConfig { FIXME - Move this out of UserPreferences and into a section for plugin configuration. */ bool store_forward_plugin_enabled = 136; - bool store_forward_plugin_records = 137; + uint32 store_forward_plugin_records = 137; } UserPreferences preferences = 1; From 3d5990ec7b803d1a98c9000bc09a8a652b9e7890 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Mon, 8 Feb 2021 12:20:36 +0800 Subject: [PATCH 5/5] fix docs --- mesh.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mesh.proto b/mesh.proto index f6772f5..7262312 100644 --- a/mesh.proto +++ b/mesh.proto @@ -63,9 +63,10 @@ message Data { } /* Broadcast when a newly powered mesh node wants to find a node num it can use -// Sent from the phone over bluetooth to set the user id for the owner of this + +Sent from the phone over bluetooth to set the user id for the owner of this node. -// Also sent from nodes to each other when a new node signs on (so all clients +Also sent from nodes to each other when a new node signs on (so all clients can have this info) The algorithm is as follows: @@ -95,7 +96,7 @@ message User { // a globally unique ID string for this user. In the case of // Signal that would mean +16504442323, for the default macaddr - // derived id it would be !<6 hexidecimal bytes> + // derived id it would be !<8 hexidecimal bytes> string id = 1; // A full name for this user, i.e. "Kevin Hester"