Applied common naming, inheritance and TPL usage

Author: dbeuchler

src/Moryx.AbstractionLayer/Drivers/Axis/AxisMovement.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
-using Moryx.AbstractionLayer.Hardware;
-
 namespace Moryx.AbstractionLayer.Drivers.Axis;
 
 /// <summary>
@@ -23,7 +21,7 @@ public class AxisMovement
     /// <summary>
     /// Predefined position of the axis to move to
     /// </summary>
-    public AxisPosition? PredefinedPosition { get; set; }
+    public AxisPosition? PredefinedPosition { get; }
 
     /// <summary>
     /// Creates a new instance of <see cref="AxisMovement"/> with a target position

src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs

@@ -12,6 +12,6 @@ public interface IAxesController : IDriver
         /// Will move the axes of the system to the given position
         /// </summary>
         /// <param name="movement">Array of axes which should be moved</param>
-        Task<AxisMovementResponse> MoveAxes(params AxisMovement[] movement);
+        Task<AxisMovementResponse> MoveAxesAsync(params AxisMovement[] movement);
     }
 }

src/Moryx.AbstractionLayer/Drivers/Axis/NumberedAxis.cs

@@ -12,6 +12,7 @@ public struct NumberedAxis : IEquatable<NumberedAxis>
         /// Axis
         /// </summary>
         public Axes Axis { get; }
+
         /// <summary>
         /// Number
         /// </summary>

src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs

@@ -20,7 +20,7 @@ public interface ICameraDriver<TImage> : IDriver where TImage : class
         ///     The image that was captured or null in case no image
         ///     could be retrieved
         /// </returns>
-        Task<TImage> CaptureImage();
+        Task<TImage> CaptureImageAsync();
     }
 }
 

src/Moryx.AbstractionLayer/Drivers/Rfid/IRfidDriver.cs

@@ -1,16 +1,14 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
-namespace Moryx.AbstractionLayer.Drivers.Rfid
+using Moryx.AbstractionLayer.Drivers.InOut;
+
+namespace Moryx.AbstractionLayer.Drivers.Rfid;
+
+/// <summary>
+/// Driver API of the RFID driver
+/// </summary>
+public interface IRfidDriver : IInputDriver<RfidTag>
 {
-    /// <summary>
-    /// Driver API of the RFID driver
-    /// </summary>
-    public interface IRfidDriver : IDriver
-    {
-        /// <summary>
-        /// Event raised when tags are read by the antenna
-        /// </summary>
-        event EventHandler<RfidTag[]> TagsRead;
-    }
+
 }

src/Moryx.AbstractionLayer/Drivers/Scales/IWeightScaleDriver.cs

@@ -1,21 +1,15 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
+using Moryx.AbstractionLayer.Drivers.InOut;
+
 namespace Moryx.AbstractionLayer.Drivers.Scales
 {
     /// <summary>
     /// Interface for weight scales to request a weight
     /// </summary>
-    public interface IWeightScaleDriver : IDriver
+    public interface IWeightScaleDriver : IInputDriver<MeasuredWeight>
     {
-        /// <summary>
-        /// Requests the weight from the scale.
-        /// </summary>
-        Task<WeightResult> GetCurrentWeight();
 
-        /// <summary>
-        /// Occurs when the weight scale weight was read.
-        /// </summary>
-        event EventHandler<WeightResult> WeightRead;
     }
 }

src/Moryx.AbstractionLayer/Drivers/Scales/MeasuredWeight.cs

@@ -0,0 +1,32 @@
+// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+using System.Diagnostics;
+
+namespace Moryx.AbstractionLayer.Drivers.Scales;
+
+/// <summary>
+/// Result weight scales
+/// </summary>
+[DebuggerDisplay("Weight = {Weight}, Unit = {Unit}")]
+public class MeasuredWeight
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MeasuredWeight"/> class.
+    /// </summary>
+    public MeasuredWeight(double weight, string unit)
+    {
+        Weight = weight;
+        Unit = unit;
+    }
+
+    /// <summary>
+    /// The read weight
+    /// </summary>
+    public double Weight { get; }
+
+    /// <summary>
+    /// Gets or sets the unit.
+    /// </summary>
+    public string Unit { get; }
+}

src/Moryx.AbstractionLayer/Drivers/Scales/WeightResult.cs

@@ -1,16 +1,15 @@
 // Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
 // Licensed under the Apache License, Version 2.0
 
-namespace Moryx.AbstractionLayer.Drivers.Scanner
+#nullable enable
+
+using Moryx.AbstractionLayer.Drivers.InOut;
+
+namespace Moryx.AbstractionLayer.Drivers.Scanner;
+
+/// <summary>
+/// Common interface for barcode / QR-Code scanners
+/// </summary>
+public interface IScannerDriver : IInputDriver<ScannerResult>
 {
-    /// <summary>
-    /// Common interface for barcode / QR-Code scanners
-    /// </summary>
-    public interface IScannerDriver : IDriver
-    {
-        /// <summary>
-        /// Event raised when a code was read
-        /// </summary>
-        event EventHandler<string> CodeRead;
-    }
 }

src/Moryx.AbstractionLayer/Drivers/Scanner/IScannerDriver.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
+// Licensed under the Apache License, Version 2.0
+
+#nullable enable
+using System.Diagnostics;
+
+namespace Moryx.AbstractionLayer.Drivers.Scanner;
+
+/// <summary>
+/// Result of the <see cref="IScannerDriver"/>
+/// </summary>
+[DebuggerDisplay("Code = {Code}")]
+public class ScannerResult
+{
+    /// <summary>
+    /// A read code from a barcode / qr-code scanner
+    /// </summary>
+    public string? Code { get; set; }
+
+    /// <summary>
+    /// Optional binary data of the scanned content
+    /// </summary>
+    public byte? BinaryData { get; set; }
+}