Skip to content

Commit 0a03162

Browse files
thebenternthebentern
authored
Merge pull request #105 from meshtastic/wip
Update protos
2 parents 9427558 + 1e15f31 commit 0a03162

24 files changed

+2802
-795
lines changed

‎Meshtastic/Generated/Admin.cs

+660-171
Large diffs are not rendered by default.

‎Meshtastic/Generated/Apponly.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static ApponlyReflection() {
4949
/// No DISABLED channels are included.
5050
/// This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
5151
/// </summary>
52+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
5253
public sealed partial class ChannelSet : pb::IMessage<ChannelSet>
5354
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
5455
, pb::IBufferMessage
@@ -233,7 +234,11 @@ public void MergeFrom(pb::CodedInputStream input) {
233234
#else
234235
uint tag;
235236
while ((tag = input.ReadTag()) != 0) {
236-
switch(tag) {
237+
if ((tag & 7) == 4) {
238+
// Abort on any end group tag.
239+
return;
240+
}
241+
switch(tag) {
237242
default:
238243
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
239244
break;
@@ -259,7 +264,11 @@ public void MergeFrom(pb::CodedInputStream input) {
259264
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
260265
uint tag;
261266
while ((tag = input.ReadTag()) != 0) {
262-
switch(tag) {
267+
if ((tag & 7) == 4) {
268+
// Abort on any end group tag.
269+
return;
270+
}
271+
switch(tag) {
263272
default:
264273
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
265274
break;

‎Meshtastic/Generated/Atak.cs

+91-19
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public enum MemberRole {
200200
///
201201
/// Packets for the official ATAK Plugin
202202
/// </summary>
203+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
203204
public sealed partial class TAKPacket : pb::IMessage<TAKPacket>
204205
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
205206
, pb::IBufferMessage
@@ -365,12 +366,26 @@ public bool IsCompressed {
365366
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
366367
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
367368
public pb::ByteString Detail {
368-
get { return payloadVariantCase_ == PayloadVariantOneofCase.Detail ? (pb::ByteString) payloadVariant_ : pb::ByteString.Empty; }
369+
get { return HasDetail ? (pb::ByteString) payloadVariant_ : pb::ByteString.Empty; }
369370
set {
370371
payloadVariant_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
371372
payloadVariantCase_ = PayloadVariantOneofCase.Detail;
372373
}
373374
}
375+
/// <summary>Gets whether the "detail" field is set</summary>
376+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
377+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
378+
public bool HasDetail {
379+
get { return payloadVariantCase_ == PayloadVariantOneofCase.Detail; }
380+
}
381+
/// <summary> Clears the value of the oneof if it's currently set to "detail" </summary>
382+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
383+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
384+
public void ClearDetail() {
385+
if (HasDetail) {
386+
ClearPayloadVariant();
387+
}
388+
}
374389

375390
private object payloadVariant_;
376391
/// <summary>Enum of possible cases for the "payload_variant" oneof.</summary>
@@ -430,7 +445,7 @@ public override int GetHashCode() {
430445
if (status_ != null) hash ^= Status.GetHashCode();
431446
if (payloadVariantCase_ == PayloadVariantOneofCase.Pli) hash ^= Pli.GetHashCode();
432447
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) hash ^= Chat.GetHashCode();
433-
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) hash ^= Detail.GetHashCode();
448+
if (HasDetail) hash ^= Detail.GetHashCode();
434449
hash ^= (int) payloadVariantCase_;
435450
if (_unknownFields != null) {
436451
hash ^= _unknownFields.GetHashCode();
@@ -474,7 +489,7 @@ public void WriteTo(pb::CodedOutputStream output) {
474489
output.WriteRawTag(50);
475490
output.WriteMessage(Chat);
476491
}
477-
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
492+
if (HasDetail) {
478493
output.WriteRawTag(58);
479494
output.WriteBytes(Detail);
480495
}
@@ -512,7 +527,7 @@ public void WriteTo(pb::CodedOutputStream output) {
512527
output.WriteRawTag(50);
513528
output.WriteMessage(Chat);
514529
}
515-
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
530+
if (HasDetail) {
516531
output.WriteRawTag(58);
517532
output.WriteBytes(Detail);
518533
}
@@ -544,7 +559,7 @@ public int CalculateSize() {
544559
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) {
545560
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Chat);
546561
}
547-
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
562+
if (HasDetail) {
548563
size += 1 + pb::CodedOutputStream.ComputeBytesSize(Detail);
549564
}
550565
if (_unknownFields != null) {
@@ -609,7 +624,11 @@ public void MergeFrom(pb::CodedInputStream input) {
609624
#else
610625
uint tag;
611626
while ((tag = input.ReadTag()) != 0) {
612-
switch(tag) {
627+
if ((tag & 7) == 4) {
628+
// Abort on any end group tag.
629+
return;
630+
}
631+
switch(tag) {
613632
default:
614633
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
615634
break;
@@ -671,7 +690,11 @@ public void MergeFrom(pb::CodedInputStream input) {
671690
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
672691
uint tag;
673692
while ((tag = input.ReadTag()) != 0) {
674-
switch(tag) {
693+
if ((tag & 7) == 4) {
694+
// Abort on any end group tag.
695+
return;
696+
}
697+
switch(tag) {
675698
default:
676699
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
677700
break;
@@ -733,6 +756,7 @@ public void MergeFrom(pb::CodedInputStream input) {
733756
///
734757
/// ATAK GeoChat message
735758
/// </summary>
759+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
736760
public sealed partial class GeoChat : pb::IMessage<GeoChat>
737761
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
738762
, pb::IBufferMessage
@@ -797,6 +821,8 @@ public string Message {
797821

798822
/// <summary>Field number for the "to" field.</summary>
799823
public const int ToFieldNumber = 2;
824+
private readonly static string ToDefaultValue = "";
825+
800826
private string to_;
801827
/// <summary>
802828
///
@@ -805,7 +831,7 @@ public string Message {
805831
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
806832
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
807833
public string To {
808-
get { return to_ ?? ""; }
834+
get { return to_ ?? ToDefaultValue; }
809835
set {
810836
to_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
811837
}
@@ -825,6 +851,8 @@ public void ClearTo() {
825851

826852
/// <summary>Field number for the "to_callsign" field.</summary>
827853
public const int ToCallsignFieldNumber = 3;
854+
private readonly static string ToCallsignDefaultValue = "";
855+
828856
private string toCallsign_;
829857
/// <summary>
830858
///
@@ -833,7 +861,7 @@ public void ClearTo() {
833861
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
834862
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
835863
public string ToCallsign {
836-
get { return toCallsign_ ?? ""; }
864+
get { return toCallsign_ ?? ToCallsignDefaultValue; }
837865
set {
838866
toCallsign_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
839867
}
@@ -982,7 +1010,11 @@ public void MergeFrom(pb::CodedInputStream input) {
9821010
#else
9831011
uint tag;
9841012
while ((tag = input.ReadTag()) != 0) {
985-
switch(tag) {
1013+
if ((tag & 7) == 4) {
1014+
// Abort on any end group tag.
1015+
return;
1016+
}
1017+
switch(tag) {
9861018
default:
9871019
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
9881020
break;
@@ -1009,7 +1041,11 @@ public void MergeFrom(pb::CodedInputStream input) {
10091041
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
10101042
uint tag;
10111043
while ((tag = input.ReadTag()) != 0) {
1012-
switch(tag) {
1044+
if ((tag & 7) == 4) {
1045+
// Abort on any end group tag.
1046+
return;
1047+
}
1048+
switch(tag) {
10131049
default:
10141050
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
10151051
break;
@@ -1037,6 +1073,7 @@ public void MergeFrom(pb::CodedInputStream input) {
10371073
/// ATAK Group
10381074
/// &lt;__group role='Team Member' name='Cyan'/>
10391075
/// </summary>
1076+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
10401077
public sealed partial class Group : pb::IMessage<Group>
10411078
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
10421079
, pb::IBufferMessage
@@ -1230,7 +1267,11 @@ public void MergeFrom(pb::CodedInputStream input) {
12301267
#else
12311268
uint tag;
12321269
while ((tag = input.ReadTag()) != 0) {
1233-
switch(tag) {
1270+
if ((tag & 7) == 4) {
1271+
// Abort on any end group tag.
1272+
return;
1273+
}
1274+
switch(tag) {
12341275
default:
12351276
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
12361277
break;
@@ -1253,7 +1294,11 @@ public void MergeFrom(pb::CodedInputStream input) {
12531294
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
12541295
uint tag;
12551296
while ((tag = input.ReadTag()) != 0) {
1256-
switch(tag) {
1297+
if ((tag & 7) == 4) {
1298+
// Abort on any end group tag.
1299+
return;
1300+
}
1301+
switch(tag) {
12571302
default:
12581303
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
12591304
break;
@@ -1277,6 +1322,7 @@ public void MergeFrom(pb::CodedInputStream input) {
12771322
/// ATAK EUD Status
12781323
/// &lt;status battery='100' />
12791324
/// </summary>
1325+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
12801326
public sealed partial class Status : pb::IMessage<Status>
12811327
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
12821328
, pb::IBufferMessage
@@ -1436,7 +1482,11 @@ public void MergeFrom(pb::CodedInputStream input) {
14361482
#else
14371483
uint tag;
14381484
while ((tag = input.ReadTag()) != 0) {
1439-
switch(tag) {
1485+
if ((tag & 7) == 4) {
1486+
// Abort on any end group tag.
1487+
return;
1488+
}
1489+
switch(tag) {
14401490
default:
14411491
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
14421492
break;
@@ -1455,7 +1505,11 @@ public void MergeFrom(pb::CodedInputStream input) {
14551505
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
14561506
uint tag;
14571507
while ((tag = input.ReadTag()) != 0) {
1458-
switch(tag) {
1508+
if ((tag & 7) == 4) {
1509+
// Abort on any end group tag.
1510+
return;
1511+
}
1512+
switch(tag) {
14591513
default:
14601514
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
14611515
break;
@@ -1475,6 +1529,7 @@ public void MergeFrom(pb::CodedInputStream input) {
14751529
/// ATAK Contact
14761530
/// &lt;contact endpoint='0.0.0.0:4242:tcp' phone='+12345678' callsign='FALKE'/>
14771531
/// </summary>
1532+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
14781533
public sealed partial class Contact : pb::IMessage<Contact>
14791534
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
14801535
, pb::IBufferMessage
@@ -1667,7 +1722,11 @@ public void MergeFrom(pb::CodedInputStream input) {
16671722
#else
16681723
uint tag;
16691724
while ((tag = input.ReadTag()) != 0) {
1670-
switch(tag) {
1725+
if ((tag & 7) == 4) {
1726+
// Abort on any end group tag.
1727+
return;
1728+
}
1729+
switch(tag) {
16711730
default:
16721731
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
16731732
break;
@@ -1690,7 +1749,11 @@ public void MergeFrom(pb::CodedInputStream input) {
16901749
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
16911750
uint tag;
16921751
while ((tag = input.ReadTag()) != 0) {
1693-
switch(tag) {
1752+
if ((tag & 7) == 4) {
1753+
// Abort on any end group tag.
1754+
return;
1755+
}
1756+
switch(tag) {
16941757
default:
16951758
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
16961759
break;
@@ -1713,6 +1776,7 @@ public void MergeFrom(pb::CodedInputStream input) {
17131776
///
17141777
/// Position Location Information from ATAK
17151778
/// </summary>
1779+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
17161780
public sealed partial class PLI : pb::IMessage<PLI>
17171781
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
17181782
, pb::IBufferMessage
@@ -2006,7 +2070,11 @@ public void MergeFrom(pb::CodedInputStream input) {
20062070
#else
20072071
uint tag;
20082072
while ((tag = input.ReadTag()) != 0) {
2009-
switch(tag) {
2073+
if ((tag & 7) == 4) {
2074+
// Abort on any end group tag.
2075+
return;
2076+
}
2077+
switch(tag) {
20102078
default:
20112079
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
20122080
break;
@@ -2041,7 +2109,11 @@ public void MergeFrom(pb::CodedInputStream input) {
20412109
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
20422110
uint tag;
20432111
while ((tag = input.ReadTag()) != 0) {
2044-
switch(tag) {
2112+
if ((tag & 7) == 4) {
2113+
// Abort on any end group tag.
2114+
return;
2115+
}
2116+
switch(tag) {
20452117
default:
20462118
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
20472119
break;

‎Meshtastic/Generated/Cannedmessages.cs

+11-2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ static CannedmessagesReflection() {
4343
///
4444
/// Canned message module configuration.
4545
/// </summary>
46+
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
4647
public sealed partial class CannedMessageModuleConfig : pb::IMessage<CannedMessageModuleConfig>
4748
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
4849
, pb::IBufferMessage
@@ -202,7 +203,11 @@ public void MergeFrom(pb::CodedInputStream input) {
202203
#else
203204
uint tag;
204205
while ((tag = input.ReadTag()) != 0) {
205-
switch(tag) {
206+
if ((tag & 7) == 4) {
207+
// Abort on any end group tag.
208+
return;
209+
}
210+
switch(tag) {
206211
default:
207212
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
208213
break;
@@ -221,7 +226,11 @@ public void MergeFrom(pb::CodedInputStream input) {
221226
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
222227
uint tag;
223228
while ((tag = input.ReadTag()) != 0) {
224-
switch(tag) {
229+
if ((tag & 7) == 4) {
230+
// Abort on any end group tag.
231+
return;
232+
}
233+
switch(tag) {
225234
default:
226235
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
227236
break;

0 commit comments

Comments
 (0)