Added physical-layout to KeyboardDeviceInfo

RGB.NET.Devices.Wooting/Keyboard/WootingKeyboardRGBDevice.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using RGB.NET.Core;
+using RGB.NET.Devices.Wooting.Enum;
 using RGB.NET.Devices.Wooting.Generic;
 
 namespace RGB.NET.Devices.Wooting.Keyboard
@@ -11,6 +12,12 @@ namespace RGB.NET.Devices.Wooting.Keyboard
     /// </summary>
     public class WootingKeyboardRGBDevice : WootingRGBDevice<WootingKeyboardRGBDeviceInfo>, IKeyboard
     {
+        #region Properties & Fields
+
+        IKeyboardDeviceInfo IKeyboard.DeviceInfo => DeviceInfo;
+
+        #endregion
+
         #region Constructors
 
         /// <inheritdoc />
@@ -29,14 +36,15 @@ namespace RGB.NET.Devices.Wooting.Keyboard
         /// <inheritdoc />
         protected override void InitializeLayout()
         {
-            Dictionary<LedId, (int row, int column)> mapping = WootingKeyboardLedMappings.Mapping[DeviceInfo.DeviceIndex][DeviceInfo.PhysicalLayout];
+            //TODO DarthAffe 13.02.2021: Check how the mapping can work without knowing the physical layout
+            Dictionary<LedId, (int row, int column)> mapping = WootingKeyboardLedMappings.Mapping[DeviceInfo.DeviceIndex][WootingPhysicalKeyboardLayout.US];
 
             foreach (KeyValuePair<LedId, (int row, int column)> led in mapping)
                 AddLed(led.Key, new Point(led.Value.column * 19, led.Value.row * 19), new Size(19, 19));
         }
 
         /// <inheritdoc />
-        protected override object GetLedCustomData(LedId ledId) => WootingKeyboardLedMappings.Mapping[DeviceInfo.DeviceIndex][DeviceInfo.PhysicalLayout][ledId];
+        protected override object GetLedCustomData(LedId ledId) => WootingKeyboardLedMappings.Mapping[DeviceInfo.DeviceIndex][WootingPhysicalKeyboardLayout.US][ledId];
 
         /// <inheritdoc />
         protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate) => UpdateQueue?.SetData(ledsToUpdate.Where(x => x.Color.A > 0));

RGB.NET.Devices.Wooting/Keyboard/WootingKeyboardRGBDeviceInfo.cs

@@ -4,18 +4,15 @@ using RGB.NET.Devices.Wooting.Generic;
 
 namespace RGB.NET.Devices.Wooting.Keyboard
 {
-    /// <inheritdoc />
     /// <summary>
     /// Represents a generic information for a <see cref="T:RGB.NET.Devices.Wooting.Keyboard.WootingKeyboardRGBDevice" />.
     /// </summary>
-    public class WootingKeyboardRGBDeviceInfo : WootingRGBDeviceInfo
+    public class WootingKeyboardRGBDeviceInfo : WootingRGBDeviceInfo, IKeyboardDeviceInfo
     {
         #region Properties & Fields
 
-        /// <summary>
-        /// Gets the <see cref="WootingPhysicalKeyboardLayout"/> of the <see cref="WootingKeyboardRGBDevice"/>.
-        /// </summary>
-        public WootingPhysicalKeyboardLayout PhysicalLayout { get; }
+        /// <inheritdoc />
+        public KeyboardLayoutType Layout => KeyboardLayoutType.Unknown;
 
         #endregion
 
@@ -27,11 +24,9 @@ namespace RGB.NET.Devices.Wooting.Keyboard
         /// </summary>
         /// <param name="deviceIndex">The index of the <see cref="T:RGB.NET.Devices.Wooting.WootingKeyboardRGBDevice" />.</param>
         /// <param name="physicalKeyboardLayout">The <see cref="T:RGB.NET.Devices.Wooting.WootingPhysicalKeyboardLayout" /> of the <see cref="T:RGB.NET.Devices.Wooting.WootingKeyboardRGBDevice" />.</param>
-        internal WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes deviceIndex, WootingPhysicalKeyboardLayout physicalKeyboardLayout)
+        internal WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes deviceIndex)
             : base(RGBDeviceType.Keyboard, deviceIndex)
-        {
-            this.PhysicalLayout = physicalKeyboardLayout;
-        }
+        { }
 
         #endregion
     }

RGB.NET.Devices.Wooting/WootingDeviceProvider.cs

@@ -90,9 +90,8 @@ namespace RGB.NET.Devices.Wooting
                     _WootingDeviceInfo nativeDeviceInfo = (_WootingDeviceInfo)Marshal.PtrToStructure(_WootingSDK.GetDeviceInfo(), typeof(_WootingDeviceInfo))!;
                     IWootingRGBDevice device = nativeDeviceInfo.Model switch
                     {
-                        // TODO: Find an accurate way to determine physical and logical layouts
-                        "Wooting two" => new WootingKeyboardRGBDevice(new WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes.WootingTwo, WootingPhysicalKeyboardLayout.US)),
-                        "Wooting one" => new WootingKeyboardRGBDevice(new WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes.WootingOne, WootingPhysicalKeyboardLayout.US)),
+                        "Wooting two" => new WootingKeyboardRGBDevice(new WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes.WootingTwo)),
+                        "Wooting one" => new WootingKeyboardRGBDevice(new WootingKeyboardRGBDeviceInfo(WootingDevicesIndexes.WootingOne)),
                         _ => throw new RGBDeviceException("No supported Wooting keyboard connected")
                     };
 
@@ -113,7 +112,7 @@ namespace RGB.NET.Devices.Wooting
 
             return true;
         }
-        
+
         /// <inheritdoc />
         public void Dispose()
         {