Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ public interface IAxesController : IDriver
/// </summary>
/// <param name="axis">The axis which should be moved</param>
/// <param name="targetPosition">The target position of the axis</param>
/// <param name="callback">The callback which will be executed after the axis movement</param>
void MoveAxis(Axes axis, double targetPosition, DriverResponse<AxisMovementResponse> callback);
Task<AxisMovementResponse> MoveAxis(Axes axis, double targetPosition);

/// <summary>
/// Will move the axis of the laser to the given position
/// </summary>
/// <param name="axis">The axis which should be moved</param>
/// <param name="targetPosition">The target position of the axis</param>
/// <param name="callback">The callback which will be executed after the axis movement</param>
void MoveAxis(Axes axis, AxisPosition targetPosition, DriverResponse<AxisMovementResponse> callback);
Task<AxisMovementResponse> MoveAxis(Axes axis, AxisPosition targetPosition);
}
}
4 changes: 2 additions & 2 deletions src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ public interface ICameraDriver<TImage> : IDriver where TImage : class
/// Capture a single image from the camera
/// </summary>
/// <returns>
/// The image that was captured or null in case no image
/// The image that was captured or null in case no image
/// could be retrieved
/// </returns>
Task<TImage?> CaptureImage();
Task<TImage> CaptureImage();
}
}

17 changes: 3 additions & 14 deletions src/Moryx.AbstractionLayer/Drivers/Marking/IMarkingLaserDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,15 @@ namespace Moryx.AbstractionLayer.Drivers.Marking
public interface IMarkingLaserDriver : IDriver
{
/// <summary>
/// Set up marking file as a preperation for the marking process
/// Set up marking file as a preparation for the marking process
/// </summary>
void SetMarkingFile(MarkingFile file, DriverResponse<MarkingFileResponse> callback);
Task<MarkingFileResponse> SetMarkingFileAsync(MarkingFile file);

/// <summary>
/// Will start the marking process and executes the given callback after finish
/// </summary>
/// <param name="config">The configuration for the marking process.</param>
/// <param name="callback">The callback which will be executed after the marking process</param>
void Mark(MarkingConfiguration config, DriverResponse<MarkingResponse> callback);

/// <summary>
/// Triggers a message to get the last error
/// </summary>
void RequestLastError();

/// <summary>
/// Triggers a message to get the last warning
/// </summary>
void RequestLastWarning();
Task<MarkingResponse> MarkAsync(MarkingConfiguration config);

/// <summary>
/// Will be fired if an error occured
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ public interface IPickByLightDriver : IDriver
/// <summary>
/// Activate instruction for this address
/// </summary>
void ActivateInstruction(string address, LightInstructions instruction);
Task ActivateInstruction(string address, LightInstructions instruction);

/// <summary>
/// Deactivate an instruction
/// </summary>
void DeactivateInstruction(string address);
Task DeactivateInstruction(string address);

/// <summary>
/// Instruction was confirmed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public interface IWeightScaleDriver : IDriver
/// <summary>
/// Requests the weight from the scale.
/// </summary>
void GetCurrentWeight(DriverResponse<WeightResult> callback);
Task<WeightResult> GetCurrentWeight();

/// <summary>
/// Occurs when the weight scale weight was read.
Expand Down
7 changes: 1 addition & 6 deletions src/Moryx.AbstractionLayer/Drivers/TransmissionResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
namespace Moryx.AbstractionLayer.Drivers
{
/// <summary>
/// Generic base delegate for driver APIs with callback
/// </summary>
public delegate void DriverResponse<in TResult>(IDriver sender, TResult result) where TResult : TransmissionResult;

/// <summary>
/// Base result object for transissions
/// Base result object for transmissions
/// </summary>
public abstract class TransmissionResult
{
Expand Down
Loading