diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 735f282..14eccb5 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -47,7 +47,7 @@ jobs: # Run Linter against code base # ################################ - name: Lint Code Base - uses: github/super-linter@v5.0.0 + uses: super-linter/super-linter@v6.5.0 env: VALIDATE_ALL_CODEBASE: false DEFAULT_BRANCH: main diff --git a/Specs/MachineTool.md b/Specs/MachineTool.md index 4ace7c6..9173a54 100644 --- a/Specs/MachineTool.md +++ b/Specs/MachineTool.md @@ -25,15 +25,15 @@ To fill the demo dashboard machine page with the most content the variables mark | **Attribute** | **Value** | | | | | | --- | --- | --- | --- | --- | --- | -| BrowseName | MachineIdentificationType | -| IsAbstract | False | -| Description | Contains information about the identification and nameplate of a machine | +| BrowseName | MachineIdentificationType | | | | | +| IsAbstract | False | | | | | +| Description | Contains information about the identification and nameplate of a machine | | | | | | | | | | | | | **References** | **NodeClass** | **BrowseName** | **DataType** | **TypeDefinition** | **Other** | -| Subtype of the 2:FunctionalGroupType defined in OPC 10000-100, i.e. inheriting the InstanceDeclarations of that Node. | +| Subtype of the 2:FunctionalGroupType defined in OPC 10000-100, i.e. inheriting the InstanceDeclarations of that Node. | | | | | | | 0:HasProperty | Variable | 0:DefaultInstanceBrowseName | 0:QualifiedName | 0:PropertyType | | -| 0:HasInterface | ObjectType | IMachineVendorNameplateType | -| 0:HasInterface | ObjectType | IMachineTagNameplateType | +| 0:HasInterface | ObjectType | IMachineVendorNameplateType | | | | +| 0:HasInterface | ObjectType | IMachineTagNameplateType | | | | | Applied from IMachineVendorNameplateType | | | | | | | 0:HasProperty | Variable | 2:ProductInstanceUri | 0:String | 0:PropertyType | M, RO | | 0:HasProperty | Variable | 2:Manufacturer | 0:LocalizedText | 0:PropertyType | M, RO | @@ -63,7 +63,7 @@ The instance _Location_ property is evaluated according to the special requireme `http://www./example` -- The rules for creating a URI can be found online. Please follow [this link](https://en.wikipedia.org/wiki/Uniform_Resource_Identifier). In the case of a website as a URI, it is not necessary that the website actually exists, it only identifies the machine uniquely. In order to simplify debugging it is recommended to choose a URI which allows an identification of the machine also for third persons, e.g. by including the company name. +- The rules for creating a URI can be found online. Please follow [this link](https://en.wikipedia.org/wiki/Uniform_Resource_Identifier). In the case of a URL as a URI, it is not necessary that the site actually exists, it only identifies the machine uniquely. In order to simplify debugging it is recommended to choose a URI which allows an identification of the machine also for third persons, e.g. by including the company name. - The machine will get a unique NamespaceURI after being integrated to the datahub by addition of a suffix to ensure unique namespaces. @@ -75,18 +75,18 @@ The instance _Location_ property is evaluated according to the special requireme ### Active Program Statusbar -For the status overview in the dashboard, the _State_ of the _ProductionActiveProgramType_ is stored and plotted over time. The status bar **does NOT relate to the stacklight** status! +For the status overview in the dashboard, the _StateNumber_ of the _ProductionActiveProgramType.State.CurrentState.Number_ is stored and plotted over time. The status bar **does NOT relate to the stacklight** status! Each status is assigned to a color, the color scheme is here (subject to change): -| State | Color | -| --- | --- | -| Initializing | ⚪ Gray | -| Running | 🟢 Green | -| Ended | 🔵 Cyan | -| Interrupted | 🟠 Orange | -| Aborted | 🔴 Red | -| Any other (unspecified) state | ⚫ Black | +| State |Number | Color | +| --- | --- | --- | +| Initializing |0| ⚪ Grey | +| Running |1| 🟢 Green | +| Ended |2| 🔵 Cyan | +| Interrupted |3| 🟠 Orange | +| Aborted |4| 🔴 Red | +| Any other (unspecified) state | | ⚫ Black | A gap is left for periods of time in which no data was recorded (e.g. machine offline). An exemplary timeline is shown above. diff --git a/img/MachineTool/MT-ActiveProgram.png b/img/MachineTool/MT-ActiveProgram.png index afc3129..e392dcc 100644 Binary files a/img/MachineTool/MT-ActiveProgram.png and b/img/MachineTool/MT-ActiveProgram.png differ diff --git a/img/MachineTool/MT-Overview.png b/img/MachineTool/MT-Overview.png index fe52ae7..cd855df 100644 Binary files a/img/MachineTool/MT-Overview.png and b/img/MachineTool/MT-Overview.png differ