Merge pull request #46 from meshtastic/wip

2.2.2 Protos
meshtastic · Aug 18, 2023 · b04b0a1 · b04b0a1
2 parents a45bbcd + d68f04c
commit b04b0a1
Show file tree

Hide file tree

Showing 8 changed files with 863 additions and 233 deletions.
diff --git a/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs b/Meshtastic/Data/MessageFactories/AdminMessageFactory.cs
@@ -91,6 +91,9 @@ public MeshPacket CreateSetModuleConfigMessage(object instance)
             TelemetryConfig => new ModuleConfig() { Telemetry = instance as TelemetryConfig },
             RemoteHardwareConfig => new ModuleConfig() { RemoteHardware = instance as RemoteHardwareConfig },
             NeighborInfoConfig => new ModuleConfig() { NeighborInfo = instance as NeighborInfoConfig },
+            AmbientLightingConfig => new ModuleConfig() { AmbientLighting = instance as AmbientLightingConfig },
+            DetectionSensorConfig => new ModuleConfig() { DetectionSensor = instance as DetectionSensorConfig },
+
             _ => throw new ArgumentException("Could not determine ModuleConfig type", nameof(instance)),
         };
         return GetNewMeshPacket(new AdminMessage() { SetModuleConfig = moduleConfig! });

diff --git a/Meshtastic/Generated/Admin.cs b/Meshtastic/Generated/Admin.cs
@@ -28,7 +28,7 @@ static AdminReflection() {
             "dGljL2NoYW5uZWwucHJvdG8aF21lc2h0YXN0aWMvY29uZmlnLnByb3RvGiJt",
             "ZXNodGFzdGljL2Nvbm5lY3Rpb25fc3RhdHVzLnByb3RvGhttZXNodGFzdGlj",
             "L2RldmljZW9ubHkucHJvdG8aFW1lc2h0YXN0aWMvbWVzaC5wcm90bxoebWVz",
-            "aHRhc3RpYy9tb2R1bGVfY29uZmlnLnByb3RvIqsPCgxBZG1pbk1lc3NhZ2US",
+            "aHRhc3RpYy9tb2R1bGVfY29uZmlnLnByb3RvIscPCgxBZG1pbk1lc3NhZ2US",
             "HQoTZ2V0X2NoYW5uZWxfcmVxdWVzdBgBIAEoDUgAEjMKFGdldF9jaGFubmVs",
             "X3Jlc3BvbnNlGAIgASgLMhMubWVzaHRhc3RpYy5DaGFubmVsSAASGwoRZ2V0",
             "X293bmVyX3JlcXVlc3QYAyABKAhIABIuChJnZXRfb3duZXJfcmVzcG9uc2UY",
@@ -65,21 +65,21 @@ static AdminReflection() {
             "ABIWCgxub2RlZGJfcmVzZXQYZCABKAVIACKVAQoKQ29uZmlnVHlwZRIRCg1E",
             "RVZJQ0VfQ09ORklHEAASEwoPUE9TSVRJT05fQ09ORklHEAESEAoMUE9XRVJf",
             "Q09ORklHEAISEgoOTkVUV09SS19DT05GSUcQAxISCg5ESVNQTEFZX0NPTkZJ",
-            "RxAEEg8KC0xPUkFfQ09ORklHEAUSFAoQQkxVRVRPT1RIX0NPTkZJRxAGIogC",
+            "RxAEEg8KC0xPUkFfQ09ORklHEAUSFAoQQkxVRVRPT1RIX0NPTkZJRxAGIqQC",
             "ChBNb2R1bGVDb25maWdUeXBlEg8KC01RVFRfQ09ORklHEAASEQoNU0VSSUFM",
             "X0NPTkZJRxABEhMKD0VYVE5PVElGX0NPTkZJRxACEhcKE1NUT1JFRk9SV0FS",
             "RF9DT05GSUcQAxIUChBSQU5HRVRFU1RfQ09ORklHEAQSFAoQVEVMRU1FVFJZ",
             "X0NPTkZJRxAFEhQKEENBTk5FRE1TR19DT05GSUcQBhIQCgxBVURJT19DT05G",
             "SUcQBxIZChVSRU1PVEVIQVJEV0FSRV9DT05GSUcQCBIXChNORUlHSEJPUklO",
-            "Rk9fQ09ORklHEAkSGgoWQU1CSUVOVExJR0hUSU5HX0NPTkZJRxAKQhEKD3Bh",
-            "eWxvYWRfdmFyaWFudCJbCg1IYW1QYXJhbWV0ZXJzEhEKCWNhbGxfc2lnbhgB",
-            "IAEoCRIQCgh0eF9wb3dlchgCIAEoBRIRCglmcmVxdWVuY3kYAyABKAISEgoK",
-            "c2hvcnRfbmFtZRgEIAEoCSJmCh5Ob2RlUmVtb3RlSGFyZHdhcmVQaW5zUmVz",
-            "cG9uc2USRAoZbm9kZV9yZW1vdGVfaGFyZHdhcmVfcGlucxgBIAMoCzIhLm1l",
-            "c2h0YXN0aWMuTm9kZVJlbW90ZUhhcmR3YXJlUGluQmAKE2NvbS5nZWVrc3Zp",
-            "bGxlLm1lc2hCC0FkbWluUHJvdG9zWiJnaXRodWIuY29tL21lc2h0YXN0aWMv",
-            "Z28vZ2VuZXJhdGVkqgIUTWVzaHRhc3RpYy5Qcm90b2J1ZnO6AgBiBnByb3Rv",
-            "Mw=="));
+            "Rk9fQ09ORklHEAkSGgoWQU1CSUVOVExJR0hUSU5HX0NPTkZJRxAKEhoKFkRF",
+            "VEVDVElPTlNFTlNPUl9DT05GSUcQC0IRCg9wYXlsb2FkX3ZhcmlhbnQiWwoN",
+            "SGFtUGFyYW1ldGVycxIRCgljYWxsX3NpZ24YASABKAkSEAoIdHhfcG93ZXIY",
+            "AiABKAUSEQoJZnJlcXVlbmN5GAMgASgCEhIKCnNob3J0X25hbWUYBCABKAki",
+            "ZgoeTm9kZVJlbW90ZUhhcmR3YXJlUGluc1Jlc3BvbnNlEkQKGW5vZGVfcmVt",
+            "b3RlX2hhcmR3YXJlX3BpbnMYASADKAsyIS5tZXNodGFzdGljLk5vZGVSZW1v",
+            "dGVIYXJkd2FyZVBpbkJgChNjb20uZ2Vla3N2aWxsZS5tZXNoQgtBZG1pblBy",
+            "b3Rvc1oiZ2l0aHViLmNvbS9tZXNodGFzdGljL2dvL2dlbmVyYXRlZKoCFE1l",
+            "c2h0YXN0aWMuUHJvdG9idWZzugIAYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Meshtastic.Protobufs.ChannelReflection.Descriptor, global::Meshtastic.Protobufs.ConfigReflection.Descriptor, global::Meshtastic.Protobufs.ConnectionStatusReflection.Descriptor, global::Meshtastic.Protobufs.DeviceonlyReflection.Descriptor, global::Meshtastic.Protobufs.MeshReflection.Descriptor, global::Meshtastic.Protobufs.ModuleConfigReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -2002,6 +2002,11 @@ public enum ModuleConfigType {
         /// TODO: REPLACE
         /// </summary>
         [pbr::OriginalName("AMBIENTLIGHTING_CONFIG")] AmbientlightingConfig = 10,
+        /// <summary>
+        ///
+        /// TODO: REPLACE
+        /// </summary>
+        [pbr::OriginalName("DETECTIONSENSOR_CONFIG")] DetectionsensorConfig = 11,
       }
 
     }