E1.37-5 JSON Metadata Defines / Schema for Manufacturer PIDs

.github/workflows/main.yml

@@ -13,24 +13,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        dotnet-version: [ '6.0', '7.0', '8.0', '9.0' ]
+        dotnet-version: [ '7.0', '8.0', '9.0']
+      fail-fast: false
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.2.2
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v4.2.0
       with:
           dotnet-version: ${{ matrix.dotnet-version }}
     - name: Install dependencies
-      run: dotnet restore
+      run: dotnet restore -p:TargetFramework=net${{ matrix.dotnet-version }}
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build -p:TargetFramework=net${{ matrix.dotnet-version }} --configuration Release --no-restore
     - name: Test
-      run: dotnet test --framework net${{ matrix.dotnet-version }} --no-restore --verbosity normal --logger trx --results-directory "TestResults-${{ matrix.os }} ${{ matrix.dotnet-version }}"        
+      run: dotnet test --framework net${{ matrix.dotnet-version }} --collect:"XPlat Code Coverage" --no-restore --verbosity normal --logger trx --results-directory "TestResults-${{ matrix.os }} ${{ matrix.dotnet-version }}"
     - name: Upload a Build Artifact
       if: ${{ failure() || success() }}
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v4.6.0
       with:
         name: ${{ matrix.os }} ${{ matrix.dotnet-version }}
         path: |

RDMSharp/ParameterWrapper/EManufacturer.cs → RDMSharp/EManufacturer.cs

@@ -1,26 +1,26 @@
-using System.ComponentModel;
-
-namespace RDMSharp.ParameterWrapper
+using System.ComponentModel;
+
+namespace RDMSharp
 {
-    public enum EManufacturer : ushort
-    {
-        [Description("ESTA")]
-        ESTA = 0x0000,
-        [Description("DMXControl-Projects e.V.")]
-        DMXControlProjects_eV = 0x02b0,
-        [Description("Martin Professional A/S")]
-        Martin_Professional_AS = 0x4D50,
-        [Description("SGM Technology For Lighting SPA")]
-        SGM_Technology_For_Lighting_SPA = 0x5347,
-        [Description("Wireless Solution Sweden AB")]
-        Wireless_Solution_Sweden_AB = 0x5753,
-        [Description("Robe Show Lighting s.r.o.")]
-        Robe_Show_Lighting_sro = 0x5253,
-        [Description("Swisson AG")]
-        Swisson_AG = 0x5777,
-        [Description("GLP German Light Products GmbH")]
-        GLP_German_Light_Products_GmbH = 0x676C,
-        [Description("Steinigke Showtechnic GmbH")]
-        Steinigke_Showtechnic_GmbH = 0x29aa,
-    }
+    public enum EManufacturer : ushort
+    {
+        [Description("ESTA")]
+        ESTA = 0x0000,
+        [Description("DMXControl-Projects e.V.")]
+        DMXControlProjects_eV = 0x02b0,
+        [Description("Martin Professional A/S")]
+        Martin_Professional_AS = 0x4D50,
+        [Description("SGM Technology For Lighting SPA")]
+        SGM_Technology_For_Lighting_SPA = 0x5347,
+        [Description("Wireless Solution Sweden AB")]
+        Wireless_Solution_Sweden_AB = 0x5753,
+        [Description("Robe Show Lighting s.r.o.")]
+        Robe_Show_Lighting_sro = 0x5253,
+        [Description("Swisson AG")]
+        Swisson_AG = 0x5777,
+        [Description("GLP German Light Products GmbH")]
+        GLP_German_Light_Products_GmbH = 0x676C,
+        [Description("Steinigke Showtechnic GmbH")]
+        Steinigke_Showtechnic_GmbH = 0x29aa,
+    }
 }

RDMSharp/Metadata/DataTree.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace RDMSharp.Metadata
+{
+    public readonly struct DataTree : IEquatable<DataTree>
+    {
+        public readonly string Name;
+        public readonly uint Index;
+        public readonly object? Value;
+        public readonly string? Unit;
+        public readonly bool IsCompound;
+        public readonly DataTreeValueLabel[]? Labels;
+        public readonly DataTree[]? Children;
+        public readonly DataTreeIssue[]? Issues;
+
+        private DataTree(string name, uint index, DataTreeIssue[]? issues = null, bool isCompound = false)
+        {
+            Name = name;
+            Index = index;
+            Issues = issues;
+            IsCompound = isCompound;
+        }
+        public DataTree(DataTree dataTree, uint index) : this(dataTree.Name, index, dataTree.Issues, dataTree.IsCompound)
+        {
+            Value = dataTree.Value;
+            Unit = dataTree.Unit;
+            Labels = dataTree.Labels;
+            Children = dataTree.Children;
+        }
+        public DataTree(string name, uint index, object value, DataTreeIssue[]? issues = null, string unit = null, DataTreeValueLabel[] labels = null, bool isCompound = false) : this(name, index, issues, isCompound)
+        {
+            if (value is IEnumerable<DataTree> || value is DataTree[] children)
+                throw new ArgumentException($"Use other Constructor if you use {nameof(Children)}");
+
+            Value = value;
+            Unit = unit;
+            Labels = labels;
+        }
+
+        public DataTree(string name, uint index, DataTree[] children, DataTreeIssue[]? issues = null, bool isCompound = false) : this(name, index, issues, isCompound)
+        {
+            Children = children;
+        }
+
+        public override string ToString()
+        {
+            return $"[{Index}] {Name}: {Value}";
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is DataTree tree && Equals(tree);
+        }
+
+        public bool Equals(DataTree other)
+        {
+            return Name == other.Name &&
+                   Index == other.Index &&
+                   EqualityComparer<object>.Default.Equals(Value, other.Value) &&
+                   compairArrays(this, other);
+
+            bool compairArrays(DataTree _this, DataTree other)
+            {
+                if (_this.Children != null)
+                {
+                    if (!_this.Children.SequenceEqual(other.Children))
+                        return false;
+                }
+                else if (other.Children != null)
+                    return false;
+                if (_this.Issues != null)
+                {
+                    if (!_this.Issues.SequenceEqual(other.Issues))
+                        return false;
+                }
+                else if (other.Issues != null)
+                    return false;
+
+                return true;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Name, Index, Value, Children, Issues);
+        }
+
+        public static bool operator ==(DataTree left, DataTree right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(DataTree left, DataTree right)
+        {
+            return !(left == right);
+        }
+    }
+}