Skip to content

Commit

Permalink
Merge pull request #105 from meshtastic/wip
Browse files Browse the repository at this point in the history 
Update protos
  • Loading branch information
@thebentern
thebentern authored Feb 9, 2025
2 parents 9427558 + 1e15f31 commit 0a03162
Show file tree
Hide file tree
Showing 24 changed files with 2,802 additions and 795 deletions.
831 changes: 660 additions & 171 deletions Meshtastic/Generated/Admin.cs
View file

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions Meshtastic/Generated/Apponly.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ static ApponlyReflection() {
/// No DISABLED channels are included.
/// 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
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class ChannelSet : pb::IMessage<ChannelSet>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -233,7 +234,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -259,7 +264,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand Down
110 changes: 91 additions & 19 deletions Meshtastic/Generated/Atak.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ public enum MemberRole {
///
/// Packets for the official ATAK Plugin
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class TAKPacket : pb::IMessage<TAKPacket>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -365,12 +366,26 @@ public bool IsCompressed {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pb::ByteString Detail {
get { return payloadVariantCase_ == PayloadVariantOneofCase.Detail ? (pb::ByteString) payloadVariant_ : pb::ByteString.Empty; }
get { return HasDetail ? (pb::ByteString) payloadVariant_ : pb::ByteString.Empty; }
set {
payloadVariant_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
payloadVariantCase_ = PayloadVariantOneofCase.Detail;
}
}
/// <summary>Gets whether the "detail" field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public bool HasDetail {
get { return payloadVariantCase_ == PayloadVariantOneofCase.Detail; }
}
/// <summary> Clears the value of the oneof if it's currently set to "detail" </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public void ClearDetail() {
if (HasDetail) {
ClearPayloadVariant();
}
}

private object payloadVariant_;
/// <summary>Enum of possible cases for the "payload_variant" oneof.</summary>
Expand Down Expand Up @@ -430,7 +445,7 @@ public override int GetHashCode() {
if (status_ != null) hash ^= Status.GetHashCode();
if (payloadVariantCase_ == PayloadVariantOneofCase.Pli) hash ^= Pli.GetHashCode();
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) hash ^= Chat.GetHashCode();
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) hash ^= Detail.GetHashCode();
if (HasDetail) hash ^= Detail.GetHashCode();
hash ^= (int) payloadVariantCase_;
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
Expand Down Expand Up @@ -474,7 +489,7 @@ public void WriteTo(pb::CodedOutputStream output) {
output.WriteRawTag(50);
output.WriteMessage(Chat);
}
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
if (HasDetail) {
output.WriteRawTag(58);
output.WriteBytes(Detail);
}
Expand Down Expand Up @@ -512,7 +527,7 @@ public void WriteTo(pb::CodedOutputStream output) {
output.WriteRawTag(50);
output.WriteMessage(Chat);
}
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
if (HasDetail) {
output.WriteRawTag(58);
output.WriteBytes(Detail);
}
Expand Down Expand Up @@ -544,7 +559,7 @@ public int CalculateSize() {
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Chat);
}
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
if (HasDetail) {
size += 1 + pb::CodedOutputStream.ComputeBytesSize(Detail);
}
if (_unknownFields != null) {
Expand Down Expand Up @@ -609,7 +624,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand Down Expand Up @@ -671,7 +690,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand Down Expand Up @@ -733,6 +756,7 @@ public void MergeFrom(pb::CodedInputStream input) {
///
/// ATAK GeoChat message
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class GeoChat : pb::IMessage<GeoChat>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -797,6 +821,8 @@ public string Message {

/// <summary>Field number for the "to" field.</summary>
public const int ToFieldNumber = 2;
private readonly static string ToDefaultValue = "";

private string to_;
/// <summary>
///
Expand All @@ -805,7 +831,7 @@ public string Message {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string To {
get { return to_ ?? ""; }
get { return to_ ?? ToDefaultValue; }
set {
to_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
Expand All @@ -825,6 +851,8 @@ public void ClearTo() {

/// <summary>Field number for the "to_callsign" field.</summary>
public const int ToCallsignFieldNumber = 3;
private readonly static string ToCallsignDefaultValue = "";

private string toCallsign_;
/// <summary>
///
Expand All @@ -833,7 +861,7 @@ public void ClearTo() {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string ToCallsign {
get { return toCallsign_ ?? ""; }
get { return toCallsign_ ?? ToCallsignDefaultValue; }
set {
toCallsign_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
Expand Down Expand Up @@ -982,7 +1010,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -1009,7 +1041,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand Down Expand Up @@ -1037,6 +1073,7 @@ public void MergeFrom(pb::CodedInputStream input) {
/// ATAK Group
/// &lt;__group role='Team Member' name='Cyan'/>
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class Group : pb::IMessage<Group>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -1230,7 +1267,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -1253,7 +1294,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand All @@ -1277,6 +1322,7 @@ public void MergeFrom(pb::CodedInputStream input) {
/// ATAK EUD Status
/// &lt;status battery='100' />
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class Status : pb::IMessage<Status>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -1436,7 +1482,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -1455,7 +1505,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand All @@ -1475,6 +1529,7 @@ public void MergeFrom(pb::CodedInputStream input) {
/// ATAK Contact
/// &lt;contact endpoint='0.0.0.0:4242:tcp' phone='+12345678' callsign='FALKE'/>
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class Contact : pb::IMessage<Contact>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -1667,7 +1722,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -1690,7 +1749,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand All @@ -1713,6 +1776,7 @@ public void MergeFrom(pb::CodedInputStream input) {
///
/// Position Location Information from ATAK
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class PLI : pb::IMessage<PLI>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -2006,7 +2070,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand Down Expand Up @@ -2041,7 +2109,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand Down
13 changes: 11 additions & 2 deletions Meshtastic/Generated/Cannedmessages.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ static CannedmessagesReflection() {
///
/// Canned message module configuration.
/// </summary>
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class CannedMessageModuleConfig : pb::IMessage<CannedMessageModuleConfig>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
Expand Down Expand Up @@ -202,7 +203,11 @@ public void MergeFrom(pb::CodedInputStream input) {
#else
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
break;
Expand All @@ -221,7 +226,11 @@ public void MergeFrom(pb::CodedInputStream input) {
void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
if ((tag & 7) == 4) {
// Abort on any end group tag.
return;
}
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
break;
Expand Down
Loading

0 comments on commit 0a03162

Please sign in to comment.