Skip to content

Commit 562cbb1

Browse files
Merge pull request #666 from OpenSimulationInterface/antora/base-antora-setup
Build: Create base Antora setup
2 parents 700133d + c3ca3c9 commit 562cbb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+290
-22
lines changed

.antora/antora.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Component name (without spaces!). All content repositories with the same component name are merged in Antora.
2+
name: asamosi
3+
version:
4+
# Update version number accordingly. This is the version for the main branch
5+
main: 'current'
6+
v(*)-antora: V$1
7+
v(*): V$1
8+
V(*): V$1
9+
# Update version number accordingly. This is the version for any other activated branch (branch must be added in the generator site.yml!). Schema = 0.0.x-<branch-name> (only works for branches starting with "feature/")
10+
(*): 'V3.6.0-$1'

.antora/modules/gen/doxynav.adoc

Whitespace-only changes.

.antora/modules/interface/images

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../doc/images

.antora/modules/interface/nav.adoc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[preface]
2+
* xref:00_preface/00_foreword.adoc[]
3+
[preface]
4+
* xref:00_preface/01_introduction.adoc[]
5+
* xref:01_scope/01_scope.adoc[]
6+
* xref:02_normative_references/01_normative_references.adoc[]
7+
* xref:03_terms_and_definitions/01_terms_and_definitions.adoc[]
8+
* xref:04_abbreviations/01_abbreviations.adoc[]
9+
* xref:05_backward_compatibility/01_backward_compatibility.adoc[]
10+
11+
[appendix]
12+
* xref:xx_annexes/REPLACE_ME.adoc[]
13+
[bibliography]
14+
* xref:bibliography.adoc[]
15+
16+
:sectnums!:
17+
* xref:list_of_figures.adoc[]
18+
19+
:sectnums!:
20+
* xref:list_of_tables.adoc[]
21+
22+
// TODO Replace with generator

.antora/modules/interface/pages

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../doc

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Is this a bug fix or a feature? Does it break any existing functionality or forc
1111
How has it been tested?
1212

1313
#### Take this checklist as orientation for yourself, if this PR is ready for the Change Control Board:
14-
- [ ] My suggestion follows the [style and contributors guidelines](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/howtocontribute.html).
15-
- [ ] I have taken care about the [documentation](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/commenting.html).
14+
- [ ] My suggestion follows the [style and contributors guidelines](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/start_contributing.html).
15+
- [ ] I have taken care about the [message documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_messages.html) and the [fields and enums documentation](https://opensimulationinterface.github.io/osi-antora-generator/asamosi/latest/specification/contributing/commenting_fields_enums.html).
1616
- [ ] I have done the [DCO signoff](https://opensimulationinterface.github.io/osi-documentation/open-simulation-interface/doc/howtocontribute.html#developer-certification-of-origin-dco).
1717
- [ ] My changes generate no errors when passing CI tests.
1818
- [ ] I have successfully implemented and tested my fix/feature locally.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ As the complexity of automated driving functions rapidly increases, the requirem
99

1010
For more information on OSI see the [official documentation](https://opensimulationinterface.github.io/osi-documentation/) or the [official reference documentation](https://opensimulationinterface.github.io/open-simulation-interface/) for defined protobuf messages.
1111

12+
<!-- TODO: Update with new Antora hosting -->
13+
1214
[1] Hanke, T., Hirsenkorn, N., van-Driesten, C., Garcia-Ramos, P., Schiementz, M., Schneider, S. & Biebl, E. (2017, February 03). *A generic interface for the environment perception of automated driving functions in virtual scenarios.* Retrieved January 25, 2020, from https://www.hot.ei.tum.de/forschung/automotive-veroeffentlichungen/
1315

1416
## Usage

doc/_config.adoc

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
2+
// This file contains AsciiDoc attributes that shall be used in every AsciiDoc file.
3+
// NOTE: Its content is only applied for Asciidoctor!
4+
// If the same attribute is defined in the antora.yml (without @), the antora.yml definition takes precedence for Antora.
5+
6+
ifndef::root-path[:root-path: ./]
7+
8+
:partials-path: {root-path}../_additional_content
9+
:asciidoc-resources: ../asciidoc-resources
10+
:appendix-caption: Annex
11+
:page-feedbackurl: https://github.com/OpenSimulationInterface/open-simulation-interface/issues/new
12+
13+
// ifndef::use-antora-rules,include-only-once[]
14+
ifndef::include-only-once[]
15+
:GLO_VAR_STA_ASAM_OpenCRG: ASAM OpenCRG
16+
:glo_var_sta_asam_opencrg: {GLO_VAR_STA_ASAM_OpenCRG}
17+
:GLO_VAR_STA_ASAM_OpenDRIVE: ASAM OpenDRIVE
18+
:GLO_VAR_STA_ASAM_OpenLABEL: ASAM OpenLABEL
19+
:GLO_VAR_STA_ASAM_OpenODD: ASAM OpenODD
20+
:GLO_VAR_STA_ASAM_OSI: ASAM OSI®
21+
:GLO_VAR_STA_ASAM_OpenSCENARIO: ASAM OpenSCENARIO
22+
:GLO_VAR_STA_ASAM_OpenXOntology: ASAM OpenXOntology
23+
:GLO_VAR_STA_BSI_PAS_1883: BSI PAS 1883
24+
:revnumber: --localbuild--
25+
:revdate: {docdate}
26+
:bibtex-file: ./content/general_docs/bibliography.bib
27+
// Replace PLACEHOLDER with the name of your standard, e.g. OpenDRIVE
28+
:THIS_STANDARD: {GLO_VAR_STA_ASAM_OSI}
29+
:asam-terminology: https://code.asam.net/common/asam-terminology/-/raw/main/terms_and_definitions_opendrive.adoc
30+
:imagesdir: {root-path}/images
31+
:include-only-once: true
32+
:topicdir: topics
33+
:reusedir: reuse
34+
:toclevels: 3
35+
:xrefstyle: full
36+
:images_open_simulation_interface: {imagesdir}
37+
// :images_osi-sensor-model-packaging: ./osi-sensor-model-packaging/doc/images
38+
:doc_open_simulation_interface: ../../open-simulation-interface/doc/
39+
:doc_osi-sensor-model-packaging: ../../osi-sensor-model-packaging/doc/
40+
// Since a document spanning multiple repos is rendered here, the pathing regarding images is a bit involved.
41+
// We create a variable for every repo that is included. It point to the repo in question.
42+
// If the subrepo is rendered seperatly, then the variable is set to just "./images" with ifdef.
43+
// Please note that this variable has to used in all image includes. Includes here have to use "image::./images..."
44+
// :images_osi_sensor_model_packaging: ./osi-sensor-model-packaging/doc/images // example
45+
:imagesoutdir: ./images/generated_images
46+
47+
endif::[]
48+
49+
ifndef::use-antora-rules[]
50+
include::{asciidoc-resources}/preamble.adoc[]
51+
endif::[]
52+
53+
ifdef::env-gitlab[]
54+
:relfilesuffix: .adoc
55+
endif::[]
56+

doc/architecture/architecture_overview.adoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifndef::include-only-once[]
2+
:root-path: ../
3+
include::{root-path}_config.adoc[]
4+
endif::[]
15
= Overview of OSI architecture
26

37
OSI contains an object-based environment description that uses the message format of the https://github.com/protocolbuffers/protobuf/wiki[Protocol Buffer] library.
@@ -7,6 +11,7 @@ Top-level messages define the `GroundTruth` interface, the `SensorData` interfac
711

812
The following figure shows the interfaces and models involved in modeling a sensor.
913

14+
[#fig-open-simulation-interface-overview]
1015
.Open Simulation Interface overview
1116
image::{images_open_simulation_interface}/osi-context.png[1100]
1217

@@ -16,12 +21,14 @@ The `TrafficCommand` interface makes it possible to send commands to traffic par
1621
The `TrafficUpdate` interface makes it possible to receive the updated state from traffic participant models.
1722
The following figure shows the interfaces of a generic traffic participant.
1823

24+
[#fig-interface-traffic-participant]
1925
.Interface of a traffic participant
2026
image::{images_open_simulation_interface}/osi-traffic-participant-principle.png[1100]
2127

2228
Traffic participant models may use other OSI interfaces internally, for example, to model autonomous vehicles.
2329
The following figure shows a more advanced use case for traffic participants.
2430

31+
[#fig-traffic-participant-sensor-models]
2532
.Traffic participant with sensor models, AD function, and dynamic model
2633
image::{images_open_simulation_interface}/osi-traffic-participant-advanced.png[1100]
2734

doc/architecture/data_layer.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifndef::include-only-once[]
2+
:root-path: ../
3+
include::{root-path}_config.adoc[]
4+
endif::[]
15
= Data layer
26

37
The OSI data layer is defined in the message specifications using the ProtoBuf IDL cite:[protobuf].

0 commit comments

Comments
 (0)