Skip to content

Commit aeae896

Browse files
thebenternthebentern
committed
Update protos
1 parent 19b1b59 commit aeae896

18 files changed

+171
-205
lines changed

‎Meshtastic/Generated/Admin.cs‎

Lines changed: 17 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static AdminReflection() {
2727
"ChZtZXNodGFzdGljL2FkbWluLnByb3RvEgptZXNodGFzdGljGhhtZXNodGFz",
2828
"dGljL2NoYW5uZWwucHJvdG8aF21lc2h0YXN0aWMvY29uZmlnLnByb3RvGiBt",
2929
"ZXNodGFzdGljL2RldmljZV9tZXRhZGF0YS5wcm90bxoVbWVzaHRhc3RpYy9t",
30-
"ZXNoLnByb3RvGh5tZXNodGFzdGljL21vZHVsZV9jb25maWcucHJvdG8i6wwK",
30+
"ZXNoLnByb3RvGh5tZXNodGFzdGljL21vZHVsZV9jb25maWcucHJvdG8irwwK",
3131
"DEFkbWluTWVzc2FnZRIdChNnZXRfY2hhbm5lbF9yZXF1ZXN0GAEgASgNSAAS",
3232
"MwoUZ2V0X2NoYW5uZWxfcmVzcG9uc2UYAiABKAsyEy5tZXNodGFzdGljLkNo",
3333
"YW5uZWxIABIbChFnZXRfb3duZXJfcmVxdWVzdBgDIAEoCEgAEi4KEmdldF9v",
@@ -51,26 +51,25 @@ static AdminReflection() {
5151
"InNldF9jYW5uZWRfbWVzc2FnZV9tb2R1bGVfbWVzc2FnZXMYJCABKAlIABIe",
5252
"ChRzZXRfcmluZ3RvbmVfbWVzc2FnZRglIAEoCUgAEh0KE2JlZ2luX2VkaXRf",
5353
"c2V0dGluZ3MYQCABKAhIABIeChRjb21taXRfZWRpdF9zZXR0aW5ncxhBIAEo",
54-
"CEgAEh0KE2NvbmZpcm1fc2V0X2NoYW5uZWwYQiABKAhIABIbChFjb25maXJt",
55-
"X3NldF9yYWRpbxhDIAEoCEgAEhwKEnJlYm9vdF9vdGFfc2Vjb25kcxhfIAEo",
56-
"BUgAEhgKDmV4aXRfc2ltdWxhdG9yGGAgASgISAASGAoOcmVib290X3NlY29u",
57-
"ZHMYYSABKAVIABIaChBzaHV0ZG93bl9zZWNvbmRzGGIgASgFSAASFwoNZmFj",
58-
"dG9yeV9yZXNldBhjIAEoBUgAEhYKDG5vZGVkYl9yZXNldBhkIAEoBUgAIpUB",
59-
"CgpDb25maWdUeXBlEhEKDURFVklDRV9DT05GSUcQABITCg9QT1NJVElPTl9D",
60-
"T05GSUcQARIQCgxQT1dFUl9DT05GSUcQAhISCg5ORVRXT1JLX0NPTkZJRxAD",
61-
"EhIKDkRJU1BMQVlfQ09ORklHEAQSDwoLTE9SQV9DT05GSUcQBRIUChBCTFVF",
62-
"VE9PVEhfQ09ORklHEAYi0wEKEE1vZHVsZUNvbmZpZ1R5cGUSDwoLTVFUVF9D",
63-
"T05GSUcQABIRCg1TRVJJQUxfQ09ORklHEAESEwoPRVhUTk9USUZfQ09ORklH",
64-
"EAISFwoTU1RPUkVGT1JXQVJEX0NPTkZJRxADEhQKEFJBTkdFVEVTVF9DT05G",
65-
"SUcQBBIUChBURUxFTUVUUllfQ09ORklHEAUSFAoQQ0FOTkVETVNHX0NPTkZJ",
66-
"RxAGEhAKDEFVRElPX0NPTkZJRxAHEhkKFVJFTU9URUhBUkRXQVJFX0NPTkZJ",
67-
"RxAIQhEKD3BheWxvYWRfdmFyaWFudEJfChNjb20uZ2Vla3N2aWxsZS5tZXNo",
68-
"QgtBZG1pblByb3Rvc0gDWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2Vu",
69-
"ZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnNiBnByb3RvMw=="));
54+
"CEgAEhwKEnJlYm9vdF9vdGFfc2Vjb25kcxhfIAEoBUgAEhgKDmV4aXRfc2lt",
55+
"dWxhdG9yGGAgASgISAASGAoOcmVib290X3NlY29uZHMYYSABKAVIABIaChBz",
56+
"aHV0ZG93bl9zZWNvbmRzGGIgASgFSAASFwoNZmFjdG9yeV9yZXNldBhjIAEo",
57+
"BUgAEhYKDG5vZGVkYl9yZXNldBhkIAEoBUgAIpUBCgpDb25maWdUeXBlEhEK",
58+
"DURFVklDRV9DT05GSUcQABITCg9QT1NJVElPTl9DT05GSUcQARIQCgxQT1dF",
59+
"Ul9DT05GSUcQAhISCg5ORVRXT1JLX0NPTkZJRxADEhIKDkRJU1BMQVlfQ09O",
60+
"RklHEAQSDwoLTE9SQV9DT05GSUcQBRIUChBCTFVFVE9PVEhfQ09ORklHEAYi",
61+
"0wEKEE1vZHVsZUNvbmZpZ1R5cGUSDwoLTVFUVF9DT05GSUcQABIRCg1TRVJJ",
62+
"QUxfQ09ORklHEAESEwoPRVhUTk9USUZfQ09ORklHEAISFwoTU1RPUkVGT1JX",
63+
"QVJEX0NPTkZJRxADEhQKEFJBTkdFVEVTVF9DT05GSUcQBBIUChBURUxFTUVU",
64+
"UllfQ09ORklHEAUSFAoQQ0FOTkVETVNHX0NPTkZJRxAGEhAKDEFVRElPX0NP",
65+
"TkZJRxAHEhkKFVJFTU9URUhBUkRXQVJFX0NPTkZJRxAIQhEKD3BheWxvYWRf",
66+
"dmFyaWFudEJiChNjb20uZ2Vla3N2aWxsZS5tZXNoQgtBZG1pblByb3Rvc0gD",
67+
"WiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIUTWVzaHRh",
68+
"c3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
7069
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
7170
new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.DeviceMetadataReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
7271
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
73-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.AdminMessage), global::Meshtastic.Protobufs.AdminMessage.Parser, new[]{ "GetChannelRequest", "GetChannelResponse", "GetOwnerRequest", "GetOwnerResponse", "GetConfigRequest", "GetConfigResponse", "GetModuleConfigRequest", "GetModuleConfigResponse", "GetCannedMessageModuleMessagesRequest", "GetCannedMessageModuleMessagesResponse", "GetDeviceMetadataRequest", "GetDeviceMetadataResponse", "GetRingtoneRequest", "GetRingtoneResponse", "SetOwner", "SetChannel", "SetConfig", "SetModuleConfig", "SetCannedMessageModuleMessages", "SetRingtoneMessage", "BeginEditSettings", "CommitEditSettings", "ConfirmSetChannel", "ConfirmSetRadio", "RebootOtaSeconds", "ExitSimulator", "RebootSeconds", "ShutdownSeconds", "FactoryReset", "NodedbReset" }, new[]{ "PayloadVariant" }, new[]{ typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ConfigType), typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ModuleConfigType) }, null, null)
72+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.AdminMessage), global::Meshtastic.Protobufs.AdminMessage.Parser, new[]{ "GetChannelRequest", "GetChannelResponse", "GetOwnerRequest", "GetOwnerResponse", "GetConfigRequest", "GetConfigResponse", "GetModuleConfigRequest", "GetModuleConfigResponse", "GetCannedMessageModuleMessagesRequest", "GetCannedMessageModuleMessagesResponse", "GetDeviceMetadataRequest", "GetDeviceMetadataResponse", "GetRingtoneRequest", "GetRingtoneResponse", "SetOwner", "SetChannel", "SetConfig", "SetModuleConfig", "SetCannedMessageModuleMessages", "SetRingtoneMessage", "BeginEditSettings", "CommitEditSettings", "RebootOtaSeconds", "ExitSimulator", "RebootSeconds", "ShutdownSeconds", "FactoryReset", "NodedbReset" }, new[]{ "PayloadVariant" }, new[]{ typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ConfigType), typeof(global::Meshtastic.Protobufs.AdminMessage.Types.ModuleConfigType) }, null, null)
7473
}));
7574
}
7675
#endregion
@@ -184,12 +183,6 @@ public AdminMessage(AdminMessage other) : this() {
184183
case PayloadVariantOneofCase.CommitEditSettings:
185184
CommitEditSettings = other.CommitEditSettings;
186185
break;
187-
case PayloadVariantOneofCase.ConfirmSetChannel:
188-
ConfirmSetChannel = other.ConfirmSetChannel;
189-
break;
190-
case PayloadVariantOneofCase.ConfirmSetRadio:
191-
ConfirmSetRadio = other.ConfirmSetRadio;
192-
break;
193186
case PayloadVariantOneofCase.RebootOtaSeconds:
194187
RebootOtaSeconds = other.RebootOtaSeconds;
195188
break;
@@ -577,41 +570,6 @@ public bool CommitEditSettings {
577570
}
578571
}
579572

580-
/// <summary>Field number for the "confirm_set_channel" field.</summary>
581-
public const int ConfirmSetChannelFieldNumber = 66;
582-
/// <summary>
583-
///
584-
/// Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again.
585-
/// Therefore if setting either of these properties remotely, you must send a confirm_xxx message within 10 minutes.
586-
/// If you fail to do so, the radio will assume loss of comms and revert your changes.
587-
/// These messages are optional when changing the local node.
588-
/// </summary>
589-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
590-
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
591-
public bool ConfirmSetChannel {
592-
get { return payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetChannel ? (bool) payloadVariant_ : false; }
593-
set {
594-
payloadVariant_ = value;
595-
payloadVariantCase_ = PayloadVariantOneofCase.ConfirmSetChannel;
596-
}
597-
}
598-
599-
/// <summary>Field number for the "confirm_set_radio" field.</summary>
600-
public const int ConfirmSetRadioFieldNumber = 67;
601-
/// <summary>
602-
///
603-
/// TODO: REPLACE
604-
/// </summary>
605-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
606-
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
607-
public bool ConfirmSetRadio {
608-
get { return payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetRadio ? (bool) payloadVariant_ : false; }
609-
set {
610-
payloadVariant_ = value;
611-
payloadVariantCase_ = PayloadVariantOneofCase.ConfirmSetRadio;
612-
}
613-
}
614-
615573
/// <summary>Field number for the "reboot_ota_seconds" field.</summary>
616574
public const int RebootOtaSecondsFieldNumber = 95;
617575
/// <summary>
@@ -736,8 +694,6 @@ public enum PayloadVariantOneofCase {
736694
SetRingtoneMessage = 37,
737695
BeginEditSettings = 64,
738696
CommitEditSettings = 65,
739-
ConfirmSetChannel = 66,
740-
ConfirmSetRadio = 67,
741697
RebootOtaSeconds = 95,
742698
ExitSimulator = 96,
743699
RebootSeconds = 97,
@@ -796,8 +752,6 @@ public bool Equals(AdminMessage other) {
796752
if (SetRingtoneMessage != other.SetRingtoneMessage) return false;
797753
if (BeginEditSettings != other.BeginEditSettings) return false;
798754
if (CommitEditSettings != other.CommitEditSettings) return false;
799-
if (ConfirmSetChannel != other.ConfirmSetChannel) return false;
800-
if (ConfirmSetRadio != other.ConfirmSetRadio) return false;
801755
if (RebootOtaSeconds != other.RebootOtaSeconds) return false;
802756
if (ExitSimulator != other.ExitSimulator) return false;
803757
if (RebootSeconds != other.RebootSeconds) return false;
@@ -834,8 +788,6 @@ public override int GetHashCode() {
834788
if (payloadVariantCase_ == PayloadVariantOneofCase.SetRingtoneMessage) hash ^= SetRingtoneMessage.GetHashCode();
835789
if (payloadVariantCase_ == PayloadVariantOneofCase.BeginEditSettings) hash ^= BeginEditSettings.GetHashCode();
836790
if (payloadVariantCase_ == PayloadVariantOneofCase.CommitEditSettings) hash ^= CommitEditSettings.GetHashCode();
837-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetChannel) hash ^= ConfirmSetChannel.GetHashCode();
838-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetRadio) hash ^= ConfirmSetRadio.GetHashCode();
839791
if (payloadVariantCase_ == PayloadVariantOneofCase.RebootOtaSeconds) hash ^= RebootOtaSeconds.GetHashCode();
840792
if (payloadVariantCase_ == PayloadVariantOneofCase.ExitSimulator) hash ^= ExitSimulator.GetHashCode();
841793
if (payloadVariantCase_ == PayloadVariantOneofCase.RebootSeconds) hash ^= RebootSeconds.GetHashCode();
@@ -949,14 +901,6 @@ public void WriteTo(pb::CodedOutputStream output) {
949901
output.WriteRawTag(136, 4);
950902
output.WriteBool(CommitEditSettings);
951903
}
952-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetChannel) {
953-
output.WriteRawTag(144, 4);
954-
output.WriteBool(ConfirmSetChannel);
955-
}
956-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetRadio) {
957-
output.WriteRawTag(152, 4);
958-
output.WriteBool(ConfirmSetRadio);
959-
}
960904
if (payloadVariantCase_ == PayloadVariantOneofCase.RebootOtaSeconds) {
961905
output.WriteRawTag(248, 5);
962906
output.WriteInt32(RebootOtaSeconds);
@@ -1079,14 +1023,6 @@ public void WriteTo(pb::CodedOutputStream output) {
10791023
output.WriteRawTag(136, 4);
10801024
output.WriteBool(CommitEditSettings);
10811025
}
1082-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetChannel) {
1083-
output.WriteRawTag(144, 4);
1084-
output.WriteBool(ConfirmSetChannel);
1085-
}
1086-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetRadio) {
1087-
output.WriteRawTag(152, 4);
1088-
output.WriteBool(ConfirmSetRadio);
1089-
}
10901026
if (payloadVariantCase_ == PayloadVariantOneofCase.RebootOtaSeconds) {
10911027
output.WriteRawTag(248, 5);
10921028
output.WriteInt32(RebootOtaSeconds);
@@ -1187,12 +1123,6 @@ public int CalculateSize() {
11871123
if (payloadVariantCase_ == PayloadVariantOneofCase.CommitEditSettings) {
11881124
size += 2 + 1;
11891125
}
1190-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetChannel) {
1191-
size += 2 + 1;
1192-
}
1193-
if (payloadVariantCase_ == PayloadVariantOneofCase.ConfirmSetRadio) {
1194-
size += 2 + 1;
1195-
}
11961126
if (payloadVariantCase_ == PayloadVariantOneofCase.RebootOtaSeconds) {
11971127
size += 2 + pb::CodedOutputStream.ComputeInt32Size(RebootOtaSeconds);
11981128
}
@@ -1317,12 +1247,6 @@ public void MergeFrom(AdminMessage other) {
13171247
case PayloadVariantOneofCase.CommitEditSettings:
13181248
CommitEditSettings = other.CommitEditSettings;
13191249
break;
1320-
case PayloadVariantOneofCase.ConfirmSetChannel:
1321-
ConfirmSetChannel = other.ConfirmSetChannel;
1322-
break;
1323-
case PayloadVariantOneofCase.ConfirmSetRadio:
1324-
ConfirmSetRadio = other.ConfirmSetRadio;
1325-
break;
13261250
case PayloadVariantOneofCase.RebootOtaSeconds:
13271251
RebootOtaSeconds = other.RebootOtaSeconds;
13281252
break;
@@ -1493,14 +1417,6 @@ public void MergeFrom(pb::CodedInputStream input) {
14931417
CommitEditSettings = input.ReadBool();
14941418
break;
14951419
}
1496-
case 528: {
1497-
ConfirmSetChannel = input.ReadBool();
1498-
break;
1499-
}
1500-
case 536: {
1501-
ConfirmSetRadio = input.ReadBool();
1502-
break;
1503-
}
15041420
case 760: {
15051421
RebootOtaSeconds = input.ReadInt32();
15061422
break;
@@ -1675,14 +1591,6 @@ public void MergeFrom(pb::CodedInputStream input) {
16751591
CommitEditSettings = input.ReadBool();
16761592
break;
16771593
}
1678-
case 528: {
1679-
ConfirmSetChannel = input.ReadBool();
1680-
break;
1681-
}
1682-
case 536: {
1683-
ConfirmSetRadio = input.ReadBool();
1684-
break;
1685-
}
16861594
case 760: {
16871595
RebootOtaSeconds = input.ReadInt32();
16881596
break;

‎Meshtastic/Generated/Apponly.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ static ApponlyReflection() {
2828
"YXN0aWMvY2hhbm5lbC5wcm90bxoXbWVzaHRhc3RpYy9jb25maWcucHJvdG8i",
2929
"bwoKQ2hhbm5lbFNldBItCghzZXR0aW5ncxgBIAMoCzIbLm1lc2h0YXN0aWMu",
3030
"Q2hhbm5lbFNldHRpbmdzEjIKC2xvcmFfY29uZmlnGAIgASgLMh0ubWVzaHRh",
31-
"c3RpYy5Db25maWcuTG9SYUNvbmZpZ0JhChNjb20uZ2Vla3N2aWxsZS5tZXNo",
31+
"c3RpYy5Db25maWcuTG9SYUNvbmZpZ0JkChNjb20uZ2Vla3N2aWxsZS5tZXNo",
3232
"Qg1BcHBPbmx5UHJvdG9zSANaImdpdGh1Yi5jb20vbWVzaHRhc3RpYy9nby9n",
33-
"ZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3RvYnVmc2IGcHJvdG8z"));
33+
"ZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3RvYnVmc7oCAGIGcHJvdG8z"));
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/Cannedmessages.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ static CannedmessagesReflection() {
2626
string.Concat(
2727
"Ch9tZXNodGFzdGljL2Nhbm5lZG1lc3NhZ2VzLnByb3RvEgptZXNodGFzdGlj",
2828
"Ii0KGUNhbm5lZE1lc3NhZ2VNb2R1bGVDb25maWcSEAoIbWVzc2FnZXMYASAB",
29-
"KAlCbQoTY29tLmdlZWtzdmlsbGUubWVzaEIZQ2FubmVkTWVzc2FnZUNvbmZp",
29+
"KAlCcAoTY29tLmdlZWtzdmlsbGUubWVzaEIZQ2FubmVkTWVzc2FnZUNvbmZp",
3030
"Z1Byb3Rvc0gDWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVk",
31-
"qgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnNiBnByb3RvMw=="));
31+
"qgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
3232
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
3333
new pbr::FileDescriptor[] { },
3434
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

‎Meshtastic/Generated/Channel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ static ChannelReflection() {
3131
"bm5lbBINCgVpbmRleBgBIAEoBRItCghzZXR0aW5ncxgCIAEoCzIbLm1lc2h0",
3232
"YXN0aWMuQ2hhbm5lbFNldHRpbmdzEiYKBHJvbGUYAyABKA4yGC5tZXNodGFz",
3333
"dGljLkNoYW5uZWwuUm9sZSIwCgRSb2xlEgwKCERJU0FCTEVEEAASCwoHUFJJ",
34-
"TUFSWRABEg0KCVNFQ09OREFSWRACQmEKE2NvbS5nZWVrc3ZpbGxlLm1lc2hC",
34+
"TUFSWRABEg0KCVNFQ09OREFSWRACQmQKE2NvbS5nZWVrc3ZpbGxlLm1lc2hC",
3535
"DUNoYW5uZWxQcm90b3NIA1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dl",
36-
"bmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZzYgZwcm90bzM="));
36+
"bmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
3737
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
3838
new pbr::FileDescriptor[] { },
3939
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {

0 commit comments

Comments
 (0)