diff --git a/.gitmodules b/.gitmodules index 942a734..03f4e12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -117,6 +117,15 @@ [submodule "vendor/adore_model_checker"] path = vendor/adore_model_checker url = git@github.com:DLR-TS/adore_model_checker.git -[submodule "ros2_workspace/src/adore_ros2_nodes/operational_design_domain"] - path = ros2_workspace/src/adore_ros2_nodes/operational_design_domain - url = git@github.com:DLR-TS/operational_design_domain.git +[submodule "ros2_workspace/src/vendor/open_odd"] + path = ros2_workspace/src/vendor/open_odd + url = git@github.com:DLR-TS/open_odd.git +[submodule "ros2_workspace/src/vendor/open_odd_ros2_msgs"] + path = ros2_workspace/src/vendor/open_odd_ros2_msgs + url = git@github.com:DLR-TS/open_odd_ros2_msgs.git +[submodule "ros2_workspace/src/vendor/open_odd_ros2_conversions"] + path = ros2_workspace/src/vendor/open_odd_ros2_conversions + url = git@github.com:DLR-TS/open_odd_ros2_conversions.git +[submodule "ros2_workspace/src/adore_ros2_nodes/adore_odd_monitor"] + path = ros2_workspace/src/adore_ros2_nodes/odd_monitor + url = git@github.com:DLR-TS/adore_odd_monitor.git diff --git a/THIRD-PARTY.md b/THIRD-PARTY.md index 43b4ef9..24049e4 100644 --- a/THIRD-PARTY.md +++ b/THIRD-PARTY.md @@ -22,6 +22,9 @@ Paths indicate where the content lives in this repository or how it is consumed | Tracecompass | Eclipse Public License 2.0 | `vendor/ros2_observer/trace_compass` | https://github.com/eclipse-tracecompass/org.eclipse.tracecompass | | lttng-scope | Eclipse Public License 1.0 | `vendor/ros2_observer/lttng_scope` | https://github.com/lttng/lttng-scope | | caches | BSD 3-Clause License | `vendor/caches/LICENSE.md` | https://github.com/s0nofab1t/caches (fork of https://github.com/vpetrigo/caches) | +| open_odd | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd/LICENSE.md` | https://github.com/DLR-TS/open_odd | +| open_odd_ros2_msgs | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd_ros2_msgs/LICENSE.md` | https://github.com/DLR-TS/open_odd_ros2_msgs | +| open_odd_ros2_conversionss | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd_ros2_conversions/LICENSE.md` | https://github.com/DLR-TS/open_odd_ros2_conversions | --- diff --git a/adore_scenarios/assets/odd/simulation_odd.json b/adore_scenarios/assets/odd/simulation_odd.json deleted file mode 100644 index facf82f..0000000 --- a/adore_scenarios/assets/odd/simulation_odd.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "max_speed": 70, - "minimum_road_width": 2.0, - "valid_hours_of_the_day": [0, 24], - "max_wind_intensity": 4 -} diff --git a/adore_scenarios/assets/odd/simulation_odd.yaml b/adore_scenarios/assets/odd/simulation_odd.yaml new file mode 100644 index 0000000..638ce26 --- /dev/null +++ b/adore_scenarios/assets/odd/simulation_odd.yaml @@ -0,0 +1,14 @@ +id: simulation_odd +taxonomy: +- path: vehicle.speed + comparison: less_or_equal + value: 70.0 +- path: environment.road.width + comparison: greater_or_equal + value: 2.0 +- path: vehicle.base.operational_hour_of_the_day + comparison: greater_or_equal + value: 0 +- path: vehicle.base.operational_hour_of_the_day + comparison: less_or_equal + value: 24 diff --git a/adore_scenarios/simulation_scenarios b/adore_scenarios/simulation_scenarios index 531a3ff..833fc43 160000 --- a/adore_scenarios/simulation_scenarios +++ b/adore_scenarios/simulation_scenarios @@ -1 +1 @@ -Subproject commit 531a3ff427c43395a2a89dc5157e400532457f5d +Subproject commit 833fc4313f03713cc36fb00ad957105c7a2f2003 diff --git a/ros2_workspace/src/adore_ros2_msgs b/ros2_workspace/src/adore_ros2_msgs index 4fc7bad..38a60c8 160000 --- a/ros2_workspace/src/adore_ros2_msgs +++ b/ros2_workspace/src/adore_ros2_msgs @@ -1 +1 @@ -Subproject commit 4fc7bad210091b285d8271cdd4799a91c303256b +Subproject commit 38a60c806f029c46affe05285541ad5ee767ee10 diff --git a/ros2_workspace/src/adore_ros2_nodes/decision_maker b/ros2_workspace/src/adore_ros2_nodes/decision_maker index 33fb631..358e0b6 160000 --- a/ros2_workspace/src/adore_ros2_nodes/decision_maker +++ b/ros2_workspace/src/adore_ros2_nodes/decision_maker @@ -1 +1 @@ -Subproject commit 33fb631f25824dbac99ee1f57ced91bb6875f845 +Subproject commit 358e0b60c4e3a9eceb1456589173e41d52b8ac59 diff --git a/ros2_workspace/src/adore_ros2_nodes/odd_monitor b/ros2_workspace/src/adore_ros2_nodes/odd_monitor new file mode 160000 index 0000000..0b4bd6e --- /dev/null +++ b/ros2_workspace/src/adore_ros2_nodes/odd_monitor @@ -0,0 +1 @@ +Subproject commit 0b4bd6e7e9f35b2b1a490cd95096f89653026ee4 diff --git a/ros2_workspace/src/adore_ros2_nodes/operational_design_domain b/ros2_workspace/src/adore_ros2_nodes/operational_design_domain deleted file mode 160000 index b351ea3..0000000 --- a/ros2_workspace/src/adore_ros2_nodes/operational_design_domain +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b351ea36796bf29355a5063f65708e6c02e32b4a diff --git a/ros2_workspace/src/vendor/open_odd b/ros2_workspace/src/vendor/open_odd new file mode 160000 index 0000000..ba0bd8b --- /dev/null +++ b/ros2_workspace/src/vendor/open_odd @@ -0,0 +1 @@ +Subproject commit ba0bd8b78c83990b89e5a4d528fec28a5339d680 diff --git a/ros2_workspace/src/vendor/open_odd_ros2_conversions b/ros2_workspace/src/vendor/open_odd_ros2_conversions new file mode 160000 index 0000000..d972dea --- /dev/null +++ b/ros2_workspace/src/vendor/open_odd_ros2_conversions @@ -0,0 +1 @@ +Subproject commit d972dea7638b14ae0475bbb4d12f6071cddf687f diff --git a/ros2_workspace/src/vendor/open_odd_ros2_msgs b/ros2_workspace/src/vendor/open_odd_ros2_msgs new file mode 160000 index 0000000..c9838ae --- /dev/null +++ b/ros2_workspace/src/vendor/open_odd_ros2_msgs @@ -0,0 +1 @@ +Subproject commit c9838aec4a9ac1e9d02388d84bca5a02cc408b66