Skip to content
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
# Full git history is needed to get a proper list
# of changed files within `super-linter`
fetch-depth: 0
persist-credentials: false

################################
# Run Linter against code base #
Expand Down
4 changes: 1 addition & 3 deletions Gateway.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
To connect your local OPC UA server to the umati.app the initiative provides a software gateway.
This gateway subscribes via OPC UA (Client/Server; TCP Binary) to your server and publishes the information to an MQTT broker.

~~This [gateway](https://github.com/umati/Dashboard-OPCUA-Client) is provided as an open source version based on [open62541](https://open62541.org) and currently uses a _custom_ JSON encoding for the payload. It is planned to migrate to OPC UA part 14 JSON encoding and defined topic tree, as soon as v1.05.03 is published.~~

A new version of the [gateway](https://github.com/umati/umatiGateway) is provided as an open source version based on [OPC UA .NET Standard Stack](https://github.com/OPCFoundation/UA-.NETStandard) and currently uses a _custom_ JSON encoding for the payload. The umati core team currently migrate the encoding to OPC UA part 14 UA JSON encoding and a defined topic tree.
The [uamtiGateway](https://github.com/umati/umatiGateway) is provided as an open source version based on [OPC UA .NET Standard Stack](https://github.com/OPCFoundation/UA-.NETStandard) and uses the UA JSON encoding according to OPC UA part 14 and a defined topic tree.

## Architecture

Expand Down
4 changes: 2 additions & 2 deletions Server.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ We define a well-known entry point (Machines, nsu=<http://opcfoundation.org/UA/M

one machine tool:

![Address space](img/Addressspace_sample.png "Addressspace sample")
![Address space](img/Addressspace_sample.png "Address space sample")

These two address spaces should be merged so that in the aggregated server there is only one _Machines_-Folder and each Machine instance is under this organization-node with the same NodeId-Identifiers und NodeId-URI (the NodeId-Index will be different) as in the originating OPC UA server.

The required namespaces for Machinery and related Companion Specifcations is only loaded once in the aggregated server.

![Address space](img/Addressspace_aggregated.png "Adress space aggregated")
![Address space](img/Addressspace_aggregated.png "Address space aggregated")
1 change: 1 addition & 0 deletions Specs/Fairs.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@
| LIGNA | LIGNA Hannover | <https://www.ligna.de/> |
| METAV | METAV | <https://metav.de> |
| SPS | SPS Nürnberg | <https://sps.mesago.com/> |
| TMTS | TMTS Taiwan | <https://www.tmts.tw/> |
| VIRTUAL | Permanent virtual fair | <https://umati.app> |
2 changes: 1 addition & 1 deletion index.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ This documentation is versioned, as some content details will be delivered later
| [Geometrical Measuring Systems](Specs/GeometricalMeasuringSystems.md) | GMS | Adds specification page | [49c11bc](https://github.com/umati/Showcase/commit/49c11bc70113b8ceb4ea718e8cef5e27dd9ec5ff) |
| [PlasticsRubber](Specs/PlasticsRubber.md) | PlasticsRubber | Adds specifications 40077, 40079 RC, 40082-1, 40082-2, 40082-3, 40084-2, 40084-11, PRGeneric | [5c95751](https://github.com/umati/Showcase/commit/5c95751e6a9220ed2fdda5f030d841a8b22e944b) |
| [LaserSystems](Specs/Laser.md) | LaserSystems | Adds specification 40530 | [8391639](https://github.com/umati/Showcase/commit/839163922925d93c733563f6c99b133f2ccc120c) |
| [TextileTestingDevices](Specs/TTD.md) | Textile Testing Devices | Adds specification 40444 | [d7dd188](https://github.com/umati/Showcase/commit/d7dd18858a1d67414c98c4aa3d3535a87f5e7dec) |
| [TextileTestingDevices](Specs/TTD.md) | Textile Testing Devices | Adds specification 40444 | [d7dd188](https://github.com/umati/Showcase/commit/d7dd18858a1d67414c98c4aa3d3535a87f5e7dec) |

## Demonstrator story umati showcase

Expand Down
Loading