From 9ffa052fa0ed869400bd57b23ec15f63f1f27896 Mon Sep 17 00:00:00 2001 From: Birgit Boss Date: Sun, 15 Dec 2024 19:23:37 +0100 Subject: [PATCH 1/4] fix file name + add overview constraints to change log + editoral changes --- documentation/IDTA-01001/modules/ROOT/nav.adoc | 7 ------- ...overview_constraints.adoc => overview-constraints.adoc} | 0 documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc | 1 + 3 files changed, 1 insertion(+), 7 deletions(-) rename documentation/IDTA-01001/modules/ROOT/pages/annex/{overview_constraints.adoc => overview-constraints.adoc} (100%) diff --git a/documentation/IDTA-01001/modules/ROOT/nav.adoc b/documentation/IDTA-01001/modules/ROOT/nav.adoc index e423d7cd..c03862ff 100644 --- a/documentation/IDTA-01001/modules/ROOT/nav.adoc +++ b/documentation/IDTA-01001/modules/ROOT/nav.adoc @@ -19,13 +19,6 @@ SPDX-License-Identifier: CC-BY-4.0 :xrefstyle: short //// -// no comments between entries !!! - -//= image:../../idta-logo.png[width=100%] - - -// include::./includes/index.adoc[] - * xref:terms-definitions-and-abbreviations.adoc[Terms and Definitions] diff --git a/documentation/IDTA-01001/modules/ROOT/pages/annex/overview_constraints.adoc b/documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc similarity index 100% rename from documentation/IDTA-01001/modules/ROOT/pages/annex/overview_constraints.adoc rename to documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc diff --git a/documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc b/documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc index 4b0d5dbd..a8127fab 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/changelog.adoc @@ -93,6 +93,7 @@ Editorial Bugfixes: Minor Changes: +* add Annex with overview of constraints (https://github.com/admin-shell-io/aas-specs/issues/509[#509]) * update Constraint AASd-116 (https://github.com/admin-shell-io/aas-specs/issues/298[#298]) * remove information on OPC UA mapping (https://github.com/admin-shell-io/aas-specs/issues/373[#373]) * remove information on AutomationML mapping (https://github.com/admin-shell-io/aas-specs/issues/397[#397]) From d265438a63e51088f94727d22998688d7b716449 Mon Sep 17 00:00:00 2001 From: Birgit Boss Date: Sun, 15 Dec 2024 19:26:02 +0100 Subject: [PATCH 2/4] fix naming of ContainerElement --- .../modules/ROOT/partials/diagrams/90-submodel-element.puml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/IDTA-01001/modules/ROOT/partials/diagrams/90-submodel-element.puml b/documentation/IDTA-01001/modules/ROOT/partials/diagrams/90-submodel-element.puml index c2298224..a7670e30 100644 --- a/documentation/IDTA-01001/modules/ROOT/partials/diagrams/90-submodel-element.puml +++ b/documentation/IDTA-01001/modules/ROOT/partials/diagrams/90-submodel-element.puml @@ -59,8 +59,8 @@ SubmodelElement <|--- EventElement SubmodelElement <|-- Operation SubmodelElement <|--- RelationshipElement SubmodelElement <|-- ContainerElement -ontainerElement<|-- SubmodelElementCollection -ontainerElement <|--- SubmodelElementList +ContainerElement<|-- SubmodelElementCollection +ContainerElement <|--- SubmodelElementList SubmodelElementCollection ..> SubmodelElement SubmodelElementList ..> SubmodelElement @enduml \ No newline at end of file From afd73278d9e25f60ff33d559d2470a73bd489041 Mon Sep 17 00:00:00 2001 From: Birgit Boss Date: Sun, 15 Dec 2024 19:33:32 +0100 Subject: [PATCH 3/4] update bibliography add IEC 63278-2 --- .../IDTA-01001/modules/ROOT/pages/bibliography.adoc | 6 ++++-- documentation/IDTA-01001/modules/ROOT/pages/preamble.adoc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/documentation/IDTA-01001/modules/ROOT/pages/bibliography.adoc b/documentation/IDTA-01001/modules/ROOT/pages/bibliography.adoc index 4c4478ed..c82b1f44 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/bibliography.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/bibliography.adoc @@ -189,6 +189,9 @@ https://profiles.opcfoundation.org/workinggroup/40[Industry 4.0 Asset Administra [43] OPC UA Information Models. [Online]. Available: https://opcfoundation.org/developer-tools/specifications-opc-ua-information-models //// +[#bib43] +[43] IEC 63278-2 "Asset Administration Shell for industrial applications – Part 2: Metamodel". + [#bib44] [44] IEC 63278-1:2023 "Asset Administration Shell for industrial applications – Part 1: Asset Administration Shell structure". @@ -222,8 +225,7 @@ Available: https://industrialdigitaltwin.org/wp-content/uploads/2022/12/I40-IDTA Oct. 2020, Plattform Industrie 4.0 [Online] Available: https://www.plattform-i40.de/PI40/Redaktion/EN/Downloads/Publikation/secure_downloadservice.html [#bib51] -[51] "AAS Repository. -Repository for Information and Code for the Asset Administration Shell". +[51] "Repository of the Industrial Digital Twin Association (IDTA)". Industrial Digital Twin Association. https://github.com/admin-shell-io // bib52 see [41] \ No newline at end of file diff --git a/documentation/IDTA-01001/modules/ROOT/pages/preamble.adoc b/documentation/IDTA-01001/modules/ROOT/pages/preamble.adoc index 4888e9dc..8d8b3d5c 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/preamble.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/preamble.adoc @@ -28,7 +28,7 @@ This document focuses on: This document presumes some familiarity with the concept of the Asset Administration Shell. Some of the concepts are described in Annex A for convenience’s sake. -The concepts are being standardized as IEC standard IEC 63278 series xref:bibliography.adoc#bib44[[44\]]. +The concepts are being standardized as IEC standard IEC 63278 series, xref:bibliography.adoc#bib44[[44\]] and xref:bibliography.adoc#bib43[[43\]]. The main stakeholders addressed in this document are architects and software developers aiming to implement a digital twin using the Asset Administration Shell in an interoperable way. Additionally, the content can also be used as input for discussions with international standardization organizations and further initiatives. Please consult the continuously updated reading guide xref:bibliography.adoc#bib38[[38\]] for an overview of documents on the Asset Administration Shell. From 45270443ef540f53692df871d6681e7cf22e723b Mon Sep 17 00:00:00 2001 From: Birgit Boss Date: Sun, 15 Dec 2024 19:42:37 +0100 Subject: [PATCH 4/4] add missing include --- .../modules/ROOT/pages/annex/overview-constraints.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc b/documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc index f02cd2b2..e20f7d00 100644 --- a/documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc +++ b/documentation/IDTA-01001/modules/ROOT/pages/annex/overview-constraints.adoc @@ -11,8 +11,11 @@ Plattform Industrie 4.0; Anna Salari, Publik. Agentur für Kommunikation GmbH, d //// + + [appendix] = Overview Constraints (non-normative) +include::../includes/constraints.adoc[] This annex gives an overview of the constraints contained in this document. No additional comments are added, for details please refer to the normative parts of the specification.