Skip to content

Commit

Permalink
Merge pull request #409 from tier4/sync-upstream
Browse files Browse the repository at this point in the history
chore: sync upstream
  • Loading branch information
tier4-autoware-public-bot[bot] committed May 8, 2023
2 parents 39b84cc + a8cc29e commit c5985e5
Show file tree
Hide file tree
Showing 276 changed files with 907 additions and 938 deletions.
8 changes: 8 additions & 0 deletions .github/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,11 @@
files:
- source: .github/workflows/deploy-docs.yaml
- source: .github/workflows/delete-closed-pr-docs.yaml
- source: mkdocs.yaml
pre-commands: |
sd "Autoware Documentation" "Autoware Universe Documentation" {source}
sd "autoware-documentation" "autoware.universe" {source}
sd "repo_url: .*" "repo_url: https://github.com/autowarefoundation/autoware.universe" {source}
sd "/edit/main/docs/" "/edit/main/" {source}
sd "docs_dir: .*" "docs_dir: ." {source}
sd "assets/(\w+)" "docs/assets/\$1" {source}
3 changes: 1 addition & 2 deletions common/autoware_ad_api_specs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
3 changes: 1 addition & 2 deletions common/autoware_auto_common/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>builtin_interfaces</depend>
<depend>eigen</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/autoware_auto_geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_common</depend>
<depend>autoware_auto_geometry_msgs</depend>
Expand Down
2 changes: 1 addition & 1 deletion common/autoware_auto_perception_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<license>Apache 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<build_depend>libboost-dev</build_depend>
<build_depend>qtbase5-dev</build_depend>

Expand Down
8 changes: 4 additions & 4 deletions common/autoware_auto_tf2/design/autoware-auto-tf2-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ In general, users of ROS rely on tf (and its successor, tf2) for publishing and
frame transforms. This is true even to the extent that the tf2 contains the packages
`tf2_geometry_msgs` and `tf2_sensor_msgs` which allow for easy conversion to and from the message
types defined in `geometry_msgs` and `sensor_msgs`, respectively. However, AutowareAuto contains
some specialized message types which are not transformable between frames using the ROS2 library.
some specialized message types which are not transformable between frames using the ROS 2 library.
The `autoware_auto_tf2` package aims to provide developers with tools to transform applicable
`autoware_auto_msgs` types. In addition to this, this package also provides transform tools for
messages types in `geometry_msgs` missing in `tf2_geometry_msgs`.
Expand Down Expand Up @@ -49,7 +49,7 @@ const ros::Time& tf2::getTimestamp(const T& t);
## Current Implementation of tf2_geometry_msgs
In both ROS1 and ROS2 stamped msgs like `Vector3Stamped`, `QuaternionStamped` have associated
In both ROS 1 and ROS 2 stamped msgs like `Vector3Stamped`, `QuaternionStamped` have associated
functions like:
- `getTimestamp`
Expand All @@ -58,13 +58,13 @@ functions like:
- `toMsg`
- `fromMsg`
In ROS1, to support `tf2::convert` and need in `doTransform` of the stamped data, non-stamped
In ROS 1, to support `tf2::convert` and need in `doTransform` of the stamped data, non-stamped
underlying data like `Vector3`, `Point`, have implementations of the following functions:
- `toMsg`
- `fromMsg`
In ROS2, much of the `doTransform` method is not using `toMsg` and `fromMsg` as data types from tf2
In ROS 2, much of the `doTransform` method is not using `toMsg` and `fromMsg` as data types from tf2
are not used. Instead `doTransform` is done using `KDL`, thus functions relating to underlying data
were not added; such as `Vector3`, `Point`, or ported in this commit ros/geometry2/commit/6f2a82.
The non-stamped data with `toMsg` and `fromMsg` are `Quaternion`, `Transform`. `Pose` has the
Expand Down
3 changes: 1 addition & 2 deletions common/autoware_auto_tf2/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_common</depend>
<depend>autoware_auto_geometry_msgs</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/autoware_point_types/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
<buildtool_depend>ament_cmake_core</buildtool_depend>
<buildtool_depend>ament_cmake_export_dependencies</buildtool_depend>
<buildtool_depend>ament_cmake_test</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
<buildtool_export_depend>ament_cmake_test</buildtool_export_depend>

<build_depend>autoware_cmake</build_depend>

<depend>ament_cmake_copyright</depend>
<depend>ament_cmake_cppcheck</depend>
<depend>ament_cmake_lint_cmake</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/autoware_testing/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>ament_cmake_lint_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<buildtool_export_depend>ros_testing</buildtool_export_depend>

Expand Down
2 changes: 1 addition & 1 deletion common/bag_time_manager_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
<depend>libqt5-widgets</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/component_interface_specs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_adapi_v1_msgs</depend>

Expand Down
3 changes: 1 addition & 2 deletions common/component_interface_tools/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>diagnostic_updater</depend>
<depend>fmt</depend>
Expand Down
2 changes: 1 addition & 1 deletion common/component_interface_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<build_depend>tier4_system_msgs</build_depend>

<depend>autoware_adapi_v1_msgs</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/cuda_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
3 changes: 1 addition & 2 deletions common/fake_test_node/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>ament_cmake_ros</depend>
<depend>autoware_auto_common</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/global_parameter_loader/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<exec_depend>vehicle_info_util</exec_depend>

Expand Down
3 changes: 1 addition & 2 deletions common/goal_distance_calculator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_planning_msgs</depend>
<depend>geometry_msgs</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/interpolation/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>tier4_autoware_utils</depend>

Expand Down
4 changes: 2 additions & 2 deletions common/kalman_filter/include/kalman_filter/kalman_filter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef KALMAN_FILTER__KALMAN_FILTER_HPP_
#define KALMAN_FILTER__KALMAN_FILTER_HPP_

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/LU>
#include <Eigen/Core>
#include <Eigen/LU>

/**
* @file kalman_filter.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include "kalman_filter/kalman_filter.hpp"

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/LU>
#include <Eigen/Core>
#include <Eigen/LU>

#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion common/kalman_filter/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<author email="takamasa.horibe@tier4.jp">Takamasa Horibe</author>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<build_depend>eigen</build_depend>
<build_depend>eigen3_cmake_module</build_depend>

Expand Down
3 changes: 1 addition & 2 deletions common/motion_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<author email="satoshi.ota@tier4.jp">Satoshi Ota</author>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_planning_msgs</depend>
<depend>autoware_auto_vehicle_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
#ifndef OSQP_INTERFACE__CSC_MATRIX_CONV_HPP_
#define OSQP_INTERFACE__CSC_MATRIX_CONV_HPP_

#include "eigen3/Eigen/Core"
#include "osqp/glob_opts.h" // for 'c_int' type ('long' or 'long long')
#include "osqp_interface/visibility_control.hpp"

#include <Eigen/Core>

#include <vector>

namespace autoware
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
#ifndef OSQP_INTERFACE__OSQP_INTERFACE_HPP_
#define OSQP_INTERFACE__OSQP_INTERFACE_HPP_

#include "eigen3/Eigen/Core"
#include "osqp/osqp.h"
#include "osqp_interface/csc_matrix_conv.hpp"
#include "osqp_interface/visibility_control.hpp"

#include <Eigen/Core>
#include <rclcpp/rclcpp.hpp>

#include <limits>
Expand Down
3 changes: 1 addition & 2 deletions common/osqp_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>eigen</depend>
<depend>osqp_vendor</depend>
Expand Down
4 changes: 2 additions & 2 deletions common/osqp_interface/src/csc_matrix_conv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "osqp_interface/csc_matrix_conv.hpp"

#include "eigen3/Eigen/Core"
#include "eigen3/Eigen/SparseCore"
#include <Eigen/Core>
#include <Eigen/SparseCore>

#include <exception>
#include <iostream>
Expand Down
3 changes: 2 additions & 1 deletion common/osqp_interface/test/test_csc_matrix_conv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "eigen3/Eigen/Core"
#include "gtest/gtest.h"
#include "osqp_interface/csc_matrix_conv.hpp"

#include <Eigen/Core>

#include <string>
#include <tuple>
#include <vector>
Expand Down
3 changes: 2 additions & 1 deletion common/osqp_interface/test/test_osqp_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "eigen3/Eigen/Core"
#include "gtest/gtest.h"
#include "osqp_interface/osqp_interface.hpp"

#include <Eigen/Core>

#include <tuple>
#include <vector>

Expand Down
3 changes: 1 addition & 2 deletions common/path_distance_calculator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_planning_msgs</depend>
<depend>motion_utils</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/perception_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_auto_perception_msgs</depend>
<depend>geometry_msgs</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/polar_grid/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/rtc_manager_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
Expand Down
4 changes: 2 additions & 2 deletions common/signal_processing/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<author email="takayuki.murooka@tier4.jp">Takayuki Murooka</author>
<author email="ali.boyali@tier4.jp">Ali BOYALI</author>

<build_depend>autoware_cmake</build_depend>
<build_depend>libboost-dev</build_depend>
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>
<build_depend>libboost-dev</build_depend>
<depend>geometry_msgs</depend>
<depend>rclcpp</depend>
<build_export_depend>libboost-dev</build_export_depend>
Expand Down
3 changes: 1 addition & 2 deletions common/tier4_adapi_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
Expand Down
3 changes: 1 addition & 2 deletions common/tier4_api_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<build_depend>autoware_cmake</build_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>rclcpp</depend>
<depend>tier4_external_api_msgs</depend>
Expand Down
Loading

0 comments on commit c5985e5

Please sign in to comment.