Skip to content

Commit 1a62342

Browse files
committed
Update them protos!
1 parent 1ee9df6 commit 1a62342

File tree

8 files changed

+7527
-3856
lines changed

8 files changed

+7527
-3856
lines changed

Meshtastic/Generated/Admin.cs

Lines changed: 881 additions & 47 deletions
Large diffs are not rendered by default.

Meshtastic/Generated/Config.cs

Lines changed: 217 additions & 98 deletions
Large diffs are not rendered by default.

Meshtastic/Generated/DeviceUi.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ static DeviceUiReflection() {
4545
"ASgFEhAKCGxhdGl0dWRlGAIgASgFEhEKCWxvbmdpdHVkZRgDIAEoBSJMCgNN",
4646
"YXASIgoEaG9tZRgBIAEoCzIULm1lc2h0YXN0aWMuR2VvUG9pbnQSDQoFc3R5",
4747
"bGUYAiABKAkSEgoKZm9sbG93X2dwcxgDIAEoCColCgVUaGVtZRIICgREQVJL",
48-
"EAASCQoFTElHSFQQARIHCgNSRUQQAiqaAgoITGFuZ3VhZ2USCwoHRU5HTElT",
48+
"EAASCQoFTElHSFQQARIHCgNSRUQQAiqpAgoITGFuZ3VhZ2USCwoHRU5HTElT",
4949
"SBAAEgoKBkZSRU5DSBABEgoKBkdFUk1BThACEgsKB0lUQUxJQU4QAxIOCgpQ",
5050
"T1JUVUdVRVNFEAQSCwoHU1BBTklTSBAFEgsKB1NXRURJU0gQBhILCgdGSU5O",
5151
"SVNIEAcSCgoGUE9MSVNIEAgSCwoHVFVSS0lTSBAJEgsKB1NFUkJJQU4QChIL",
5252
"CgdSVVNTSUFOEAsSCQoFRFVUQ0gQDBIJCgVHUkVFSxANEg0KCU5PUldFR0lB",
53-
"ThAOEg0KCVNMT1ZFTklBThAPEg0KCVVLUkFJTklBThAQEhYKElNJTVBMSUZJ",
54-
"RURfQ0hJTkVTRRAeEhcKE1RSQURJVElPTkFMX0NISU5FU0UQH0JjChNjb20u",
55-
"Z2Vla3N2aWxsZS5tZXNoQg5EZXZpY2VVSVByb3Rvc1oiZ2l0aHViLmNvbS9t",
56-
"ZXNodGFzdGljL2dvL2dlbmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZz",
57-
"ugIAYgZwcm90bzM="));
53+
"ThAOEg0KCVNMT1ZFTklBThAPEg0KCVVLUkFJTklBThAQEg0KCUJVTEdBUklB",
54+
"ThAREhYKElNJTVBMSUZJRURfQ0hJTkVTRRAeEhcKE1RSQURJVElPTkFMX0NI",
55+
"SU5FU0UQH0JjChNjb20uZ2Vla3N2aWxsZS5tZXNoQg5EZXZpY2VVSVByb3Rv",
56+
"c1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoCFE1lc2h0",
57+
"YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
5858
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
5959
new pbr::FileDescriptor[] { },
6060
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Meshtastic.Protobufs.Theme), typeof(global::Meshtastic.Protobufs.Language), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -179,6 +179,11 @@ public enum Language {
179179
[pbr::OriginalName("UKRAINIAN")] Ukrainian = 16,
180180
/// <summary>
181181
///
182+
/// Bulgarian
183+
/// </summary>
184+
[pbr::OriginalName("BULGARIAN")] Bulgarian = 17,
185+
/// <summary>
186+
///
182187
/// Simplified Chinese (experimental)
183188
/// </summary>
184189
[pbr::OriginalName("SIMPLIFIED_CHINESE")] SimplifiedChinese = 30,

Meshtastic/Generated/Mesh.cs

Lines changed: 5450 additions & 3566 deletions
Large diffs are not rendered by default.

Meshtastic/Generated/ModuleConfig.cs

Lines changed: 130 additions & 89 deletions
Large diffs are not rendered by default.

Meshtastic/Generated/Mqtt.cs

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static MqttReflection() {
2828
"aWMvY29uZmlnLnByb3RvGhVtZXNodGFzdGljL21lc2gucHJvdG8iYQoPU2Vy",
2929
"dmljZUVudmVsb3BlEiYKBnBhY2tldBgBIAEoCzIWLm1lc2h0YXN0aWMuTWVz",
3030
"aFBhY2tldBISCgpjaGFubmVsX2lkGAIgASgJEhIKCmdhdGV3YXlfaWQYAyAB",
31-
"KAkivAMKCU1hcFJlcG9ydBIRCglsb25nX25hbWUYASABKAkSEgoKc2hvcnRf",
31+
"KAki3wMKCU1hcFJlcG9ydBIRCglsb25nX25hbWUYASABKAkSEgoKc2hvcnRf",
3232
"bmFtZRgCIAEoCRIyCgRyb2xlGAMgASgOMiQubWVzaHRhc3RpYy5Db25maWcu",
3333
"RGV2aWNlQ29uZmlnLlJvbGUSKwoIaHdfbW9kZWwYBCABKA4yGS5tZXNodGFz",
3434
"dGljLkhhcmR3YXJlTW9kZWwSGAoQZmlybXdhcmVfdmVyc2lvbhgFIAEoCRI4",
@@ -37,15 +37,16 @@ static MqttReflection() {
3737
"Yy5Db25maWcuTG9SYUNvbmZpZy5Nb2RlbVByZXNldBIbChNoYXNfZGVmYXVs",
3838
"dF9jaGFubmVsGAggASgIEhIKCmxhdGl0dWRlX2kYCSABKA8SEwoLbG9uZ2l0",
3939
"dWRlX2kYCiABKA8SEAoIYWx0aXR1ZGUYCyABKAUSGgoScG9zaXRpb25fcHJl",
40-
"Y2lzaW9uGAwgASgNEh4KFm51bV9vbmxpbmVfbG9jYWxfbm9kZXMYDSABKA1C",
41-
"XwoTY29tLmdlZWtzdmlsbGUubWVzaEIKTVFUVFByb3Rvc1oiZ2l0aHViLmNv",
42-
"bS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9i",
43-
"dWZzugIAYgZwcm90bzM="));
40+
"Y2lzaW9uGAwgASgNEh4KFm51bV9vbmxpbmVfbG9jYWxfbm9kZXMYDSABKA0S",
41+
"IQoZaGFzX29wdGVkX3JlcG9ydF9sb2NhdGlvbhgOIAEoCEJfChNjb20uZ2Vl",
42+
"a3N2aWxsZS5tZXNoQgpNUVRUUHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0",
43+
"aWMvZ28vZ2VuZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnBy",
44+
"b3RvMw=="));
4445
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4546
new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, },
4647
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
4748
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.ServiceEnvelope), global::Meshtastic.Protobufs.ServiceEnvelope.Parser, new[]{ "Packet", "ChannelId", "GatewayId" }, null, null, null, null),
48-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.MapReport), global::Meshtastic.Protobufs.MapReport.Parser, new[]{ "LongName", "ShortName", "Role", "HwModel", "FirmwareVersion", "Region", "ModemPreset", "HasDefaultChannel", "LatitudeI", "LongitudeI", "Altitude", "PositionPrecision", "NumOnlineLocalNodes" }, null, null, null, null)
49+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.MapReport), global::Meshtastic.Protobufs.MapReport.Parser, new[]{ "LongName", "ShortName", "Role", "HwModel", "FirmwareVersion", "Region", "ModemPreset", "HasDefaultChannel", "LatitudeI", "LongitudeI", "Altitude", "PositionPrecision", "NumOnlineLocalNodes", "HasOptedReportLocation" }, null, null, null, null)
4950
}));
5051
}
5152
#endregion
@@ -403,6 +404,7 @@ public MapReport(MapReport other) : this() {
403404
altitude_ = other.altitude_;
404405
positionPrecision_ = other.positionPrecision_;
405406
numOnlineLocalNodes_ = other.numOnlineLocalNodes_;
407+
hasOptedReportLocation_ = other.hasOptedReportLocation_;
406408
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
407409
}
408410

@@ -622,6 +624,23 @@ public uint NumOnlineLocalNodes {
622624
}
623625
}
624626

627+
/// <summary>Field number for the "has_opted_report_location" field.</summary>
628+
public const int HasOptedReportLocationFieldNumber = 14;
629+
private bool hasOptedReportLocation_;
630+
/// <summary>
631+
///
632+
/// User has opted in to share their location (map report) with the mqtt server
633+
/// Controlled by map_report.should_report_location
634+
/// </summary>
635+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
636+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
637+
public bool HasOptedReportLocation {
638+
get { return hasOptedReportLocation_; }
639+
set {
640+
hasOptedReportLocation_ = value;
641+
}
642+
}
643+
625644
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
626645
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
627646
public override bool Equals(object other) {
@@ -650,6 +669,7 @@ public bool Equals(MapReport other) {
650669
if (Altitude != other.Altitude) return false;
651670
if (PositionPrecision != other.PositionPrecision) return false;
652671
if (NumOnlineLocalNodes != other.NumOnlineLocalNodes) return false;
672+
if (HasOptedReportLocation != other.HasOptedReportLocation) return false;
653673
return Equals(_unknownFields, other._unknownFields);
654674
}
655675

@@ -670,6 +690,7 @@ public override int GetHashCode() {
670690
if (Altitude != 0) hash ^= Altitude.GetHashCode();
671691
if (PositionPrecision != 0) hash ^= PositionPrecision.GetHashCode();
672692
if (NumOnlineLocalNodes != 0) hash ^= NumOnlineLocalNodes.GetHashCode();
693+
if (HasOptedReportLocation != false) hash ^= HasOptedReportLocation.GetHashCode();
673694
if (_unknownFields != null) {
674695
hash ^= _unknownFields.GetHashCode();
675696
}
@@ -740,6 +761,10 @@ public void WriteTo(pb::CodedOutputStream output) {
740761
output.WriteRawTag(104);
741762
output.WriteUInt32(NumOnlineLocalNodes);
742763
}
764+
if (HasOptedReportLocation != false) {
765+
output.WriteRawTag(112);
766+
output.WriteBool(HasOptedReportLocation);
767+
}
743768
if (_unknownFields != null) {
744769
_unknownFields.WriteTo(output);
745770
}
@@ -802,6 +827,10 @@ public void WriteTo(pb::CodedOutputStream output) {
802827
output.WriteRawTag(104);
803828
output.WriteUInt32(NumOnlineLocalNodes);
804829
}
830+
if (HasOptedReportLocation != false) {
831+
output.WriteRawTag(112);
832+
output.WriteBool(HasOptedReportLocation);
833+
}
805834
if (_unknownFields != null) {
806835
_unknownFields.WriteTo(ref output);
807836
}
@@ -851,6 +880,9 @@ public int CalculateSize() {
851880
if (NumOnlineLocalNodes != 0) {
852881
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(NumOnlineLocalNodes);
853882
}
883+
if (HasOptedReportLocation != false) {
884+
size += 1 + 1;
885+
}
854886
if (_unknownFields != null) {
855887
size += _unknownFields.CalculateSize();
856888
}
@@ -902,6 +934,9 @@ public void MergeFrom(MapReport other) {
902934
if (other.NumOnlineLocalNodes != 0) {
903935
NumOnlineLocalNodes = other.NumOnlineLocalNodes;
904936
}
937+
if (other.HasOptedReportLocation != false) {
938+
HasOptedReportLocation = other.HasOptedReportLocation;
939+
}
905940
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
906941
}
907942

@@ -973,6 +1008,10 @@ public void MergeFrom(pb::CodedInputStream input) {
9731008
NumOnlineLocalNodes = input.ReadUInt32();
9741009
break;
9751010
}
1011+
case 112: {
1012+
HasOptedReportLocation = input.ReadBool();
1013+
break;
1014+
}
9761015
}
9771016
}
9781017
#endif
@@ -1044,6 +1083,10 @@ public void MergeFrom(pb::CodedInputStream input) {
10441083
NumOnlineLocalNodes = input.ReadUInt32();
10451084
break;
10461085
}
1086+
case 112: {
1087+
HasOptedReportLocation = input.ReadBool();
1088+
break;
1089+
}
10471090
}
10481091
}
10491092
}

Meshtastic/Generated/Portnums.cs

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ public static partial class PortnumsReflection {
2424
static PortnumsReflection() {
2525
byte[] descriptorData = global::System.Convert.FromBase64String(
2626
string.Concat(
27-
"ChltZXNodGFzdGljL3BvcnRudW1zLnByb3RvEgptZXNodGFzdGljKssECgdQ",
27+
"ChltZXNodGFzdGljL3BvcnRudW1zLnByb3RvEgptZXNodGFzdGljKuUECgdQ",
2828
"b3J0TnVtEg8KC1VOS05PV05fQVBQEAASFAoQVEVYVF9NRVNTQUdFX0FQUBAB",
2929
"EhcKE1JFTU9URV9IQVJEV0FSRV9BUFAQAhIQCgxQT1NJVElPTl9BUFAQAxIQ",
3030
"CgxOT0RFSU5GT19BUFAQBBIPCgtST1VUSU5HX0FQUBAFEg0KCUFETUlOX0FQ",
3131
"UBAGEh8KG1RFWFRfTUVTU0FHRV9DT01QUkVTU0VEX0FQUBAHEhAKDFdBWVBP",
3232
"SU5UX0FQUBAIEg0KCUFVRElPX0FQUBAJEhgKFERFVEVDVElPTl9TRU5TT1Jf",
33-
"QVBQEAoSDQoJQUxFUlRfQVBQEAsSDQoJUkVQTFlfQVBQECASEQoNSVBfVFVO",
34-
"TkVMX0FQUBAhEhIKDlBBWENPVU5URVJfQVBQECISDgoKU0VSSUFMX0FQUBBA",
35-
"EhUKEVNUT1JFX0ZPUldBUkRfQVBQEEESEgoOUkFOR0VfVEVTVF9BUFAQQhIR",
36-
"Cg1URUxFTUVUUllfQVBQEEMSCwoHWlBTX0FQUBBEEhEKDVNJTVVMQVRPUl9B",
37-
"UFAQRRISCg5UUkFDRVJPVVRFX0FQUBBGEhQKEE5FSUdIQk9SSU5GT19BUFAQ",
38-
"RxIPCgtBVEFLX1BMVUdJThBIEhIKDk1BUF9SRVBPUlRfQVBQEEkSEwoPUE9X",
39-
"RVJTVFJFU1NfQVBQEEoSGAoUUkVUSUNVTFVNX1RVTk5FTF9BUFAQTBIQCgtQ",
40-
"UklWQVRFX0FQUBCAAhITCg5BVEFLX0ZPUldBUkRFUhCBAhIICgNNQVgQ/wNC",
41-
"XQoTY29tLmdlZWtzdmlsbGUubWVzaEIIUG9ydG51bXNaImdpdGh1Yi5jb20v",
42-
"bWVzaHRhc3RpYy9nby9nZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3RvYnVm",
43-
"c7oCAGIGcHJvdG8z"));
33+
"QVBQEAoSDQoJQUxFUlRfQVBQEAsSGAoUS0VZX1ZFUklGSUNBVElPTl9BUFAQ",
34+
"DBINCglSRVBMWV9BUFAQIBIRCg1JUF9UVU5ORUxfQVBQECESEgoOUEFYQ09V",
35+
"TlRFUl9BUFAQIhIOCgpTRVJJQUxfQVBQEEASFQoRU1RPUkVfRk9SV0FSRF9B",
36+
"UFAQQRISCg5SQU5HRV9URVNUX0FQUBBCEhEKDVRFTEVNRVRSWV9BUFAQQxIL",
37+
"CgdaUFNfQVBQEEQSEQoNU0lNVUxBVE9SX0FQUBBFEhIKDlRSQUNFUk9VVEVf",
38+
"QVBQEEYSFAoQTkVJR0hCT1JJTkZPX0FQUBBHEg8KC0FUQUtfUExVR0lOEEgS",
39+
"EgoOTUFQX1JFUE9SVF9BUFAQSRITCg9QT1dFUlNUUkVTU19BUFAQShIYChRS",
40+
"RVRJQ1VMVU1fVFVOTkVMX0FQUBBMEhAKC1BSSVZBVEVfQVBQEIACEhMKDkFU",
41+
"QUtfRk9SV0FSREVSEIECEggKA01BWBD/A0JdChNjb20uZ2Vla3N2aWxsZS5t",
42+
"ZXNoQghQb3J0bnVtc1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dlbmVy",
43+
"YXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
4444
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4545
new pbr::FileDescriptor[] { },
4646
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Meshtastic.Protobufs.PortNum), }, null, null));
@@ -154,6 +154,11 @@ public enum PortNum {
154154
[pbr::OriginalName("ALERT_APP")] AlertApp = 11,
155155
/// <summary>
156156
///
157+
/// Module/port for handling key verification requests.
158+
/// </summary>
159+
[pbr::OriginalName("KEY_VERIFICATION_APP")] KeyVerificationApp = 12,
160+
/// <summary>
161+
///
157162
/// Provides a 'ping' service that replies to any packet it receives.
158163
/// Also serves as a small example module.
159164
/// ENCODING: ASCII Plaintext

0 commit comments

Comments
 (0)