From 9fa5baac4fee0e6ffb1b521b0deca5898a1a60b5 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 14 Oct 2022 17:20:13 +0200 Subject: [PATCH 1/9] Changed version naming for master branch Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .antora/antora.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.antora/antora.yml b/.antora/antora.yml index e091a6471..009e10a9d 100644 --- a/.antora/antora.yml +++ b/.antora/antora.yml @@ -3,6 +3,7 @@ name: asamosi version: # Update version number accordingly. This is the version for the main branch main: 'current' + master: 'current' v(*)-antora: V$1 v(*): V$1 V(*): V$1 From 7e07f4ee4b5223c98314c7b789ed45ed18bc59fc Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Fri, 14 Oct 2022 17:49:32 +0200 Subject: [PATCH 2/9] build: Updated ubuntu image Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .github/workflows/protobuf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index a7acae918..284d819af 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -9,7 +9,7 @@ jobs: build-proto2-linux64: name: Build Proto2 Linux 64 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout OSI @@ -100,7 +100,7 @@ jobs: build-proto3-linux64: name: Build Proto3 Linux 64 - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Checkout OSI From d7c6ff1aa7abd28036f72339d40838312de68d24 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 09:57:32 +0200 Subject: [PATCH 3/9] Added new antora generator trigger Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .github/workflows/antora-generator.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/antora-generator.yml diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml new file mode 100644 index 000000000..6becceff3 --- /dev/null +++ b/.github/workflows/antora-generator.yml @@ -0,0 +1,24 @@ + +name: Antora build trigger + +on: + push: + branches: [ master, build/master-branch-naming ] + pull_request: + branches: [ master ] + +jobs: + trigger_antora: + name: Trigger antora generator + + runs-on: Ubuntu-latest + + steps: + - name: Trigger generator + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.MACHINE_USER_PAT }} + event-type: antora-build-trigger + repository: OpenSimulationInterface/osi-antora-generator + client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}' + \ No newline at end of file From e7d0b13153e53a5eaa406e00cbd8171e20fd9d19 Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 10:18:06 +0200 Subject: [PATCH 4/9] Removed test branch from "on" keyword Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .github/workflows/antora-generator.yml | 2 +- asciidoc-resources | 1 + style-resources | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 asciidoc-resources create mode 160000 style-resources diff --git a/.github/workflows/antora-generator.yml b/.github/workflows/antora-generator.yml index 6becceff3..d992ea690 100644 --- a/.github/workflows/antora-generator.yml +++ b/.github/workflows/antora-generator.yml @@ -3,7 +3,7 @@ name: Antora build trigger on: push: - branches: [ master, build/master-branch-naming ] + branches: [ master ] pull_request: branches: [ master ] diff --git a/asciidoc-resources b/asciidoc-resources new file mode 160000 index 000000000..4baff8cdb --- /dev/null +++ b/asciidoc-resources @@ -0,0 +1 @@ +Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 diff --git a/style-resources b/style-resources new file mode 160000 index 000000000..4baff8cdb --- /dev/null +++ b/style-resources @@ -0,0 +1 @@ +Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 From 5e83a90bc6a906518bc983582ce211ec72aa40af Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 10:51:24 +0200 Subject: [PATCH 5/9] Removed broken references to deleted submodules Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- asciidoc-resources | 1 - style-resources | 1 - 2 files changed, 2 deletions(-) delete mode 160000 asciidoc-resources delete mode 160000 style-resources diff --git a/asciidoc-resources b/asciidoc-resources deleted file mode 160000 index 4baff8cdb..000000000 --- a/asciidoc-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 diff --git a/style-resources b/style-resources deleted file mode 160000 index 4baff8cdb..000000000 --- a/style-resources +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4baff8cdb3a27760d9e188dbacf56b8862ecc154 From b90279418a8a90e104cfbe07b01490080e69d3ed Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 11:18:12 +0200 Subject: [PATCH 6/9] Update of pipeline cache action and key to force a rebuild of protobuf Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .github/workflows/protobuf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index 284d819af..fa5554f55 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -30,10 +30,10 @@ jobs: - name: Cache Dependencies id: cache-depends - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: protobuf-3.20.1 - key: ${{ runner.os }}-v1-depends + key: ${{ runner.os }}-v2-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' From a8889138dd1a0577ca93b580f4e62357b2acea8d Mon Sep 17 00:00:00 2001 From: Philip Windecker Date: Mon, 17 Oct 2022 11:20:49 +0200 Subject: [PATCH 7/9] Fixed outdated cache dependency for protobuf 3 Signed-off-by: Philip Windecker Signed-off-by: Schloemicher, Thomas AVL,AT --- .github/workflows/protobuf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index fa5554f55..c719a68ce 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -121,7 +121,7 @@ jobs: uses: actions/cache@v2 with: path: protobuf-3.20.1 - key: ${{ runner.os }}-v1-depends + key: ${{ runner.os }}-v2-depends - name: Download ProtoBuf if: steps.cache-depends.outputs.cache-hit != 'true' From 2f2675a6e1ba62848bc299fe30e6371b9d6a86ce Mon Sep 17 00:00:00 2001 From: "Schloemicher, Thomas AVL,AT" Date: Fri, 12 Feb 2021 16:38:05 +0100 Subject: [PATCH 8/9] add polyline model to DetectedLaneBoundary Signed-off-by: Schloemicher, Thomas AVL,AT --- osi_detectedlane.proto | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/osi_detectedlane.proto b/osi_detectedlane.proto index 6c8159d18..a6437828b 100644 --- a/osi_detectedlane.proto +++ b/osi_detectedlane.proto @@ -109,6 +109,21 @@ message DetectedLaneBoundary // optional ColorDescription color_description = 6; + // The boundary line can be expressed as a polyline of nth order. + // + repeated BoundaryPolyLineModel boundary_poly_line_model = 7; + + // The range until where the lane boundary is detected. + // + // Unit: m + // + // \rules + // is_greater_than_or_equal_to: 0 + // is_less_than_or_equal_to: 1000 + // \endrules + // + optional double view_range = 8; + // // \brief A candidate for a detected lane boundary as estimated by the // sensor. @@ -135,4 +150,39 @@ message DetectedLaneBoundary // optional LaneBoundary.Classification classification = 2; } + + // + // \brief The lane boundary as polyline model up to third order. + // + message BoundaryPolyLineModel + { + + // P0 parameter of the poly function model that describes the lane boundary. + // + // Unit: m + // + optional double polyline_parameter_p0 = 1; + + // P1 parameter of the poly function model that describes the lane boundary. + // + // Unit: 1 + // + optional double polyline_parameter_p1 = 2; + + // P2 parameter of the poly function model that describes the lane boundary. + // + // Unit: 1/m + // + optional double polyline_parameter_p2 = 3; + + // P3 parameter of the poly function model that describes the lane boundary. + // + // Unit: 1/m² + // + optional double polyline_parameter_p3 = 4; + + // The measured width within the detected range. + // + optional double polyline_width = 5; + } } From 91120e6e312ae04f77609ed1fcb281400a69c667 Mon Sep 17 00:00:00 2001 From: "Schloemicher, Thomas AVL,AT" Date: Wed, 9 Nov 2022 10:27:20 +0100 Subject: [PATCH 9/9] test_non_asci fix Signed-off-by: Schloemicher, Thomas AVL,AT --- osi_detectedlane.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osi_detectedlane.proto b/osi_detectedlane.proto index a6437828b..0bdf68882 100644 --- a/osi_detectedlane.proto +++ b/osi_detectedlane.proto @@ -177,7 +177,7 @@ message DetectedLaneBoundary // P3 parameter of the poly function model that describes the lane boundary. // - // Unit: 1/m² + // Unit: 1/m2 // optional double polyline_parameter_p3 = 4;