Merge pull request #6 from dend/february-2025

February 2025 Update

Author: dend

src/DeckSurf.SDK.StartBoard/Program.cs

@@ -1,10 +1,12 @@
-using DeckSurf.SDK.Core;
-using DeckSurf.SDK.Models;
-using DeckSurf.SDK.Util;
-using System;
+using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Threading;
+using DeckSurf.SDK.Core;
+using DeckSurf.SDK.Models;
+using DeckSurf.SDK.Util;
 
 namespace DeckSurf.SDK.StartBoard
 {
@@ -28,23 +30,29 @@ static void Main(string[] args)
 
             byte[] testImage = File.ReadAllBytes(args[0]);
 
-            var image = ImageHelpers.ResizeImage(testImage, device.ScreenWidth, device.ScreenHeight, device.IsButtonImageFlipRequired);
-
-            device.SetScreen(image, 250, device.ScreenWidth, device.ScreenHeight);
+            var image = ImageHelpers.ResizeImage(testImage, device.ScreenWidth, device.ScreenHeight, RotateFlipType.Rotate180FlipNone, ImageFormat.Jpeg);
+            device.SetScreen(image, 0, device.ScreenWidth, device.ScreenHeight);
 
-            var keyImage = ImageHelpers.ResizeImage(testImage, device.ButtonResolution, device.ButtonResolution, device.IsButtonImageFlipRequired);
-            device.SetKey(1, keyImage);
+            device.SetKey(1, testImage);
 
-            device.SetBrightness(29);
+            device.SetBrightness(45);
             //device.ClearButtons();
 
+            device.SetKeyColor(2, Color.Red);
+            device.SetKeyColor(4, Color.Green);
+
             Console.WriteLine("Done");
             exitSignal.WaitOne();
         }
 
         private static void Device_OnButtonPress(object source, ButtonPressEventArgs e)
         {
-            Console.WriteLine($"Button with ID {e.Id} was pressed. It's identified as {e.ButtonKind}. Event is {e.EventKind}. If this is a touch screen, coordinates are {e.TapCoordinates.X} and {e.TapCoordinates.Y}. Is knob rotated: {e.IsKnobRotating}. Rotation direction: {e.KnobRotationDirection}.");
+            Console.WriteLine($"Button with ID {e.Id} was pressed. It's identified as {e.ButtonKind}. Event is {e.EventKind}. Is knob rotated: {e.IsKnobRotating}. Rotation direction: {e.KnobRotationDirection}.");
+
+            if (e.TapCoordinates != null)
+            {
+                Console.WriteLine($"If this is a touch screen, coordinates are {e.TapCoordinates.Value.X} and {e.TapCoordinates.Value.Y}.");
+            }
         }
     }
 }

src/DeckSurf.SDK/Core/DeviceManager.cs

@@ -78,6 +78,13 @@ public static IEnumerable<ConnectedDevice> GetDeviceList()
                                 break;
                             }
 
+                        case DeviceModel.MK2:
+                            {
+                                connectedDevices.Add(new StreamDeckMK2(device.VendorID, device.ProductID, device.DevicePath, device.GetFriendlyName(), device.GetSerialNumber()
+                                    ));
+                                break;
+                            }
+
                         case DeviceModel.Neo:
                             {
                                 connectedDevices.Add(new StreamDeckNeo(device.VendorID, device.ProductID, device.DevicePath, device.GetFriendlyName(), device.GetSerialNumber()

src/DeckSurf.SDK/Models/ButtonPressEventArgs.cs

@@ -19,27 +19,27 @@ namespace DeckSurf.SDK.Models
     /// <param name="tapCoordinates">Coordinates on the touch screen where a tap occurred.</param>
     /// <param name="isKnobRotating">Determines whether a knob is being rotated.</param>
     /// <param name="knobRotationDirection">Direction of a knob being rotated.</param>
-    public class ButtonPressEventArgs(int id, ButtonEventKind eventKind, ButtonKind buttonKind, Point tapCoordinates, bool isKnobRotating, KnobRotationDirection knobRotationDirection) : EventArgs
+    public class ButtonPressEventArgs(int id, ButtonEventKind eventKind, ButtonKind? buttonKind, Point? tapCoordinates, bool? isKnobRotating, KnobRotationDirection? knobRotationDirection) : EventArgs
     {
         /// <summary>
         /// Gets a value indicating whether a knob is being rotated.
         /// </summary>
-        public bool IsKnobRotating { get; } = isKnobRotating;
+        public bool? IsKnobRotating { get; } = isKnobRotating;
 
         /// <summary>
         /// Gets the knob rotation direction if the button is a knob and was rotated.
         /// </summary>
-        public KnobRotationDirection KnobRotationDirection { get; } = knobRotationDirection;
+        public KnobRotationDirection? KnobRotationDirection { get; } = knobRotationDirection;
 
         /// <summary>
         /// Gets the coordinates on the touch screen where the tap occurred.
         /// </summary>
-        public Point TapCoordinates { get; } = tapCoordinates;
+        public Point? TapCoordinates { get; } = tapCoordinates;
 
         /// <summary>
         /// Gets the kind of the button pressed.
         /// </summary>
-        public ButtonKind ButtonKind { get; } = buttonKind;
+        public ButtonKind? ButtonKind { get; } = buttonKind;
 
         /// <summary>
         /// Gets the numeric ID of the button being pressed.