Skip to content

Commit 6041d13

Browse files
thebenternthebentern
authored
Merge pull request #90 from meshtastic/wip
Update protos
2 parents e3bac54 + e1b1a91 commit 6041d13

File tree

11 files changed

+3149
-475
lines changed

11 files changed

+3149
-475
lines changed

‎Meshtastic/Connections/SerialConnection.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public override async Task<DeviceStateContainer> WriteToRadio(ToRadio packet, Fu
7676
await serialPort.BaseStream.WriteAsync(PacketFraming.SERIAL_PREAMBLE.AsMemory(0, PacketFraming.SERIAL_PREAMBLE.Length));
7777
await serialPort.BaseStream.WriteAsync(toRadio);
7878
VerboseLogPacket(packet);
79-
await ReadFromRadio(isComplete);
79+
if (isComplete != null)
80+
await ReadFromRadio(isComplete);
81+
8082
return DeviceStateContainer;
8183
}
8284

‎Meshtastic/Connections/TcpConnection.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ public override async Task<DeviceStateContainer> WriteToRadio(ToRadio packet, Fu
3939
networkStream = client.GetStream();
4040
await networkStream.WriteAsync(toRadio);
4141
VerboseLogPacket(packet);
42-
await ReadFromRadio(isComplete);
42+
if (isComplete != null)
43+
await ReadFromRadio(isComplete);
44+
4345
return DeviceStateContainer;
4446
}
4547

‎Meshtastic/Generated/Admin.cs‎

Lines changed: 231 additions & 64 deletions
Large diffs are not rendered by default.

‎Meshtastic/Generated/Atak.cs‎

Lines changed: 66 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@ public static partial class AtakReflection {
2424
static AtakReflection() {
2525
byte[] descriptorData = global::System.Convert.FromBase64String(
2626
string.Concat(
27-
"ChVtZXNodGFzdGljL2F0YWsucHJvdG8SCm1lc2h0YXN0aWMi5gEKCVRBS1Bh",
27+
"ChVtZXNodGFzdGljL2F0YWsucHJvdG8SCm1lc2h0YXN0aWMi+AEKCVRBS1Bh",
2828
"Y2tldBIVCg1pc19jb21wcmVzc2VkGAEgASgIEiQKB2NvbnRhY3QYAiABKAsy",
2929
"Ey5tZXNodGFzdGljLkNvbnRhY3QSIAoFZ3JvdXAYAyABKAsyES5tZXNodGFz",
3030
"dGljLkdyb3VwEiIKBnN0YXR1cxgEIAEoCzISLm1lc2h0YXN0aWMuU3RhdHVz",
3131
"Eh4KA3BsaRgFIAEoCzIPLm1lc2h0YXN0aWMuUExJSAASIwoEY2hhdBgGIAEo",
32-
"CzITLm1lc2h0YXN0aWMuR2VvQ2hhdEgAQhEKD3BheWxvYWRfdmFyaWFudCJc",
33-
"CgdHZW9DaGF0Eg8KB21lc3NhZ2UYASABKAkSDwoCdG8YAiABKAlIAIgBARIY",
34-
"Cgt0b19jYWxsc2lnbhgDIAEoCUgBiAEBQgUKA190b0IOCgxfdG9fY2FsbHNp",
35-
"Z24iTQoFR3JvdXASJAoEcm9sZRgBIAEoDjIWLm1lc2h0YXN0aWMuTWVtYmVy",
36-
"Um9sZRIeCgR0ZWFtGAIgASgOMhAubWVzaHRhc3RpYy5UZWFtIhkKBlN0YXR1",
37-
"cxIPCgdiYXR0ZXJ5GAEgASgNIjQKB0NvbnRhY3QSEAoIY2FsbHNpZ24YASAB",
38-
"KAkSFwoPZGV2aWNlX2NhbGxzaWduGAIgASgJIl8KA1BMSRISCgpsYXRpdHVk",
39-
"ZV9pGAEgASgPEhMKC2xvbmdpdHVkZV9pGAIgASgPEhAKCGFsdGl0dWRlGAMg",
40-
"ASgFEg0KBXNwZWVkGAQgASgNEg4KBmNvdXJzZRgFIAEoDSrAAQoEVGVhbRIU",
41-
"ChBVbnNwZWNpZmVkX0NvbG9yEAASCQoFV2hpdGUQARIKCgZZZWxsb3cQAhIK",
42-
"CgZPcmFuZ2UQAxILCgdNYWdlbnRhEAQSBwoDUmVkEAUSCgoGTWFyb29uEAYS",
43-
"CgoGUHVycGxlEAcSDQoJRGFya19CbHVlEAgSCAoEQmx1ZRAJEggKBEN5YW4Q",
44-
"ChIICgRUZWFsEAsSCQoFR3JlZW4QDBIOCgpEYXJrX0dyZWVuEA0SCQoFQnJv",
45-
"d24QDip/CgpNZW1iZXJSb2xlEg4KClVuc3BlY2lmZWQQABIOCgpUZWFtTWVt",
46-
"YmVyEAESDAoIVGVhbUxlYWQQAhIGCgJIURADEgoKBlNuaXBlchAEEgkKBU1l",
47-
"ZGljEAUSEwoPRm9yd2FyZE9ic2VydmVyEAYSBwoDUlRPEAcSBgoCSzkQCEJf",
48-
"ChNjb20uZ2Vla3N2aWxsZS5tZXNoQgpBVEFLUHJvdG9zWiJnaXRodWIuY29t",
49-
"L21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1",
50-
"ZnO6AgBiBnByb3RvMw=="));
32+
"CzITLm1lc2h0YXN0aWMuR2VvQ2hhdEgAEhAKBmRldGFpbBgHIAEoDEgAQhEK",
33+
"D3BheWxvYWRfdmFyaWFudCJcCgdHZW9DaGF0Eg8KB21lc3NhZ2UYASABKAkS",
34+
"DwoCdG8YAiABKAlIAIgBARIYCgt0b19jYWxsc2lnbhgDIAEoCUgBiAEBQgUK",
35+
"A190b0IOCgxfdG9fY2FsbHNpZ24iTQoFR3JvdXASJAoEcm9sZRgBIAEoDjIW",
36+
"Lm1lc2h0YXN0aWMuTWVtYmVyUm9sZRIeCgR0ZWFtGAIgASgOMhAubWVzaHRh",
37+
"c3RpYy5UZWFtIhkKBlN0YXR1cxIPCgdiYXR0ZXJ5GAEgASgNIjQKB0NvbnRh",
38+
"Y3QSEAoIY2FsbHNpZ24YASABKAkSFwoPZGV2aWNlX2NhbGxzaWduGAIgASgJ",
39+
"Il8KA1BMSRISCgpsYXRpdHVkZV9pGAEgASgPEhMKC2xvbmdpdHVkZV9pGAIg",
40+
"ASgPEhAKCGFsdGl0dWRlGAMgASgFEg0KBXNwZWVkGAQgASgNEg4KBmNvdXJz",
41+
"ZRgFIAEoDSrAAQoEVGVhbRIUChBVbnNwZWNpZmVkX0NvbG9yEAASCQoFV2hp",
42+
"dGUQARIKCgZZZWxsb3cQAhIKCgZPcmFuZ2UQAxILCgdNYWdlbnRhEAQSBwoD",
43+
"UmVkEAUSCgoGTWFyb29uEAYSCgoGUHVycGxlEAcSDQoJRGFya19CbHVlEAgS",
44+
"CAoEQmx1ZRAJEggKBEN5YW4QChIICgRUZWFsEAsSCQoFR3JlZW4QDBIOCgpE",
45+
"YXJrX0dyZWVuEA0SCQoFQnJvd24QDip/CgpNZW1iZXJSb2xlEg4KClVuc3Bl",
46+
"Y2lmZWQQABIOCgpUZWFtTWVtYmVyEAESDAoIVGVhbUxlYWQQAhIGCgJIURAD",
47+
"EgoKBlNuaXBlchAEEgkKBU1lZGljEAUSEwoPRm9yd2FyZE9ic2VydmVyEAYS",
48+
"BwoDUlRPEAcSBgoCSzkQCEJfChNjb20uZ2Vla3N2aWxsZS5tZXNoQgpBVEFL",
49+
"UHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIU",
50+
"TWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
5151
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
5252
new pbr::FileDescriptor[] { },
5353
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Meshtastic.Protobufs.Team), typeof(global::Meshtastic.Protobufs.MemberRole), }, null, new pbr::GeneratedClrTypeInfo[] {
54-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.TAKPacket), global::Meshtastic.Protobufs.TAKPacket.Parser, new[]{ "IsCompressed", "Contact", "Group", "Status", "Pli", "Chat" }, new[]{ "PayloadVariant" }, null, null, null),
54+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.TAKPacket), global::Meshtastic.Protobufs.TAKPacket.Parser, new[]{ "IsCompressed", "Contact", "Group", "Status", "Pli", "Chat", "Detail" }, new[]{ "PayloadVariant" }, null, null, null),
5555
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.GeoChat), global::Meshtastic.Protobufs.GeoChat.Parser, new[]{ "Message", "To", "ToCallsign" }, new[]{ "To", "ToCallsign" }, null, null, null),
5656
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Group), global::Meshtastic.Protobufs.Group.Parser, new[]{ "Role", "Team" }, null, null, null, null),
5757
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Status), global::Meshtastic.Protobufs.Status.Parser, new[]{ "Battery" }, null, null, null, null),
@@ -245,6 +245,9 @@ public TAKPacket(TAKPacket other) : this() {
245245
case PayloadVariantOneofCase.Chat:
246246
Chat = other.Chat.Clone();
247247
break;
248+
case PayloadVariantOneofCase.Detail:
249+
Detail = other.Detail;
250+
break;
248251
}
249252

250253
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
@@ -352,12 +355,30 @@ public bool IsCompressed {
352355
}
353356
}
354357

358+
/// <summary>Field number for the "detail" field.</summary>
359+
public const int DetailFieldNumber = 7;
360+
/// <summary>
361+
///
362+
/// Generic CoT detail XML
363+
/// May be compressed / truncated by the sender (EUD)
364+
/// </summary>
365+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
366+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
367+
public pb::ByteString Detail {
368+
get { return payloadVariantCase_ == PayloadVariantOneofCase.Detail ? (pb::ByteString) payloadVariant_ : pb::ByteString.Empty; }
369+
set {
370+
payloadVariant_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
371+
payloadVariantCase_ = PayloadVariantOneofCase.Detail;
372+
}
373+
}
374+
355375
private object payloadVariant_;
356376
/// <summary>Enum of possible cases for the "payload_variant" oneof.</summary>
357377
public enum PayloadVariantOneofCase {
358378
None = 0,
359379
Pli = 5,
360380
Chat = 6,
381+
Detail = 7,
361382
}
362383
private PayloadVariantOneofCase payloadVariantCase_ = PayloadVariantOneofCase.None;
363384
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -394,6 +415,7 @@ public bool Equals(TAKPacket other) {
394415
if (!object.Equals(Status, other.Status)) return false;
395416
if (!object.Equals(Pli, other.Pli)) return false;
396417
if (!object.Equals(Chat, other.Chat)) return false;
418+
if (Detail != other.Detail) return false;
397419
if (PayloadVariantCase != other.PayloadVariantCase) return false;
398420
return Equals(_unknownFields, other._unknownFields);
399421
}
@@ -408,6 +430,7 @@ public override int GetHashCode() {
408430
if (status_ != null) hash ^= Status.GetHashCode();
409431
if (payloadVariantCase_ == PayloadVariantOneofCase.Pli) hash ^= Pli.GetHashCode();
410432
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) hash ^= Chat.GetHashCode();
433+
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) hash ^= Detail.GetHashCode();
411434
hash ^= (int) payloadVariantCase_;
412435
if (_unknownFields != null) {
413436
hash ^= _unknownFields.GetHashCode();
@@ -451,6 +474,10 @@ public void WriteTo(pb::CodedOutputStream output) {
451474
output.WriteRawTag(50);
452475
output.WriteMessage(Chat);
453476
}
477+
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
478+
output.WriteRawTag(58);
479+
output.WriteBytes(Detail);
480+
}
454481
if (_unknownFields != null) {
455482
_unknownFields.WriteTo(output);
456483
}
@@ -485,6 +512,10 @@ public void WriteTo(pb::CodedOutputStream output) {
485512
output.WriteRawTag(50);
486513
output.WriteMessage(Chat);
487514
}
515+
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
516+
output.WriteRawTag(58);
517+
output.WriteBytes(Detail);
518+
}
488519
if (_unknownFields != null) {
489520
_unknownFields.WriteTo(ref output);
490521
}
@@ -513,6 +544,9 @@ public int CalculateSize() {
513544
if (payloadVariantCase_ == PayloadVariantOneofCase.Chat) {
514545
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Chat);
515546
}
547+
if (payloadVariantCase_ == PayloadVariantOneofCase.Detail) {
548+
size += 1 + pb::CodedOutputStream.ComputeBytesSize(Detail);
549+
}
516550
if (_unknownFields != null) {
517551
size += _unknownFields.CalculateSize();
518552
}
@@ -559,6 +593,9 @@ public void MergeFrom(TAKPacket other) {
559593
}
560594
Chat.MergeFrom(other.Chat);
561595
break;
596+
case PayloadVariantOneofCase.Detail:
597+
Detail = other.Detail;
598+
break;
562599
}
563600

564601
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
@@ -619,6 +656,10 @@ public void MergeFrom(pb::CodedInputStream input) {
619656
Chat = subBuilder;
620657
break;
621658
}
659+
case 58: {
660+
Detail = input.ReadBytes();
661+
break;
662+
}
622663
}
623664
}
624665
#endif
@@ -677,6 +718,10 @@ public void MergeFrom(pb::CodedInputStream input) {
677718
Chat = subBuilder;
678719
break;
679720
}
721+
case 58: {
722+
Detail = input.ReadBytes();
723+
break;
724+
}
680725
}
681726
}
682727
}

0 commit comments

Comments
 (0)