Add default value to bitmasks

SmartHomeOS · Jan 12, 2025 · e575cbe · e575cbe
1 parent b7b1990
commit e575cbe
Show file tree

Hide file tree

Showing 21 changed files with 130 additions and 10 deletions.
diff --git a/Generator/ClusterGenerator.cs b/Generator/ClusterGenerator.cs
@@ -237,7 +237,7 @@ private static void WriteStruct(clusterCommand command, bool toServer, TextWrite
                     writer.Write(" " + GeneratorUtil.SanitizeName(field.name) + " { get; set; }");
                 if (field.@default != null && DefaultValid(field.@default))
                 {
-                    if (field.type.EndsWith("Enum"))
+                    if (field.type.EndsWith("Enum") && field.@default != "0")
                         writer.WriteLine(" = " + field.type + "." + field.@default + ";");
                     else
                         writer.WriteLine(" = " + SanitizeDefault(field.@default, field.type, field.entry?.type) + ";");
@@ -317,7 +317,7 @@ private static void WriteStructType(bool optional, bool nullable, string type, s
             switch (type)
             {
                 case "list": //Actually an array
-                    if (optional || nullable)
+                    if (nullable)
                         writer.WriteLine($"{totalIndent}if ({name} != null)");
                     writer.WriteLine($"{totalIndent}{{");
                     if (from != null || to != null)

diff --git a/MatterDotNet/Clusters/Application/ActionsCluster.cs b/MatterDotNet/Clusters/Application/ActionsCluster.cs
@@ -130,6 +130,10 @@ public enum EndpointListTypeEnum {
         /// </summary>
         [Flags]
         public enum CommandBits {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Indicate support for InstantAction command
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/BallastConfigurationCluster.cs b/MatterDotNet/Clusters/Application/BallastConfigurationCluster.cs
@@ -38,6 +38,10 @@ protected BallastConfigurationCluster(uint cluster, ushort endPoint) : base(clus
         /// </summary>
         [Flags]
         public enum BallastStatusBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Operational state of the ballast.
             /// </summary>
@@ -53,6 +57,10 @@ public enum BallastStatusBitmap {
         /// </summary>
         [Flags]
         public enum LampAlarmModeBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// State of LampBurnHours alarm generation
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/BooleanStateConfigurationCluster.cs b/MatterDotNet/Clusters/Application/BooleanStateConfigurationCluster.cs
@@ -64,6 +64,10 @@ public enum Feature {
         /// </summary>
         [Flags]
         public enum AlarmModeBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Visual alarming
             /// </summary>
@@ -79,6 +83,10 @@ public enum AlarmModeBitmap {
         /// </summary>
         [Flags]
         public enum SensorFaultBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Unspecified fault detected
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/ChannelCluster.cs b/MatterDotNet/Clusters/Application/ChannelCluster.cs
@@ -116,6 +116,10 @@ public enum StatusEnum {
         /// </summary>
         [Flags]
         public enum RecordingFlagBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// The program is scheduled for recording.
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/ContentControlCluster.cs b/MatterDotNet/Clusters/Application/ContentControlCluster.cs
@@ -81,6 +81,10 @@ public enum Feature {
         /// </summary>
         [Flags]
         public enum DayOfWeekBitmapType {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Sunday
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/ContentLauncherCluster.cs b/MatterDotNet/Clusters/Application/ContentLauncherCluster.cs
@@ -183,6 +183,10 @@ public enum StatusEnum {
         /// </summary>
         [Flags]
         public enum SupportedProtocolsBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Device supports Dynamic Adaptive Streaming over HTTP (DASH)
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/DoorLockCluster.cs b/MatterDotNet/Clusters/Application/DoorLockCluster.cs
@@ -620,6 +620,10 @@ public enum UserTypeEnum {
         /// </summary>
         [Flags]
         public enum AlarmMaskBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Locking Mechanism Jammed
             /// </summary>
@@ -655,6 +659,10 @@ public enum AlarmMaskBitmap {
         /// </summary>
         [Flags]
         public enum ConfigurationRegisterBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// The state of local programming functionality
             /// </summary>
@@ -686,6 +694,10 @@ public enum ConfigurationRegisterBitmap {
         /// </summary>
         [Flags]
         public enum CredentialRulesBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Only one credential is required for lock operation
             /// </summary>
@@ -705,6 +717,10 @@ public enum CredentialRulesBitmap {
         /// </summary>
         [Flags]
         public enum DaysMaskBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Schedule is applied on Sunday
             /// </summary>
@@ -740,6 +756,10 @@ public enum DaysMaskBitmap {
         /// </summary>
         [Flags]
         public enum EventMaskBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// State of bit 0
             /// </summary>
@@ -811,6 +831,10 @@ public enum EventMaskBitmap {
         /// </summary>
         [Flags]
         public enum LocalProgrammingFeaturesBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// The state of the ability to add users, credentials or schedules on the device
             /// </summary>
@@ -834,6 +858,10 @@ public enum LocalProgrammingFeaturesBitmap {
         /// </summary>
         [Flags]
         public enum OperatingModesBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Normal operation mode
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/EnergyEVSECluster.cs b/MatterDotNet/Clusters/Application/EnergyEVSECluster.cs
@@ -222,6 +222,10 @@ public enum SupplyStateEnum {
         /// </summary>
         [Flags]
         public enum TargetDayOfWeekBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Sunday
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/FanControlCluster.cs b/MatterDotNet/Clusters/Application/FanControlCluster.cs
@@ -161,6 +161,10 @@ public enum StepDirectionEnum {
         /// </summary>
         [Flags]
         public enum RockBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Indicate rock left to right
             /// </summary>
@@ -180,6 +184,10 @@ public enum RockBitmap {
         /// </summary>
         [Flags]
         public enum WindBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Indicate sleep wind
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/LevelControlCluster.cs b/MatterDotNet/Clusters/Application/LevelControlCluster.cs
@@ -88,6 +88,10 @@ public enum StepModeEnum {
         /// </summary>
         [Flags]
         public enum OptionsBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Dependency on On/Off cluster
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/MessagesCluster.cs b/MatterDotNet/Clusters/Application/MessagesCluster.cs
@@ -222,7 +222,7 @@ internal override void Serialize(TLVWriter writer, long structNumber = -1) {
         #region Payloads
         private record PresentMessagesRequestPayload : TLVPayload {
             public required Guid MessageID { get; set; }
-            public required MessagePriorityEnum Priority { get; set; } = MessagePriorityEnum.0;
+            public required MessagePriorityEnum Priority { get; set; } = 0;
             public required MessageControlBitmap MessageControl { get; set; } = 0;
             public required DateTime? StartTime { get; set; } = TimeUtil.EPOCH;
             public required ulong? Duration { get; set; } = 0;

diff --git a/MatterDotNet/Clusters/Application/On-OffCluster.cs b/MatterDotNet/Clusters/Application/On-OffCluster.cs
@@ -120,6 +120,10 @@ public enum StartUpOnOffEnum {
         /// </summary>
         [Flags]
         public enum OnOffControlBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Indicates a command is only accepted when in On state.
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/PumpConfigurationandControlCluster.cs b/MatterDotNet/Clusters/Application/PumpConfigurationandControlCluster.cs
@@ -125,6 +125,10 @@ public enum OperationModeEnum {
         /// </summary>
         [Flags]
         public enum PumpStatusBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// A fault related to the system or pump device is detected.
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/ScenesManagementCluster.cs b/MatterDotNet/Clusters/Application/ScenesManagementCluster.cs
@@ -54,6 +54,10 @@ public enum Feature {
         /// </summary>
         [Flags]
         public enum CopyModeBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Copy all scenes in the scene table
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/ValveConfigurationandControlCluster.cs b/MatterDotNet/Clusters/Application/ValveConfigurationandControlCluster.cs
@@ -75,6 +75,10 @@ public enum ValveStateEnum {
         /// </summary>
         [Flags]
         public enum ValveFaultBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Unspecified fault detected
             /// </summary>

diff --git a/MatterDotNet/Clusters/Application/WindowCoveringCluster.cs b/MatterDotNet/Clusters/Application/WindowCoveringCluster.cs
@@ -224,6 +224,10 @@ public enum TypeEnum {
         /// </summary>
         [Flags]
         public enum ConfigStatusBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Device is operational.
             /// </summary>
@@ -259,6 +263,10 @@ public enum ConfigStatusBitmap {
         /// </summary>
         [Flags]
         public enum ModeBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Reverse the lift direction.
             /// </summary>
@@ -282,6 +290,10 @@ public enum ModeBitmap {
         /// </summary>
         [Flags]
         public enum OperationalStatusBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Global operational state.
             /// </summary>
@@ -301,6 +313,10 @@ public enum OperationalStatusBitmap {
         /// </summary>
         [Flags]
         public enum SafetyStatusBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// Movement commands are ignored (locked out). e.g. not granted authorization, outside some time/date range.
             /// </summary>

diff --git a/MatterDotNet/Clusters/Utility/GroupKeyManagementCluster.cs b/MatterDotNet/Clusters/Utility/GroupKeyManagementCluster.cs
@@ -174,7 +174,7 @@ public GroupKeySet(object[] fields) {
                 EpochStartTime1 = TimeUtil.FromEpochUS(reader.GetULong(5, true));
                 EpochKey2 = reader.GetBytes(6, false)!;
                 EpochStartTime2 = TimeUtil.FromEpochUS(reader.GetULong(7, true));
-                GroupKeyMulticastPolicy = (GroupKeyMulticastPolicyEnum)reader.GetUShort(8, true)!.Value;
+                GroupKeyMulticastPolicy = (GroupKeyMulticastPolicyEnum?)reader.GetUShort(8, true);
             }
             public required ushort GroupKeySetID { get; set; }
             public required GroupKeySecurityPolicyEnum GroupKeySecurityPolicy { get; set; }
@@ -205,7 +205,7 @@ internal override void Serialize(TLVWriter writer, long structNumber = -1) {
                 else
                     writer.WriteULong(7, TimeUtil.ToEpochUS(EpochStartTime2!.Value));
                 if (GroupKeyMulticastPolicy != null)
-                    writer.WriteUShort(8, (ushort?)GroupKeyMulticastPolicy);
+                    writer.WriteUShort(8, (ushort)GroupKeyMulticastPolicy);
                 writer.EndContainer();
             }
         }

diff --git a/MatterDotNet/Clusters/Utility/GroupsCluster.cs b/MatterDotNet/Clusters/Utility/GroupsCluster.cs
@@ -53,6 +53,10 @@ public enum Feature {
         /// </summary>
         [Flags]
         public enum NameSupportBitmap {
+            /// <summary>
+            /// Nothing Set
+            /// </summary>
+            None = 0,
             /// <summary>
             /// The ability to store a name for a group.
             /// </summary>