Skip to content

Commit f52f17f

Browse files
ToxantronToxantron
committed
Merge remote-tracking branch 'origin/release/6' into port/fix/instruction-response-object
2 parents 6cb4856 + 8ca509e commit f52f17f

File tree

7 files changed

+42
-17
lines changed

7 files changed

+42
-17
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ on:
1717
env:
1818
dotnet_sdk_version: '8.0.100'
1919
REPOSITORY_NAME: ${{ github.event.repository.name }}
20-
MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
21-
MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
22-
MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-future/api/v2/package'
23-
MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-future/api/v3/index.json'
20+
MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx-oss-ci/api/v2/package'
21+
MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx-oss-ci/api/v3/index.json'
22+
MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-oss-ci/api/v2/package'
23+
MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-oss-ci/api/v3/index.json'
2424
MORYX_PACKAGE_TARGET_RELEASE: 'https://api.nuget.org/v3/index.json'
2525
MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
2626

‎README.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
</a>
1818
</p>
1919

20+
<p align="center">
21+
<a href="https://www.nuget.org/packages/Moryx/">
22+
<img alt="NuGet Release" src="https://img.shields.io/nuget/v/Moryx.ControlSystem?color=0098A1">
23+
</a>
24+
</p>
25+
2026
# MORYX Factory
2127

2228
**Public API definitions for MORYX Factory applications.**
@@ -25,13 +31,13 @@ This repository contains the APIs, domain objects and developer documentation fo
2531

2632
## Packages
2733

28-
| Package | Stable | Preview | Future |
29-
|--|--|--|--|
30-
| `Moryx.ControlSystem` | [![NuGet](https://img.shields.io/nuget/v/Moryx.ControlSystem.svg)](https://www.nuget.org/packages/Moryx.ControlSystem/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.ControlSystem)](https://www.myget.org/feed/moryx/package/nuget/Moryx.ControlSystem) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.ControlSystem)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.ControlSystem) |
31-
| `Moryx.Orders` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Orders.svg)](https://www.nuget.org/packages/Moryx.Orders/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Orders)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Orders) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Orders)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.Orders) |
32-
| `Moryx.Users` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Users.svg)](https://www.nuget.org/packages/Moryx.Users/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Users)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Users) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Users)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.USers) |
33-
| `Moryx.ProcessData` | [![NuGet](https://img.shields.io/nuget/v/Moryx.ProcessData.svg)](https://www.nuget.org/packages/Moryx.ProcessData/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.ProcessData)](https://www.myget.org/feed/moryx/package/nuget/Moryx.ProcessData) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.ProcessData)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.ProcessData) |
34-
| `Moryx.Simulation` | [![NuGet](https://img.shields.io/nuget/v/Moryx.Simulation.svg)](https://www.nuget.org/packages/Moryx.Simulation/) | [![MyGet](https://img.shields.io/myget/moryx/vpre/Moryx.Simulation)](https://www.myget.org/feed/moryx/package/nuget/Moryx.Simulation) | [![MyGet-Release](https://img.shields.io/myget/moryx-future/vpre/Moryx.Simulation)](https://www.myget.org/feed/moryx-future/package/nuget/Moryx.Simulation) |
34+
| Package | |
35+
|--|--|
36+
| `Moryx.ControlSystem` | |
37+
| `Moryx.Orders` | |
38+
| `Moryx.Users` | |
39+
| `Moryx.ProcessData` | |
40+
| `Moryx.Simulation` | |
3541
## Contribute
3642

3743
You can contribute to the MORYX Factory Domain by reporting bugs and suggesting extensions to APIs.

‎src/Moryx.ControlSystem/VisualInstructions/InstructionResult.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ namespace Moryx.ControlSystem.VisualInstructions
99
/// </summary>
1010
public class InstructionResult
1111
{
12+
/// <summary>
13+
/// Key of the result. This value needs to be unique for the instruction the result is used for.
14+
/// </summary>
1215
public string Key { get; set; }
1316

17+
/// <summary>
18+
/// Human readable value of the result
19+
/// </summary>
1420
public string DisplayValue { get; set; }
1521
}
1622
}

‎src/Moryx.Orders/Facade/IOrderManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public interface IOrderManagement
150150

151151
/// <summary>
152152
/// Tries to advise the <see cref="Operation"/>.
153-
/// The returned advice result contains information regarding the successful or unsuccesful attempt.
153+
/// The returned advice result contains information regarding the successful or unsuccessful attempt.
154154
/// </summary>
155155
/// <param name="operation">The <see cref="Operation"/> to advice.</param>
156156
/// <param name="advice">The <see cref="OperationAdvice"/> to apply on the <see cref="Operation"/>.</param>

‎src/Moryx.Orders/Operation.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,23 @@ public class Operation
108108
/// <summary>
109109
/// Current state classification of this operation
110110
/// </summary>
111-
public virtual OperationClassification State { get => (OperationClassification)((int)FullState & 0xFF); protected set => FullState = value; }
111+
public virtual OperationClassification State
112+
{
113+
get => (OperationClassification)((int)FullState & 0xFF);
114+
protected set => FullState = value;
115+
}
112116

113117
/// <summary>
114118
/// Current state classification of this operation
115119
/// </summary>
116120
public virtual OperationClassification FullState { get; protected set; }
117121

122+
/// <summary>
123+
/// Detailed display name of the state
124+
/// TODO: Remove this property in next major and replace rework OperationClassification
125+
/// </summary>
126+
public virtual string StateDisplayName { get; protected set; }
127+
118128
/// <summary>
119129
/// Source information of the operation
120130
/// </summary>

‎src/Moryx.Orders/OperationClassification.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Moryx.Orders
88
/// <summary>
99
/// Enum providing the classification of the internal state machine of the operation for an external representation
1010
/// The lowest 8 bits define the state of the operation. The following 16 bits contain flags for the executable
11-
/// actions on the operation and the trailing 8 bits overal classification information.
11+
/// actions on the operation and the trailing 8 bits overall classification information.
1212
/// Bit: 31 - 24 | 23 - 8 | 7 - 0 |
1313
/// Flag: Type | Usage | State |
1414
/// </summary>
@@ -60,7 +60,6 @@ public enum OperationClassification
6060
/// </summary>
6161
Failed = 11,
6262

63-
6463
/// <summary>
6564
/// Flag if the operation can be reloaded
6665
/// </summary>
@@ -84,6 +83,11 @@ public enum OperationClassification
8483
/// <summary>
8584
/// Flag if the operation can be adviced
8685
/// </summary>
87-
CanAdvice = (1 << 20)
86+
CanAdvice = (1 << 20),
87+
88+
/// <summary>
89+
/// Flag if the operation is running but has no process
90+
/// </summary>
91+
IsAmountReached = (1 << 22),
8892
}
8993
}

‎src/Moryx.Orders/OperationLogMessage.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using Microsoft.Extensions.Logging;
6-
using Moryx.Logging;
76

87
namespace Moryx.Orders
98
{

0 commit comments

Comments
 (0)