Merge pull request #11 from sachaw/master

Make oneOf property naming consistant
pull/12/head
Kevin Hester 2021-02-07 14:47:07 +08:00 zatwierdzone przez GitHub
commit 72ad7db305
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -173,7 +173,7 @@ message SubPacket {
/*
* Only one of the following fields can be populated at a time
*/
oneof payload {
oneof payloadVariant {
Data data = 3;
@ -213,7 +213,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
@ -293,7 +293,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;
}
@ -987,8 +987,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;
}
@ -1154,7 +1156,7 @@ message FromRadio {
*/
uint32 num = 1;
oneof variant {
oneof payloadVariant {
MeshPacket packet = 2;
@ -1207,7 +1209,7 @@ message FromRadio {
*/
message ToRadio {
oneof variant {
oneof payloadVariant {
/*
* send this packet on the mesh