From 9837b5bb01ab8824a66fbb2ccab8613bcaf87ed5 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Tue, 2 Feb 2021 21:19:47 +1100 Subject: [PATCH 1/2] 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/2] 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