Skip to content

Commit 43f8efb

Browse files
thebenternthebentern
committed
Update protobufs
1 parent df9c494 commit 43f8efb

23 files changed

+762
-389
lines changed

‎Meshtastic/Generated/Admin.cs‎

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static AdminReflection() {
8383
"ASgFSAASHAoScmVib290X290YV9zZWNvbmRzGF8gASgFSAASGAoOZXhpdF9z",
8484
"aW11bGF0b3IYYCABKAhIABIYCg5yZWJvb3Rfc2Vjb25kcxhhIAEoBUgAEhoK",
8585
"EHNodXRkb3duX3NlY29uZHMYYiABKAVIABIeChRmYWN0b3J5X3Jlc2V0X2Nv",
86-
"bmZpZxhjIAEoBUgAEhYKDG5vZGVkYl9yZXNldBhkIAEoBUgAGlMKCklucHV0",
86+
"bmZpZxhjIAEoBUgAEhYKDG5vZGVkYl9yZXNldBhkIAEoCEgAGlMKCklucHV0",
8787
"RXZlbnQSEgoKZXZlbnRfY29kZRgBIAEoDRIPCgdrYl9jaGFyGAIgASgNEg8K",
8888
"B3RvdWNoX3gYAyABKA0SDwoHdG91Y2hfeRgEIAEoDSLWAQoKQ29uZmlnVHlw",
8989
"ZRIRCg1ERVZJQ0VfQ09ORklHEAASEwoPUE9TSVRJT05fQ09ORklHEAESEAoM",
@@ -103,24 +103,25 @@ static AdminReflection() {
103103
"BRIRCglmcmVxdWVuY3kYAyABKAISEgoKc2hvcnRfbmFtZRgEIAEoCSJmCh5O",
104104
"b2RlUmVtb3RlSGFyZHdhcmVQaW5zUmVzcG9uc2USRAoZbm9kZV9yZW1vdGVf",
105105
"aGFyZHdhcmVfcGlucxgBIAMoCzIhLm1lc2h0YXN0aWMuTm9kZVJlbW90ZUhh",
106-
"cmR3YXJlUGluIlgKDVNoYXJlZENvbnRhY3QSEAoIbm9kZV9udW0YASABKA0S",
106+
"cmR3YXJlUGluInMKDVNoYXJlZENvbnRhY3QSEAoIbm9kZV9udW0YASABKA0S",
107107
"HgoEdXNlchgCIAEoCzIQLm1lc2h0YXN0aWMuVXNlchIVCg1zaG91bGRfaWdu",
108-
"b3JlGAMgASgIIpwCChRLZXlWZXJpZmljYXRpb25BZG1pbhJCCgxtZXNzYWdl",
109-
"X3R5cGUYASABKA4yLC5tZXNodGFzdGljLktleVZlcmlmaWNhdGlvbkFkbWlu",
110-
"Lk1lc3NhZ2VUeXBlEhYKDnJlbW90ZV9ub2RlbnVtGAIgASgNEg0KBW5vbmNl",
111-
"GAMgASgEEhwKD3NlY3VyaXR5X251bWJlchgEIAEoDUgAiAEBImcKC01lc3Nh",
112-
"Z2VUeXBlEhkKFUlOSVRJQVRFX1ZFUklGSUNBVElPThAAEhsKF1BST1ZJREVf",
113-
"U0VDVVJJVFlfTlVNQkVSEAESDQoJRE9fVkVSSUZZEAISEQoNRE9fTk9UX1ZF",
114-
"UklGWRADQhIKEF9zZWN1cml0eV9udW1iZXJCYAoTY29tLmdlZWtzdmlsbGUu",
115-
"bWVzaEILQWRtaW5Qcm90b3NaImdpdGh1Yi5jb20vbWVzaHRhc3RpYy9nby9n",
116-
"ZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3RvYnVmc7oCAGIGcHJvdG8z"));
108+
"b3JlGAMgASgIEhkKEW1hbnVhbGx5X3ZlcmlmaWVkGAQgASgIIpwCChRLZXlW",
109+
"ZXJpZmljYXRpb25BZG1pbhJCCgxtZXNzYWdlX3R5cGUYASABKA4yLC5tZXNo",
110+
"dGFzdGljLktleVZlcmlmaWNhdGlvbkFkbWluLk1lc3NhZ2VUeXBlEhYKDnJl",
111+
"bW90ZV9ub2RlbnVtGAIgASgNEg0KBW5vbmNlGAMgASgEEhwKD3NlY3VyaXR5",
112+
"X251bWJlchgEIAEoDUgAiAEBImcKC01lc3NhZ2VUeXBlEhkKFUlOSVRJQVRF",
113+
"X1ZFUklGSUNBVElPThAAEhsKF1BST1ZJREVfU0VDVVJJVFlfTlVNQkVSEAES",
114+
"DQoJRE9fVkVSSUZZEAISEQoNRE9fTk9UX1ZFUklGWRADQhIKEF9zZWN1cml0",
115+
"eV9udW1iZXJCYQoUb3JnLm1lc2h0YXN0aWMucHJvdG9CC0FkbWluUHJvdG9z",
116+
"WiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIUTWVzaHRh",
117+
"c3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
117118
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
118119
new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.ConnectionStatusReflection.Descriptor, global::Meshtastic.Protobufs.DeviceUiReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
119120
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
120121
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.AdminMessage), global::Meshtastic.Protobufs.AdminMessage.Parser, new[]{ "SessionPasskey", "GetChannelRequest", "GetChannelResponse", "GetOwnerRequest", "GetOwnerResponse", "GetConfigRequest", "GetConfigResponse", "GetModuleConfigRequest", "GetModuleConfigResponse", "GetCannedMessageModuleMessagesRequest", "GetCannedMessageModuleMessagesResponse", "GetDeviceMetadataRequest", "GetDeviceMetadataResponse", "GetRingtoneRequest", "GetRingtoneResponse", "GetDeviceConnectionStatusRequest", "GetDeviceConnectionStatusResponse", "SetHamMode", "GetNodeRemoteHardwarePinsRequest", "GetNodeRemoteHardwarePinsResponse", "EnterDfuModeRequest", "DeleteFileRequest", "SetScale", "BackupPreferences", "RestorePreferences", "RemoveBackupPreferences", "SendInputEvent", "SetOwner", "SetChannel", "SetConfig", "SetModuleConfig", "SetCannedMessageModuleMessages", "SetRingtoneMessage", "RemoveByNodenum", "SetFavoriteNode", "RemoveFavoriteNode", "SetFixedPosition", "RemoveFixedPosition", "SetTimeOnly", "GetUiConfigRequest", "GetUiConfigResponse", "StoreUiConfig", "SetIgnoredNode", "RemoveIgnoredNode", "BeginEditSettings", "CommitEditSettings", "AddContact", "KeyVerification", "FactoryResetDevice", "RebootOtaSeconds", "ExitSimulator", "RebootSeconds", "ShutdownSeconds", "FactoryResetConfig", "NodedbReset" }, new[]{ "PayloadVariant" }, new[]{ typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ConfigType), typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ModuleConfigType), typeof(global::Meshtastic.Protobufs.AdminMessage.Types.BackupLocation) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.AdminMessage.Types.InputEvent), global::Meshtastic.Protobufs.AdminMessage.Types.InputEvent.Parser, new[]{ "EventCode", "KbChar", "TouchX", "TouchY" }, null, null, null, null)}),
121122
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.HamParameters), global::Meshtastic.Protobufs.HamParameters.Parser, new[]{ "CallSign", "TxPower", "Frequency", "ShortName" }, null, null, null, null),
122123
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.NodeRemoteHardwarePinsResponse), global::Meshtastic.Protobufs.NodeRemoteHardwarePinsResponse.Parser, new[]{ "NodeRemoteHardwarePins" }, null, null, null, null),
123-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.SharedContact), global::Meshtastic.Protobufs.SharedContact.Parser, new[]{ "NodeNum", "User", "ShouldIgnore" }, null, null, null, null),
124+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.SharedContact), global::Meshtastic.Protobufs.SharedContact.Parser, new[]{ "NodeNum", "User", "ShouldIgnore", "ManuallyVerified" }, null, null, null, null),
124125
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.KeyVerificationAdmin), global::Meshtastic.Protobufs.KeyVerificationAdmin.Parser, new[]{ "MessageType", "RemoteNodenum", "Nonce", "SecurityNumber" }, new[]{ "SecurityNumber" }, new[]{ typeof(global::Meshtastic.Protobufs.KeyVerificationAdmin.Types.MessageType) }, null, null)
125126
}));
126127
}
@@ -1716,11 +1717,12 @@ public void ClearFactoryResetConfig() {
17161717
/// <summary>
17171718
///
17181719
/// Tell the node to reset the nodedb.
1720+
/// When true, favorites are preserved through reset.
17191721
/// </summary>
17201722
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
17211723
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
1722-
public int NodedbReset {
1723-
get { return HasNodedbReset ? (int) payloadVariant_ : 0; }
1724+
public bool NodedbReset {
1725+
get { return HasNodedbReset ? (bool) payloadVariant_ : false; }
17241726
set {
17251727
payloadVariant_ = value;
17261728
payloadVariantCase_ = PayloadVariantOneofCase.NodedbReset;
@@ -2180,7 +2182,7 @@ public void WriteTo(pb::CodedOutputStream output) {
21802182
}
21812183
if (HasNodedbReset) {
21822184
output.WriteRawTag(160, 6);
2183-
output.WriteInt32(NodedbReset);
2185+
output.WriteBool(NodedbReset);
21842186
}
21852187
if (SessionPasskey.Length != 0) {
21862188
output.WriteRawTag(170, 6);
@@ -2410,7 +2412,7 @@ public void WriteTo(pb::CodedOutputStream output) {
24102412
}
24112413
if (HasNodedbReset) {
24122414
output.WriteRawTag(160, 6);
2413-
output.WriteInt32(NodedbReset);
2415+
output.WriteBool(NodedbReset);
24142416
}
24152417
if (SessionPasskey.Length != 0) {
24162418
output.WriteRawTag(170, 6);
@@ -2589,7 +2591,7 @@ public int CalculateSize() {
25892591
size += 2 + pb::CodedOutputStream.ComputeInt32Size(FactoryResetConfig);
25902592
}
25912593
if (HasNodedbReset) {
2592-
size += 2 + pb::CodedOutputStream.ComputeInt32Size(NodedbReset);
2594+
size += 2 + 1;
25932595
}
25942596
if (_unknownFields != null) {
25952597
size += _unknownFields.CalculateSize();
@@ -3152,7 +3154,7 @@ public void MergeFrom(pb::CodedInputStream input) {
31523154
break;
31533155
}
31543156
case 800: {
3155-
NodedbReset = input.ReadInt32();
3157+
NodedbReset = input.ReadBool();
31563158
break;
31573159
}
31583160
case 810: {
@@ -3486,7 +3488,7 @@ public void MergeFrom(pb::CodedInputStream input) {
34863488
break;
34873489
}
34883490
case 800: {
3489-
NodedbReset = input.ReadInt32();
3491+
NodedbReset = input.ReadBool();
34903492
break;
34913493
}
34923494
case 810: {
@@ -4543,6 +4545,7 @@ public SharedContact(SharedContact other) : this() {
45434545
nodeNum_ = other.nodeNum_;
45444546
user_ = other.user_ != null ? other.user_.Clone() : null;
45454547
shouldIgnore_ = other.shouldIgnore_;
4548+
manuallyVerified_ = other.manuallyVerified_;
45464549
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
45474550
}
45484551

@@ -4600,6 +4603,22 @@ public bool ShouldIgnore {
46004603
}
46014604
}
46024605

4606+
/// <summary>Field number for the "manually_verified" field.</summary>
4607+
public const int ManuallyVerifiedFieldNumber = 4;
4608+
private bool manuallyVerified_;
4609+
/// <summary>
4610+
///
4611+
/// Set the IS_KEY_MANUALLY_VERIFIED bit
4612+
/// </summary>
4613+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
4614+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
4615+
public bool ManuallyVerified {
4616+
get { return manuallyVerified_; }
4617+
set {
4618+
manuallyVerified_ = value;
4619+
}
4620+
}
4621+
46034622
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
46044623
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
46054624
public override bool Equals(object other) {
@@ -4618,6 +4637,7 @@ public bool Equals(SharedContact other) {
46184637
if (NodeNum != other.NodeNum) return false;
46194638
if (!object.Equals(User, other.User)) return false;
46204639
if (ShouldIgnore != other.ShouldIgnore) return false;
4640+
if (ManuallyVerified != other.ManuallyVerified) return false;
46214641
return Equals(_unknownFields, other._unknownFields);
46224642
}
46234643

@@ -4628,6 +4648,7 @@ public override int GetHashCode() {
46284648
if (NodeNum != 0) hash ^= NodeNum.GetHashCode();
46294649
if (user_ != null) hash ^= User.GetHashCode();
46304650
if (ShouldIgnore != false) hash ^= ShouldIgnore.GetHashCode();
4651+
if (ManuallyVerified != false) hash ^= ManuallyVerified.GetHashCode();
46314652
if (_unknownFields != null) {
46324653
hash ^= _unknownFields.GetHashCode();
46334654
}
@@ -4658,6 +4679,10 @@ public void WriteTo(pb::CodedOutputStream output) {
46584679
output.WriteRawTag(24);
46594680
output.WriteBool(ShouldIgnore);
46604681
}
4682+
if (ManuallyVerified != false) {
4683+
output.WriteRawTag(32);
4684+
output.WriteBool(ManuallyVerified);
4685+
}
46614686
if (_unknownFields != null) {
46624687
_unknownFields.WriteTo(output);
46634688
}
@@ -4680,6 +4705,10 @@ public void WriteTo(pb::CodedOutputStream output) {
46804705
output.WriteRawTag(24);
46814706
output.WriteBool(ShouldIgnore);
46824707
}
4708+
if (ManuallyVerified != false) {
4709+
output.WriteRawTag(32);
4710+
output.WriteBool(ManuallyVerified);
4711+
}
46834712
if (_unknownFields != null) {
46844713
_unknownFields.WriteTo(ref output);
46854714
}
@@ -4699,6 +4728,9 @@ public int CalculateSize() {
46994728
if (ShouldIgnore != false) {
47004729
size += 1 + 1;
47014730
}
4731+
if (ManuallyVerified != false) {
4732+
size += 1 + 1;
4733+
}
47024734
if (_unknownFields != null) {
47034735
size += _unknownFields.CalculateSize();
47044736
}
@@ -4723,6 +4755,9 @@ public void MergeFrom(SharedContact other) {
47234755
if (other.ShouldIgnore != false) {
47244756
ShouldIgnore = other.ShouldIgnore;
47254757
}
4758+
if (other.ManuallyVerified != false) {
4759+
ManuallyVerified = other.ManuallyVerified;
4760+
}
47264761
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
47274762
}
47284763

@@ -4757,6 +4792,10 @@ public void MergeFrom(pb::CodedInputStream input) {
47574792
ShouldIgnore = input.ReadBool();
47584793
break;
47594794
}
4795+
case 32: {
4796+
ManuallyVerified = input.ReadBool();
4797+
break;
4798+
}
47604799
}
47614800
}
47624801
#endif
@@ -4791,6 +4830,10 @@ public void MergeFrom(pb::CodedInputStream input) {
47914830
ShouldIgnore = input.ReadBool();
47924831
break;
47934832
}
4833+
case 32: {
4834+
ManuallyVerified = input.ReadBool();
4835+
break;
4836+
}
47944837
}
47954838
}
47964839
}

‎Meshtastic/Generated/Apponly.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ static ApponlyReflection() {
2828
"YXN0aWMvY2hhbm5lbC5wcm90bxoXbWVzaHRhc3RpYy9jb25maWcucHJvdG8i",
2929
"bwoKQ2hhbm5lbFNldBItCghzZXR0aW5ncxgBIAMoCzIbLm1lc2h0YXN0aWMu",
3030
"Q2hhbm5lbFNldHRpbmdzEjIKC2xvcmFfY29uZmlnGAIgASgLMh0ubWVzaHRh",
31-
"c3RpYy5Db25maWcuTG9SYUNvbmZpZ0JiChNjb20uZ2Vla3N2aWxsZS5tZXNo",
32-
"Qg1BcHBPbmx5UHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2Vu",
33-
"ZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
31+
"c3RpYy5Db25maWcuTG9SYUNvbmZpZ0JjChRvcmcubWVzaHRhc3RpYy5wcm90",
32+
"b0INQXBwT25seVByb3Rvc1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dl",
33+
"bmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
3434
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
3535
new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.ConfigReflection.Descriptor, },
3636
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

‎Meshtastic/Generated/Atak.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ static AtakReflection() {
4545
"YXJrX0dyZWVuEA0SCQoFQnJvd24QDip/CgpNZW1iZXJSb2xlEg4KClVuc3Bl",
4646
"Y2lmZWQQABIOCgpUZWFtTWVtYmVyEAESDAoIVGVhbUxlYWQQAhIGCgJIURAD",
4747
"EgoKBlNuaXBlchAEEgkKBU1lZGljEAUSEwoPRm9yd2FyZE9ic2VydmVyEAYS",
48-
"BwoDUlRPEAcSBgoCSzkQCEJfChNjb20uZ2Vla3N2aWxsZS5tZXNoQgpBVEFL",
49-
"UHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIU",
50-
"TWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
48+
"BwoDUlRPEAcSBgoCSzkQCEJgChRvcmcubWVzaHRhc3RpYy5wcm90b0IKQVRB",
49+
"S1Byb3Rvc1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoC",
50+
"FE1lc2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
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[] {

‎Meshtastic/Generated/Cannedmessages.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ static CannedmessagesReflection() {
2626
string.Concat(
2727
"Ch9tZXNodGFzdGljL2Nhbm5lZG1lc3NhZ2VzLnByb3RvEgptZXNodGFzdGlj",
2828
"Ii0KGUNhbm5lZE1lc3NhZ2VNb2R1bGVDb25maWcSEAoIbWVzc2FnZXMYASAB",
29-
"KAlCbgoTY29tLmdlZWtzdmlsbGUubWVzaEIZQ2FubmVkTWVzc2FnZUNvbmZp",
30-
"Z1Byb3Rvc1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoC",
31-
"FE1lc2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
29+
"KAlCbwoUb3JnLm1lc2h0YXN0aWMucHJvdG9CGUNhbm5lZE1lc3NhZ2VDb25m",
30+
"aWdQcm90b3NaImdpdGh1Yi5jb20vbWVzaHRhc3RpYy9nby9nZW5lcmF0ZWSq",
31+
"AhRNZXNodGFzdGljLlByb3RvYnVmc7oCAGIGcHJvdG8z"));
3232
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
3333
new pbr::FileDescriptor[] { },
3434
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

0 commit comments

Comments
 (0)