Skip to content

Commit e900c90

Browse files
authored
Merge pull request #85 from meshtastic/wip
Protos
2 parents e83f785 + 499af03 commit e900c90

File tree

8 files changed

+3556
-777
lines changed

8 files changed

+3556
-777
lines changed

Meshtastic/Generated/Admin.cs

+224-81
Large diffs are not rendered by default.

Meshtastic/Generated/Config.cs

+810-178
Large diffs are not rendered by default.

Meshtastic/Generated/Localonly.cs

+77-25
Original file line numberDiff line numberDiff line change
@@ -26,41 +26,43 @@ static LocalonlyReflection() {
2626
string.Concat(
2727
"ChptZXNodGFzdGljL2xvY2Fsb25seS5wcm90bxIKbWVzaHRhc3RpYxoXbWVz",
2828
"aHRhc3RpYy9jb25maWcucHJvdG8aHm1lc2h0YXN0aWMvbW9kdWxlX2NvbmZp",
29-
"Zy5wcm90byL9AgoLTG9jYWxDb25maWcSLwoGZGV2aWNlGAEgASgLMh8ubWVz",
29+
"Zy5wcm90byKyAwoLTG9jYWxDb25maWcSLwoGZGV2aWNlGAEgASgLMh8ubWVz",
3030
"aHRhc3RpYy5Db25maWcuRGV2aWNlQ29uZmlnEjMKCHBvc2l0aW9uGAIgASgL",
3131
"MiEubWVzaHRhc3RpYy5Db25maWcuUG9zaXRpb25Db25maWcSLQoFcG93ZXIY",
3232
"AyABKAsyHi5tZXNodGFzdGljLkNvbmZpZy5Qb3dlckNvbmZpZxIxCgduZXR3",
3333
"b3JrGAQgASgLMiAubWVzaHRhc3RpYy5Db25maWcuTmV0d29ya0NvbmZpZxIx",
3434
"CgdkaXNwbGF5GAUgASgLMiAubWVzaHRhc3RpYy5Db25maWcuRGlzcGxheUNv",
3535
"bmZpZxIrCgRsb3JhGAYgASgLMh0ubWVzaHRhc3RpYy5Db25maWcuTG9SYUNv",
3636
"bmZpZxI1CglibHVldG9vdGgYByABKAsyIi5tZXNodGFzdGljLkNvbmZpZy5C",
37-
"bHVldG9vdGhDb25maWcSDwoHdmVyc2lvbhgIIAEoDSL7BgoRTG9jYWxNb2R1",
38-
"bGVDb25maWcSMQoEbXF0dBgBIAEoCzIjLm1lc2h0YXN0aWMuTW9kdWxlQ29u",
39-
"ZmlnLk1RVFRDb25maWcSNQoGc2VyaWFsGAIgASgLMiUubWVzaHRhc3RpYy5N",
40-
"b2R1bGVDb25maWcuU2VyaWFsQ29uZmlnElIKFWV4dGVybmFsX25vdGlmaWNh",
41-
"dGlvbhgDIAEoCzIzLm1lc2h0YXN0aWMuTW9kdWxlQ29uZmlnLkV4dGVybmFs",
42-
"Tm90aWZpY2F0aW9uQ29uZmlnEkIKDXN0b3JlX2ZvcndhcmQYBCABKAsyKy5t",
43-
"ZXNodGFzdGljLk1vZHVsZUNvbmZpZy5TdG9yZUZvcndhcmRDb25maWcSPAoK",
44-
"cmFuZ2VfdGVzdBgFIAEoCzIoLm1lc2h0YXN0aWMuTW9kdWxlQ29uZmlnLlJh",
45-
"bmdlVGVzdENvbmZpZxI7Cgl0ZWxlbWV0cnkYBiABKAsyKC5tZXNodGFzdGlj",
46-
"Lk1vZHVsZUNvbmZpZy5UZWxlbWV0cnlDb25maWcSRAoOY2FubmVkX21lc3Nh",
47-
"Z2UYByABKAsyLC5tZXNodGFzdGljLk1vZHVsZUNvbmZpZy5DYW5uZWRNZXNz",
48-
"YWdlQ29uZmlnEjMKBWF1ZGlvGAkgASgLMiQubWVzaHRhc3RpYy5Nb2R1bGVD",
49-
"b25maWcuQXVkaW9Db25maWcSRgoPcmVtb3RlX2hhcmR3YXJlGAogASgLMi0u",
50-
"bWVzaHRhc3RpYy5Nb2R1bGVDb25maWcuUmVtb3RlSGFyZHdhcmVDb25maWcS",
51-
"QgoNbmVpZ2hib3JfaW5mbxgLIAEoCzIrLm1lc2h0YXN0aWMuTW9kdWxlQ29u",
52-
"ZmlnLk5laWdoYm9ySW5mb0NvbmZpZxJIChBhbWJpZW50X2xpZ2h0aW5nGAwg",
53-
"ASgLMi4ubWVzaHRhc3RpYy5Nb2R1bGVDb25maWcuQW1iaWVudExpZ2h0aW5n",
54-
"Q29uZmlnEkgKEGRldGVjdGlvbl9zZW5zb3IYDSABKAsyLi5tZXNodGFzdGlj",
55-
"Lk1vZHVsZUNvbmZpZy5EZXRlY3Rpb25TZW5zb3JDb25maWcSPQoKcGF4Y291",
56-
"bnRlchgOIAEoCzIpLm1lc2h0YXN0aWMuTW9kdWxlQ29uZmlnLlBheGNvdW50",
57-
"ZXJDb25maWcSDwoHdmVyc2lvbhgIIAEoDUJkChNjb20uZ2Vla3N2aWxsZS5t",
58-
"ZXNoQg9Mb2NhbE9ubHlQcm90b3NaImdpdGh1Yi5jb20vbWVzaHRhc3RpYy9n",
59-
"by9nZW5lcmF0ZWSqAhRNZXNodGFzdGljLlByb3RvYnVmc7oCAGIGcHJvdG8z"));
37+
"bHVldG9vdGhDb25maWcSDwoHdmVyc2lvbhgIIAEoDRIzCghzZWN1cml0eRgJ",
38+
"IAEoCzIhLm1lc2h0YXN0aWMuQ29uZmlnLlNlY3VyaXR5Q29uZmlnIvsGChFM",
39+
"b2NhbE1vZHVsZUNvbmZpZxIxCgRtcXR0GAEgASgLMiMubWVzaHRhc3RpYy5N",
40+
"b2R1bGVDb25maWcuTVFUVENvbmZpZxI1CgZzZXJpYWwYAiABKAsyJS5tZXNo",
41+
"dGFzdGljLk1vZHVsZUNvbmZpZy5TZXJpYWxDb25maWcSUgoVZXh0ZXJuYWxf",
42+
"bm90aWZpY2F0aW9uGAMgASgLMjMubWVzaHRhc3RpYy5Nb2R1bGVDb25maWcu",
43+
"RXh0ZXJuYWxOb3RpZmljYXRpb25Db25maWcSQgoNc3RvcmVfZm9yd2FyZBgE",
44+
"IAEoCzIrLm1lc2h0YXN0aWMuTW9kdWxlQ29uZmlnLlN0b3JlRm9yd2FyZENv",
45+
"bmZpZxI8CgpyYW5nZV90ZXN0GAUgASgLMigubWVzaHRhc3RpYy5Nb2R1bGVD",
46+
"b25maWcuUmFuZ2VUZXN0Q29uZmlnEjsKCXRlbGVtZXRyeRgGIAEoCzIoLm1l",
47+
"c2h0YXN0aWMuTW9kdWxlQ29uZmlnLlRlbGVtZXRyeUNvbmZpZxJECg5jYW5u",
48+
"ZWRfbWVzc2FnZRgHIAEoCzIsLm1lc2h0YXN0aWMuTW9kdWxlQ29uZmlnLkNh",
49+
"bm5lZE1lc3NhZ2VDb25maWcSMwoFYXVkaW8YCSABKAsyJC5tZXNodGFzdGlj",
50+
"Lk1vZHVsZUNvbmZpZy5BdWRpb0NvbmZpZxJGCg9yZW1vdGVfaGFyZHdhcmUY",
51+
"CiABKAsyLS5tZXNodGFzdGljLk1vZHVsZUNvbmZpZy5SZW1vdGVIYXJkd2Fy",
52+
"ZUNvbmZpZxJCCg1uZWlnaGJvcl9pbmZvGAsgASgLMisubWVzaHRhc3RpYy5N",
53+
"b2R1bGVDb25maWcuTmVpZ2hib3JJbmZvQ29uZmlnEkgKEGFtYmllbnRfbGln",
54+
"aHRpbmcYDCABKAsyLi5tZXNodGFzdGljLk1vZHVsZUNvbmZpZy5BbWJpZW50",
55+
"TGlnaHRpbmdDb25maWcSSAoQZGV0ZWN0aW9uX3NlbnNvchgNIAEoCzIuLm1l",
56+
"c2h0YXN0aWMuTW9kdWxlQ29uZmlnLkRldGVjdGlvblNlbnNvckNvbmZpZxI9",
57+
"CgpwYXhjb3VudGVyGA4gASgLMikubWVzaHRhc3RpYy5Nb2R1bGVDb25maWcu",
58+
"UGF4Y291bnRlckNvbmZpZxIPCgd2ZXJzaW9uGAggASgNQmQKE2NvbS5nZWVr",
59+
"c3ZpbGxlLm1lc2hCD0xvY2FsT25seVByb3Rvc1oiZ2l0aHViLmNvbS9tZXNo",
60+
"dGFzdGljL2dvL2dlbmVyYXRlZKoCFE1lc2h0YXN0aWMuUHJvdG9idWZzugIA",
61+
"YgZwcm90bzM="));
6062
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
6163
new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
6264
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
63-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.LocalConfig), global::Meshtastic.Protobufs.LocalConfig.Parser, new[]{ "Device", "Position", "Power", "Network", "Display", "Lora", "Bluetooth", "Version" }, null, null, null, null),
65+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.LocalConfig), global::Meshtastic.Protobufs.LocalConfig.Parser, new[]{ "Device", "Position", "Power", "Network", "Display", "Lora", "Bluetooth", "Version", "Security" }, null, null, null, null),
6466
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.LocalModuleConfig), global::Meshtastic.Protobufs.LocalModuleConfig.Parser, new[]{ "Mqtt", "Serial", "ExternalNotification", "StoreForward", "RangeTest", "Telemetry", "CannedMessage", "Audio", "RemoteHardware", "NeighborInfo", "AmbientLighting", "DetectionSensor", "Paxcounter", "Version" }, null, null, null, null)
6567
}));
6668
}
@@ -110,6 +112,7 @@ public LocalConfig(LocalConfig other) : this() {
110112
lora_ = other.lora_ != null ? other.lora_.Clone() : null;
111113
bluetooth_ = other.bluetooth_ != null ? other.bluetooth_.Clone() : null;
112114
version_ = other.version_;
115+
security_ = other.security_ != null ? other.security_.Clone() : null;
113116
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
114117
}
115118

@@ -249,6 +252,22 @@ public uint Version {
249252
}
250253
}
251254

255+
/// <summary>Field number for the "security" field.</summary>
256+
public const int SecurityFieldNumber = 9;
257+
private global::Meshtastic.Protobufs.Config.Types.SecurityConfig security_;
258+
/// <summary>
259+
///
260+
/// The part of the config that is specific to Security settings
261+
/// </summary>
262+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
263+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
264+
public global::Meshtastic.Protobufs.Config.Types.SecurityConfig Security {
265+
get { return security_; }
266+
set {
267+
security_ = value;
268+
}
269+
}
270+
252271
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
253272
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
254273
public override bool Equals(object other) {
@@ -272,6 +291,7 @@ public bool Equals(LocalConfig other) {
272291
if (!object.Equals(Lora, other.Lora)) return false;
273292
if (!object.Equals(Bluetooth, other.Bluetooth)) return false;
274293
if (Version != other.Version) return false;
294+
if (!object.Equals(Security, other.Security)) return false;
275295
return Equals(_unknownFields, other._unknownFields);
276296
}
277297

@@ -287,6 +307,7 @@ public override int GetHashCode() {
287307
if (lora_ != null) hash ^= Lora.GetHashCode();
288308
if (bluetooth_ != null) hash ^= Bluetooth.GetHashCode();
289309
if (Version != 0) hash ^= Version.GetHashCode();
310+
if (security_ != null) hash ^= Security.GetHashCode();
290311
if (_unknownFields != null) {
291312
hash ^= _unknownFields.GetHashCode();
292313
}
@@ -337,6 +358,10 @@ public void WriteTo(pb::CodedOutputStream output) {
337358
output.WriteRawTag(64);
338359
output.WriteUInt32(Version);
339360
}
361+
if (security_ != null) {
362+
output.WriteRawTag(74);
363+
output.WriteMessage(Security);
364+
}
340365
if (_unknownFields != null) {
341366
_unknownFields.WriteTo(output);
342367
}
@@ -379,6 +404,10 @@ public void WriteTo(pb::CodedOutputStream output) {
379404
output.WriteRawTag(64);
380405
output.WriteUInt32(Version);
381406
}
407+
if (security_ != null) {
408+
output.WriteRawTag(74);
409+
output.WriteMessage(Security);
410+
}
382411
if (_unknownFields != null) {
383412
_unknownFields.WriteTo(ref output);
384413
}
@@ -413,6 +442,9 @@ public int CalculateSize() {
413442
if (Version != 0) {
414443
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Version);
415444
}
445+
if (security_ != null) {
446+
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Security);
447+
}
416448
if (_unknownFields != null) {
417449
size += _unknownFields.CalculateSize();
418450
}
@@ -470,6 +502,12 @@ public void MergeFrom(LocalConfig other) {
470502
if (other.Version != 0) {
471503
Version = other.Version;
472504
}
505+
if (other.security_ != null) {
506+
if (security_ == null) {
507+
Security = new global::Meshtastic.Protobufs.Config.Types.SecurityConfig();
508+
}
509+
Security.MergeFrom(other.Security);
510+
}
473511
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
474512
}
475513

@@ -538,6 +576,13 @@ public void MergeFrom(pb::CodedInputStream input) {
538576
Version = input.ReadUInt32();
539577
break;
540578
}
579+
case 74: {
580+
if (security_ == null) {
581+
Security = new global::Meshtastic.Protobufs.Config.Types.SecurityConfig();
582+
}
583+
input.ReadMessage(Security);
584+
break;
585+
}
541586
}
542587
}
543588
#endif
@@ -606,6 +651,13 @@ public void MergeFrom(pb::CodedInputStream input) {
606651
Version = input.ReadUInt32();
607652
break;
608653
}
654+
case 74: {
655+
if (security_ == null) {
656+
Security = new global::Meshtastic.Protobufs.Config.Types.SecurityConfig();
657+
}
658+
input.ReadMessage(Security);
659+
break;
660+
}
609661
}
610662
}
611663
}

0 commit comments

Comments
 (0)