Skip to content

Commit 69fdc77

Browse files
Merge pull request #927 from tier4/sync-upstream
chore: sync upstream
2 parents 9432163 + 3a8ff49 commit 69fdc77

File tree

275 files changed

+12436
-2469
lines changed

Some content is hidden

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

275 files changed

+12436
-2469
lines changed

.github/CODEOWNERS

+8-3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ common/tier4_datetime_rviz_plugin/** isamu.takagi@tier4.jp kahhooi.tan@tier4.jp
4141
common/tier4_debug_rviz_plugin/** takayuki.murooka@tier4.jp
4242
common/tier4_debug_tools/** ryohsuke.mitsudome@tier4.jp
4343
common/tier4_localization_rviz_plugin/** isamu.takagi@tier4.jp kahhooi.tan@tier4.jp makoto.yabuta@tier4.jp takamasa.horibe@tier4.jp
44+
common/tier4_logging_level_configure_rviz_plugin/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp takamasa.horibe@tier4.jp
4445
common/tier4_perception_rviz_plugin/** yukihiro.saito@tier4.jp
4546
common/tier4_planning_rviz_plugin/** takayuki.murooka@tier4.jp yukihiro.saito@tier4.jp yutaka.shimizu@tier4.jp
4647
common/tier4_screen_capture_rviz_plugin/** taiki.tanaka@tier4.jp
@@ -84,9 +85,10 @@ launch/tier4_sensing_launch/** yukihiro.saito@tier4.jp
8485
launch/tier4_simulator_launch/** keisuke.shima@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
8586
launch/tier4_system_launch/** akihiro.sakurai@tier4.jp fumihito.ito@tier4.jp
8687
launch/tier4_vehicle_launch/** yukihiro.saito@tier4.jp
87-
localization/ar_tag_based_localizer/** masahiro.sakamoto@tier4.jp shintaro.sakoda@tier4.jp
8888
localization/ekf_localizer/** koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp takamasa.horibe@tier4.jp takeshi.ishita@tier4.jp yamato.ando@tier4.jp
8989
localization/gyro_odometer/** masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp
90+
localization/landmark_based_localizer/ar_tag_based_localizer/** masahiro.sakamoto@tier4.jp shintaro.sakoda@tier4.jp
91+
localization/landmark_based_localizer/landmark_tf_caster/** masahiro.sakamoto@tier4.jp shintaro.sakoda@tier4.jp
9092
localization/localization_error_monitor/** koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp
9193
localization/ndt_scan_matcher/** kento.yabuuchi.2@tier4.jp koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp
9294
localization/pose2twist/** masahiro.sakamoto@tier4.jp yamato.ando@tier4.jp
@@ -150,7 +152,7 @@ planning/behavior_path_planner/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4
150152
planning/behavior_velocity_blind_spot_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
151153
planning/behavior_velocity_crosswalk_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
152154
planning/behavior_velocity_detection_area_module/** kyoichi.sugahara@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
153-
planning/behavior_velocity_intersection_module/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
155+
planning/behavior_velocity_intersection_module/** kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
154156
planning/behavior_velocity_no_drivable_lane_module/** ahmed.ebrahim@leodrive.ai fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
155157
planning/behavior_velocity_no_stopping_area_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
156158
planning/behavior_velocity_occlusion_spot_module/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
@@ -160,6 +162,7 @@ planning/behavior_velocity_planner_common/** isamu.takagi@tier4.jp shumpei.wakab
160162
planning/behavior_velocity_run_out_module/** makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
161163
planning/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
162164
planning/behavior_velocity_stop_line_module/** shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp yutaka.shimizu@tier4.jp
165+
planning/behavior_velocity_template_module/** daniel.sanchez@tier4.jp
163166
planning/behavior_velocity_traffic_light_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
164167
planning/behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
165168
planning/behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
@@ -215,6 +218,8 @@ system/dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp
215218
system/emergency_handler/** makoto.kurihara@tier4.jp
216219
system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp
217220
system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp
221+
system/system_diagnostic_graph/** isamu.takagi@tier4.jp
222+
system/system_diagnostic_monitor/** isamu.takagi@tier4.jp
218223
system/system_error_monitor/** fumihito.ito@tier4.jp
219224
system/system_monitor/** akihiro.sakurai@tier4.jp fumihito.ito@tier4.jp
220225
system/topic_state_monitor/** ryohsuke.mitsudome@tier4.jp
@@ -224,4 +229,4 @@ vehicle/accel_brake_map_calibrator/accel_brake_map_calibrator/** taiki.tanaka@ti
224229
vehicle/external_cmd_converter/** takamasa.horibe@tier4.jp
225230
vehicle/raw_vehicle_cmd_converter/** makoto.kurihara@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp
226231
vehicle/steer_offset_estimator/** taiki.tanaka@tier4.jp
227-
vehicle/vehicle_info_util/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp yamato.ando@tier4.jp
232+
vehicle/vehicle_info_util/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp

.github/sync-files.yaml

-14
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,6 @@
4242
- \"\"
4343
- -cuda
4444
include:" {source}
45-
- source: .github/workflows/build-and-test-differential.yaml
46-
pre-commands: |
47-
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}
48-
49-
sd -s 'container: ${{ matrix.container }}' 'container: ${{ matrix.container }}${{ matrix.container-suffix }}' {source}
50-
sd -- \
51-
" include:" \
52-
" container-suffix:
53-
- \"\"
54-
- -cuda
55-
include:" {source}
56-
57-
sd "^ container: ghcr.io/autowarefoundation/autoware-universe:(\w+)-latest\$" \
58-
" container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest-cuda" {source}
5945
- source: .github/workflows/build-and-test-differential-self-hosted.yaml
6046
pre-commands: |
6147
sd "container: ros:(\w+)" "container: ghcr.io/autowarefoundation/autoware-universe:\$1-latest" {source}

common/component_interface_specs/CMakeLists.txt

+34
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,38 @@ project(component_interface_specs)
44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

7+
include_directories(
8+
include
9+
SYSTEM
10+
${rclcpp_INCLUDE_DIRS}
11+
${rosidl_runtime_cpp_INCLUDE_DIRS}
12+
${rcl_INCLUDE_DIRS}
13+
${autoware_adapi_v1_msgs_INCLUDE_DIRS}
14+
${autoware_auto_planning_msgs_INCLUDE_DIRS}
15+
${autoware_planning_msgs_INCLUDE_DIRS}
16+
${autoware_auto_vehicle_msgs_INCLUDE_DIRS}
17+
${tier4_control_msgs_INCLUDE_DIRS}
18+
${nav_msgs_INCLUDE_DIRS}
19+
${tier4_system_msgs_INCLUDE_DIRS}
20+
${tier4_vehicle_msgs_INCLUDE_DIRS}
21+
${autoware_auto_perception_msgs_INCLUDE_DIRS}
22+
${tier4_map_msgs_INCLUDE_DIRS}
23+
)
24+
25+
if(BUILD_TESTING)
26+
ament_add_ros_isolated_gtest(test_component_interface_specs
27+
test/gtest_main.cpp
28+
test/test_planning.cpp
29+
test/test_control.cpp
30+
test/test_localization.cpp
31+
test/test_system.cpp
32+
test/test_map.cpp
33+
test/test_perception.cpp
34+
test/test_vehicle.cpp
35+
)
36+
target_include_directories(test_component_interface_specs
37+
PRIVATE include
38+
)
39+
endif()
40+
741
ament_auto_package()

common/component_interface_specs/package.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,28 @@
1111
<license>Apache License 2.0</license>
1212

1313
<buildtool_depend>ament_cmake_auto</buildtool_depend>
14+
<buildtool_depend>ament_cmake_core</buildtool_depend>
15+
<buildtool_depend>ament_cmake_export_dependencies</buildtool_depend>
16+
<buildtool_depend>ament_cmake_test</buildtool_depend>
1417
<buildtool_depend>autoware_cmake</buildtool_depend>
1518

19+
<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
20+
<buildtool_export_depend>ament_cmake_test</buildtool_export_depend>
21+
1622
<depend>autoware_adapi_v1_msgs</depend>
23+
<depend>autoware_auto_perception_msgs</depend>
24+
<depend>autoware_auto_planning_msgs</depend>
1725
<depend>autoware_auto_vehicle_msgs</depend>
26+
<depend>autoware_planning_msgs</depend>
27+
<depend>nav_msgs</depend>
28+
<depend>rcl</depend>
29+
<depend>rclcpp</depend>
30+
<depend>rosidl_runtime_cpp</depend>
31+
<depend>tier4_control_msgs</depend>
1832
<depend>tier4_map_msgs</depend>
33+
<depend>tier4_system_msgs</depend>
1934
<depend>tier4_vehicle_msgs</depend>
20-
35+
<test_depend>ament_cmake_ros</test_depend>
2136
<test_depend>ament_lint_auto</test_depend>
2237
<test_depend>autoware_lint_common</test_depend>
2338

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "gtest/gtest.h"
16+
17+
int main(int argc, char * argv[])
18+
{
19+
::testing::InitGoogleTest(&argc, argv);
20+
return RUN_ALL_TESTS();
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "component_interface_specs/control.hpp"
16+
#include "gtest/gtest.h"
17+
18+
TEST(control, interface)
19+
{
20+
{
21+
using control_interface::IsPaused;
22+
IsPaused is_paused;
23+
size_t depth = 1;
24+
EXPECT_EQ(is_paused.depth, depth);
25+
EXPECT_EQ(is_paused.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
26+
EXPECT_EQ(is_paused.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
27+
}
28+
29+
{
30+
using control_interface::IsStartRequested;
31+
IsStartRequested is_start_requested;
32+
size_t depth = 1;
33+
EXPECT_EQ(is_start_requested.depth, depth);
34+
EXPECT_EQ(is_start_requested.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
35+
EXPECT_EQ(is_start_requested.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
36+
}
37+
38+
{
39+
using control_interface::IsStopped;
40+
IsStopped is_stopped;
41+
size_t depth = 1;
42+
EXPECT_EQ(is_stopped.depth, depth);
43+
EXPECT_EQ(is_stopped.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
44+
EXPECT_EQ(is_stopped.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
45+
}
46+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "component_interface_specs/localization.hpp"
16+
#include "gtest/gtest.h"
17+
18+
TEST(localization, interface)
19+
{
20+
{
21+
using localization_interface::InitializationState;
22+
InitializationState initialization_state;
23+
size_t depth = 1;
24+
EXPECT_EQ(initialization_state.depth, depth);
25+
EXPECT_EQ(initialization_state.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
26+
EXPECT_EQ(initialization_state.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
27+
}
28+
29+
{
30+
using localization_interface::KinematicState;
31+
KinematicState kinematic_state;
32+
size_t depth = 1;
33+
EXPECT_EQ(kinematic_state.depth, depth);
34+
EXPECT_EQ(kinematic_state.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
35+
EXPECT_EQ(kinematic_state.durability, RMW_QOS_POLICY_DURABILITY_VOLATILE);
36+
}
37+
38+
{
39+
using localization_interface::Acceleration;
40+
Acceleration acceleration;
41+
size_t depth = 1;
42+
EXPECT_EQ(acceleration.depth, depth);
43+
EXPECT_EQ(acceleration.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
44+
EXPECT_EQ(acceleration.durability, RMW_QOS_POLICY_DURABILITY_VOLATILE);
45+
}
46+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "component_interface_specs/map.hpp"
16+
#include "gtest/gtest.h"
17+
18+
TEST(map, interface)
19+
{
20+
{
21+
using map_interface::MapProjectorInfo;
22+
MapProjectorInfo map_projector;
23+
size_t depth = 1;
24+
EXPECT_EQ(map_projector.depth, depth);
25+
EXPECT_EQ(map_projector.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
26+
EXPECT_EQ(map_projector.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
27+
}
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "component_interface_specs/perception.hpp"
16+
#include "gtest/gtest.h"
17+
18+
TEST(perception, interface)
19+
{
20+
{
21+
using perception_interface::ObjectRecognition;
22+
ObjectRecognition object_recognition;
23+
size_t depth = 1;
24+
EXPECT_EQ(object_recognition.depth, depth);
25+
EXPECT_EQ(object_recognition.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
26+
EXPECT_EQ(object_recognition.durability, RMW_QOS_POLICY_DURABILITY_VOLATILE);
27+
}
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright 2023 The Autoware Contributors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#include "component_interface_specs/planning.hpp"
16+
#include "gtest/gtest.h"
17+
18+
TEST(planning, interface)
19+
{
20+
{
21+
using planning_interface::RouteState;
22+
RouteState state;
23+
size_t depth = 1;
24+
EXPECT_EQ(state.depth, depth);
25+
EXPECT_EQ(state.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
26+
EXPECT_EQ(state.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
27+
}
28+
29+
{
30+
using planning_interface::Route;
31+
Route route;
32+
size_t depth = 1;
33+
EXPECT_EQ(route.depth, depth);
34+
EXPECT_EQ(route.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
35+
EXPECT_EQ(route.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
36+
}
37+
38+
{
39+
using planning_interface::NormalRoute;
40+
NormalRoute route;
41+
size_t depth = 1;
42+
EXPECT_EQ(route.depth, depth);
43+
EXPECT_EQ(route.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
44+
EXPECT_EQ(route.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
45+
}
46+
47+
{
48+
using planning_interface::MrmRoute;
49+
MrmRoute route;
50+
size_t depth = 1;
51+
EXPECT_EQ(route.depth, depth);
52+
EXPECT_EQ(route.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
53+
EXPECT_EQ(route.durability, RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL);
54+
}
55+
56+
{
57+
using planning_interface::Trajectory;
58+
Trajectory trajectory;
59+
size_t depth = 1;
60+
EXPECT_EQ(trajectory.depth, depth);
61+
EXPECT_EQ(trajectory.reliability, RMW_QOS_POLICY_RELIABILITY_RELIABLE);
62+
EXPECT_EQ(trajectory.durability, RMW_QOS_POLICY_DURABILITY_VOLATILE);
63+
}
64+
}

0 commit comments

Comments
 (0)