Skip to content

Commit efa5301

Browse files
thebenternthebentern
authored
Merge pull request #88 from meshtastic/wip
Protos 2.5
2 parents 13bf2f5 + 8b14ed3 commit efa5301

File tree

3 files changed

+252
-154
lines changed

3 files changed

+252
-154
lines changed

‎Meshtastic/Generated/Config.cs

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static partial class ConfigReflection {
2424
static ConfigReflection() {
2525
byte[] descriptorData = global::System.Convert.FromBase64String(
2626
string.Concat(
27-
"ChdtZXNodGFzdGljL2NvbmZpZy5wcm90bxIKbWVzaHRhc3RpYyLJJAoGQ29u",
27+
"ChdtZXNodGFzdGljL2NvbmZpZy5wcm90bxIKbWVzaHRhc3RpYyLkJAoGQ29u",
2828
"ZmlnEjEKBmRldmljZRgBIAEoCzIfLm1lc2h0YXN0aWMuQ29uZmlnLkRldmlj",
2929
"ZUNvbmZpZ0gAEjUKCHBvc2l0aW9uGAIgASgLMiEubWVzaHRhc3RpYy5Db25m",
3030
"aWcuUG9zaXRpb25Db25maWdIABIvCgVwb3dlchgDIAEoCzIeLm1lc2h0YXN0",
@@ -100,7 +100,7 @@ static ConfigReflection() {
100100
"YXRpb24SDQoJREVHUkVFU18wEAASDgoKREVHUkVFU185MBABEg8KC0RFR1JF",
101101
"RVNfMTgwEAISDwoLREVHUkVFU18yNzAQAxIWChJERUdSRUVTXzBfSU5WRVJU",
102102
"RUQQBBIXChNERUdSRUVTXzkwX0lOVkVSVEVEEAUSGAoUREVHUkVFU18xODBf",
103-
"SU5WRVJURUQQBhIYChRERUdSRUVTXzI3MF9JTlZFUlRFRBAHGt4GCgpMb1Jh",
103+
"SU5WRVJURUQQBhIYChRERUdSRUVTXzI3MF9JTlZFUlRFRBAHGvkGCgpMb1Jh",
104104
"Q29uZmlnEhIKCnVzZV9wcmVzZXQYASABKAgSPwoMbW9kZW1fcHJlc2V0GAIg",
105105
"ASgOMikubWVzaHRhc3RpYy5Db25maWcuTG9SYUNvbmZpZy5Nb2RlbVByZXNl",
106106
"dBIRCgliYW5kd2lkdGgYAyABKA0SFQoNc3ByZWFkX2ZhY3RvchgEIAEoDRIT",
@@ -111,27 +111,27 @@ static ConfigReflection() {
111111
"DRIbChNvdmVycmlkZV9kdXR5X2N5Y2xlGAwgASgIEh4KFnN4MTI2eF9yeF9i",
112112
"b29zdGVkX2dhaW4YDSABKAgSGgoSb3ZlcnJpZGVfZnJlcXVlbmN5GA4gASgC",
113113
"EhcKD3BhX2Zhbl9kaXNhYmxlZBgPIAEoCBIXCg9pZ25vcmVfaW5jb21pbmcY",
114-
"ZyADKA0SEwoLaWdub3JlX21xdHQYaCABKAgizQEKClJlZ2lvbkNvZGUSCQoF",
115-
"VU5TRVQQABIGCgJVUxABEgoKBkVVXzQzMxACEgoKBkVVXzg2OBADEgYKAkNO",
116-
"EAQSBgoCSlAQBRIHCgNBTloQBhIGCgJLUhAHEgYKAlRXEAgSBgoCUlUQCRIG",
117-
"CgJJThAKEgoKBk5aXzg2NRALEgYKAlRIEAwSCwoHTE9SQV8yNBANEgoKBlVB",
118-
"XzQzMxAOEgoKBlVBXzg2OBAPEgoKBk1ZXzQzMxAQEgoKBk1ZXzkxORAREgoK",
119-
"BlNHXzkyMxASIqkBCgtNb2RlbVByZXNldBINCglMT05HX0ZBU1QQABINCglM",
120-
"T05HX1NMT1cQARIWCg5WRVJZX0xPTkdfU0xPVxACGgIIARIPCgtNRURJVU1f",
121-
"U0xPVxADEg8KC01FRElVTV9GQVNUEAQSDgoKU0hPUlRfU0xPVxAFEg4KClNI",
122-
"T1JUX0ZBU1QQBhIRCg1MT05HX01PREVSQVRFEAcSDwoLU0hPUlRfVFVSQk8Q",
123-
"CBqtAQoPQmx1ZXRvb3RoQ29uZmlnEg8KB2VuYWJsZWQYASABKAgSPAoEbW9k",
124-
"ZRgCIAEoDjIuLm1lc2h0YXN0aWMuQ29uZmlnLkJsdWV0b290aENvbmZpZy5Q",
125-
"YWlyaW5nTW9kZRIRCglmaXhlZF9waW4YAyABKA0iOAoLUGFpcmluZ01vZGUS",
126-
"DgoKUkFORE9NX1BJThAAEg0KCUZJWEVEX1BJThABEgoKBk5PX1BJThACGrYB",
127-
"Cg5TZWN1cml0eUNvbmZpZxISCgpwdWJsaWNfa2V5GAEgASgMEhMKC3ByaXZh",
128-
"dGVfa2V5GAIgASgMEhEKCWFkbWluX2tleRgDIAMoDBISCgppc19tYW5hZ2Vk",
129-
"GAQgASgIEhYKDnNlcmlhbF9lbmFibGVkGAUgASgIEh0KFWRlYnVnX2xvZ19h",
130-
"cGlfZW5hYmxlZBgGIAEoCBIdChVhZG1pbl9jaGFubmVsX2VuYWJsZWQYCCAB",
131-
"KAgaEgoQU2Vzc2lvbmtleUNvbmZpZ0IRCg9wYXlsb2FkX3ZhcmlhbnRCYQoT",
132-
"Y29tLmdlZWtzdmlsbGUubWVzaEIMQ29uZmlnUHJvdG9zWiJnaXRodWIuY29t",
133-
"L21lc2h0YXN0aWMvZ28vZ2VuZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1",
134-
"ZnO6AgBiBnByb3RvMw=="));
114+
"ZyADKA0SEwoLaWdub3JlX21xdHQYaCABKAgSGQoRY29uZmlnX29rX3RvX21x",
115+
"dHQYaSABKAgizQEKClJlZ2lvbkNvZGUSCQoFVU5TRVQQABIGCgJVUxABEgoK",
116+
"BkVVXzQzMxACEgoKBkVVXzg2OBADEgYKAkNOEAQSBgoCSlAQBRIHCgNBTloQ",
117+
"BhIGCgJLUhAHEgYKAlRXEAgSBgoCUlUQCRIGCgJJThAKEgoKBk5aXzg2NRAL",
118+
"EgYKAlRIEAwSCwoHTE9SQV8yNBANEgoKBlVBXzQzMxAOEgoKBlVBXzg2OBAP",
119+
"EgoKBk1ZXzQzMxAQEgoKBk1ZXzkxORAREgoKBlNHXzkyMxASIqkBCgtNb2Rl",
120+
"bVByZXNldBINCglMT05HX0ZBU1QQABINCglMT05HX1NMT1cQARIWCg5WRVJZ",
121+
"X0xPTkdfU0xPVxACGgIIARIPCgtNRURJVU1fU0xPVxADEg8KC01FRElVTV9G",
122+
"QVNUEAQSDgoKU0hPUlRfU0xPVxAFEg4KClNIT1JUX0ZBU1QQBhIRCg1MT05H",
123+
"X01PREVSQVRFEAcSDwoLU0hPUlRfVFVSQk8QCBqtAQoPQmx1ZXRvb3RoQ29u",
124+
"ZmlnEg8KB2VuYWJsZWQYASABKAgSPAoEbW9kZRgCIAEoDjIuLm1lc2h0YXN0",
125+
"aWMuQ29uZmlnLkJsdWV0b290aENvbmZpZy5QYWlyaW5nTW9kZRIRCglmaXhl",
126+
"ZF9waW4YAyABKA0iOAoLUGFpcmluZ01vZGUSDgoKUkFORE9NX1BJThAAEg0K",
127+
"CUZJWEVEX1BJThABEgoKBk5PX1BJThACGrYBCg5TZWN1cml0eUNvbmZpZxIS",
128+
"CgpwdWJsaWNfa2V5GAEgASgMEhMKC3ByaXZhdGVfa2V5GAIgASgMEhEKCWFk",
129+
"bWluX2tleRgDIAMoDBISCgppc19tYW5hZ2VkGAQgASgIEhYKDnNlcmlhbF9l",
130+
"bmFibGVkGAUgASgIEh0KFWRlYnVnX2xvZ19hcGlfZW5hYmxlZBgGIAEoCBId",
131+
"ChVhZG1pbl9jaGFubmVsX2VuYWJsZWQYCCABKAgaEgoQU2Vzc2lvbmtleUNv",
132+
"bmZpZ0IRCg9wYXlsb2FkX3ZhcmlhbnRCYQoTY29tLmdlZWtzdmlsbGUubWVz",
133+
"aEIMQ29uZmlnUHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMvZ28vZ2Vu",
134+
"ZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3RvMw=="));
135135
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
136136
new pbr::FileDescriptor[] { },
137137
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -140,7 +140,7 @@ static ConfigReflection() {
140140
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.PowerConfig), global::Meshtastic.Protobufs.Config.Types.PowerConfig.Parser, new[]{ "IsPowerSaving", "OnBatteryShutdownAfterSecs", "AdcMultiplierOverride", "WaitBluetoothSecs", "SdsSecs", "LsSecs", "MinWakeSecs", "DeviceBatteryInaAddress", "PowermonEnables" }, null, null, null, null),
141141
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.NetworkConfig), global::Meshtastic.Protobufs.Config.Types.NetworkConfig.Parser, new[]{ "WifiEnabled", "WifiSsid", "WifiPsk", "NtpServer", "EthEnabled", "AddressMode", "Ipv4Config", "RsyslogServer" }, null, new[]{ typeof(global::Meshtastic.Protobufs.Config.Types.NetworkConfig.Types.AddressMode) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.NetworkConfig.Types.IpV4Config), global::Meshtastic.Protobufs.Config.Types.NetworkConfig.Types.IpV4Config.Parser, new[]{ "Ip", "Gateway", "Subnet", "Dns" }, null, null, null, null)}),
142142
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig), global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Parser, new[]{ "ScreenOnSecs", "GpsFormat", "AutoScreenCarouselSecs", "CompassNorthTop", "FlipScreen", "Units", "Oled", "Displaymode", "HeadingBold", "WakeOnTapOrMotion", "CompassOrientation" }, null, new[]{ typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Types.GpsCoordinateFormat), typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Types.DisplayUnits), typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Types.OledType), typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Types.DisplayMode), typeof(global::Meshtastic.Protobufs.Config.Types.DisplayConfig.Types.CompassOrientation) }, null, null),
143-
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig), global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Parser, new[]{ "UsePreset", "ModemPreset", "Bandwidth", "SpreadFactor", "CodingRate", "FrequencyOffset", "Region", "HopLimit", "TxEnabled", "TxPower", "ChannelNum", "OverrideDutyCycle", "Sx126XRxBoostedGain", "OverrideFrequency", "PaFanDisabled", "IgnoreIncoming", "IgnoreMqtt" }, null, new[]{ typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Types.RegionCode), typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Types.ModemPreset) }, null, null),
143+
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig), global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Parser, new[]{ "UsePreset", "ModemPreset", "Bandwidth", "SpreadFactor", "CodingRate", "FrequencyOffset", "Region", "HopLimit", "TxEnabled", "TxPower", "ChannelNum", "OverrideDutyCycle", "Sx126XRxBoostedGain", "OverrideFrequency", "PaFanDisabled", "IgnoreIncoming", "IgnoreMqtt", "ConfigOkToMqtt" }, null, new[]{ typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Types.RegionCode), typeof(global::Meshtastic.Protobufs.Config.Types.LoRaConfig.Types.ModemPreset) }, null, null),
144144
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.BluetoothConfig), global::Meshtastic.Protobufs.Config.Types.BluetoothConfig.Parser, new[]{ "Enabled", "Mode", "FixedPin" }, null, new[]{ typeof(global::Meshtastic.Protobufs.Config.Types.BluetoothConfig.Types.PairingMode) }, null, null),
145145
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.SecurityConfig), global::Meshtastic.Protobufs.Config.Types.SecurityConfig.Parser, new[]{ "PublicKey", "PrivateKey", "AdminKey", "IsManaged", "SerialEnabled", "DebugLogApiEnabled", "AdminChannelEnabled" }, null, null, null, null),
146146
new pbr::GeneratedClrTypeInfo(typeof(global::Meshtastic.Protobufs.Config.Types.SessionkeyConfig), global::Meshtastic.Protobufs.Config.Types.SessionkeyConfig.Parser, null, null, null, null, null)})
@@ -4536,6 +4536,7 @@ public LoRaConfig(LoRaConfig other) : this() {
45364536
paFanDisabled_ = other.paFanDisabled_;
45374537
ignoreIncoming_ = other.ignoreIncoming_.Clone();
45384538
ignoreMqtt_ = other.ignoreMqtt_;
4539+
configOkToMqtt_ = other.configOkToMqtt_;
45394540
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
45404541
}
45414542

@@ -4847,6 +4848,22 @@ public bool IgnoreMqtt {
48474848
}
48484849
}
48494850

4851+
/// <summary>Field number for the "config_ok_to_mqtt" field.</summary>
4852+
public const int ConfigOkToMqttFieldNumber = 105;
4853+
private bool configOkToMqtt_;
4854+
/// <summary>
4855+
///
4856+
/// Sets the ok_to_mqtt bit on outgoing packets
4857+
/// </summary>
4858+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
4859+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
4860+
public bool ConfigOkToMqtt {
4861+
get { return configOkToMqtt_; }
4862+
set {
4863+
configOkToMqtt_ = value;
4864+
}
4865+
}
4866+
48504867
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
48514868
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
48524869
public override bool Equals(object other) {
@@ -4879,6 +4896,7 @@ public bool Equals(LoRaConfig other) {
48794896
if (PaFanDisabled != other.PaFanDisabled) return false;
48804897
if(!ignoreIncoming_.Equals(other.ignoreIncoming_)) return false;
48814898
if (IgnoreMqtt != other.IgnoreMqtt) return false;
4899+
if (ConfigOkToMqtt != other.ConfigOkToMqtt) return false;
48824900
return Equals(_unknownFields, other._unknownFields);
48834901
}
48844902

@@ -4903,6 +4921,7 @@ public override int GetHashCode() {
49034921
if (PaFanDisabled != false) hash ^= PaFanDisabled.GetHashCode();
49044922
hash ^= ignoreIncoming_.GetHashCode();
49054923
if (IgnoreMqtt != false) hash ^= IgnoreMqtt.GetHashCode();
4924+
if (ConfigOkToMqtt != false) hash ^= ConfigOkToMqtt.GetHashCode();
49064925
if (_unknownFields != null) {
49074926
hash ^= _unknownFields.GetHashCode();
49084927
}
@@ -4986,6 +5005,10 @@ public void WriteTo(pb::CodedOutputStream output) {
49865005
output.WriteRawTag(192, 6);
49875006
output.WriteBool(IgnoreMqtt);
49885007
}
5008+
if (ConfigOkToMqtt != false) {
5009+
output.WriteRawTag(200, 6);
5010+
output.WriteBool(ConfigOkToMqtt);
5011+
}
49895012
if (_unknownFields != null) {
49905013
_unknownFields.WriteTo(output);
49915014
}
@@ -5061,6 +5084,10 @@ public void WriteTo(pb::CodedOutputStream output) {
50615084
output.WriteRawTag(192, 6);
50625085
output.WriteBool(IgnoreMqtt);
50635086
}
5087+
if (ConfigOkToMqtt != false) {
5088+
output.WriteRawTag(200, 6);
5089+
output.WriteBool(ConfigOkToMqtt);
5090+
}
50645091
if (_unknownFields != null) {
50655092
_unknownFields.WriteTo(ref output);
50665093
}
@@ -5120,6 +5147,9 @@ public int CalculateSize() {
51205147
if (IgnoreMqtt != false) {
51215148
size += 2 + 1;
51225149
}
5150+
if (ConfigOkToMqtt != false) {
5151+
size += 2 + 1;
5152+
}
51235153
if (_unknownFields != null) {
51245154
size += _unknownFields.CalculateSize();
51255155
}
@@ -5181,6 +5211,9 @@ public void MergeFrom(LoRaConfig other) {
51815211
if (other.IgnoreMqtt != false) {
51825212
IgnoreMqtt = other.IgnoreMqtt;
51835213
}
5214+
if (other.ConfigOkToMqtt != false) {
5215+
ConfigOkToMqtt = other.ConfigOkToMqtt;
5216+
}
51845217
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
51855218
}
51865219

@@ -5265,6 +5298,10 @@ public void MergeFrom(pb::CodedInputStream input) {
52655298
IgnoreMqtt = input.ReadBool();
52665299
break;
52675300
}
5301+
case 840: {
5302+
ConfigOkToMqtt = input.ReadBool();
5303+
break;
5304+
}
52685305
}
52695306
}
52705307
#endif
@@ -5349,6 +5386,10 @@ public void MergeFrom(pb::CodedInputStream input) {
53495386
IgnoreMqtt = input.ReadBool();
53505387
break;
53515388
}
5389+
case 840: {
5390+
ConfigOkToMqtt = input.ReadBool();
5391+
break;
5392+
}
53525393
}
53535394
}
53545395
}

0 commit comments

Comments
 (0)