Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync upstream #147

Merged
merged 55 commits into from
Oct 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
4d85af2
refactor(lidar_centerpoint): refactor isCarLikeVehicle function (#2030)
scepter914 Oct 11, 2022
f509d8a
feat(behavior_path_planner): pull_over lateral goal search (#2036)
kosuke55 Oct 11, 2022
4e080d2
refactor(behavior_path_planner): change shift point to shift line (#2…
purewater0901 Oct 11, 2022
7372109
feat(vehicle_cmd_gate)!: support ad api (#1810)
isamu-takagi Oct 12, 2022
c81dd39
feat(intersection): generate detection lane using RightOfWay and traf…
soblin Oct 12, 2022
b5b9ebf
feat(behavior_path_planner): add start shift length (#2050)
purewater0901 Oct 12, 2022
f234a7d
feat(behavior_path_planner): rename some variables (#2051)
purewater0901 Oct 12, 2022
c430b52
fix(pointcloud_preprocessor): separate targets for base class (#1982)
wep21 Oct 13, 2022
52c7ce3
chore: missing topic info duration 1000 -> 5000 (#2056)
takayuki5168 Oct 13, 2022
fd2a3a2
fix(motion_velocity_smoother): removed unnecessary info for external …
takayuki5168 Oct 13, 2022
48135dc
refactor(ekf_localizer): add functions to compute the pose and twist …
IshitaTakeshi Oct 13, 2022
4be6931
refactor(ekf_localizer): simplify duration conversion (#2017)
IshitaTakeshi Oct 13, 2022
0f16c2b
feat(component_interface_utils): change service log output (#2022)
isamu-takagi Oct 13, 2022
fbf5b1c
fix(tier4_planning/vehicle_rviz_plugin): fixed license (#2059)
takayuki5168 Oct 14, 2022
fd145e2
feat(control_launch): add longitudinal controller mode (#2062)
taikitanaka3 Oct 14, 2022
96bc202
feat(tier4_debug_rviz_plugin): pie chart with float32 multi array sta…
takayuki5168 Oct 14, 2022
c646cfc
feat(autoware_auto_perception_rviz_plugin): rviz predicted objects mu…
tkimura4 Oct 14, 2022
5490eb5
chore(autoware_auto_perception_rviz_plugin): change maintainer (#2068)
tkimura4 Oct 14, 2022
c5031ba
fix(behavior_paht_planner): fix turn signal condition of the avoidanc…
purewater0901 Oct 14, 2022
6acd8a7
feat(behavior_path_planner): add pull over goal searcher interface (#…
kosuke55 Oct 14, 2022
887c149
refactor(intersection): code clean (#2071)
soblin Oct 14, 2022
ef094a1
feat(obstacle_cruise_planner): deal with self-crossing path and u-tur…
takayuki5168 Oct 14, 2022
0af97ea
refactor(raw_vehicle_cmd_converter): refactor csv loader (#2074)
taikitanaka3 Oct 15, 2022
4a0b1c3
refactor(heatmap_visualizer): refactor replacing util library (#2063)
scepter914 Oct 15, 2022
94c248b
fix(obstacle_avoidance_planner): fix drivable area virtual wall z (#2…
takayuki5168 Oct 17, 2022
6adcec9
fix(raw_vehicle_cmd_converter): wrong for-loop bound in getColumnInde…
maxime-clem Oct 17, 2022
a9944a7
fix(osqp_interface): fix memory leak (#2061)
maxime-clem Oct 17, 2022
fae9726
test(raw_vehicle_cmd_converter): extend unit tests for invalid maps (…
maxime-clem Oct 17, 2022
d5db3ac
refactor(raw_vehicle_cmd_converter): remove duplicates and add unit t…
taikitanaka3 Oct 17, 2022
b2aa6ed
feat(behavior_path_planner): add turn signal parameters (#2086)
purewater0901 Oct 18, 2022
a8f3a98
refactor(perception_utils): refactor matching function in perception_…
scepter914 Oct 18, 2022
f659209
refactor(perception_utils): refactor object_classification (#2042)
scepter914 Oct 18, 2022
af97953
feat(autoware_auto_perception_rviz_plugin): add accel text visualizat…
takayuki5168 Oct 18, 2022
6428714
refactor(motion_utils, obstacle_cruise_planner): add offset to virtua…
takayuki5168 Oct 18, 2022
0a01850
refactor(osqp_interface, motion_velocity_smoother): unsolved status l…
takayuki5168 Oct 18, 2022
8ae7c03
feat(lidar_centerpoint): eliminated the tf dependency for single fram…
knzo25 Oct 18, 2022
8fc7be4
feat(behavior_path_planner): update turn signal document (#2096)
purewater0901 Oct 18, 2022
272f8a2
feat: add informed rrtstars (#904)
HiroIshida Oct 18, 2022
cc04975
feat(mission_planner)!: support ad api (#1495)
isamu-takagi Oct 19, 2022
844d977
feat(ModelZoo): rework prebuilt assets management (#1880)
ambroise-arm Oct 19, 2022
d5cfa02
chore: update CODEOWNERS (#1990)
awf-autoware-bot[bot] Oct 19, 2022
0ab91f4
chore: add maintainer in ekf_localizer and ndt_scan_matcher (#2109)
kminoda Oct 19, 2022
34ce970
chore(mission_planner): add maintainers (#2110)
takayuki5168 Oct 19, 2022
8469669
chore(osqp_interface): add maintainers (#2111)
takayuki5168 Oct 19, 2022
388585f
fix(ground segmentation): correct initial condition of ground grid (#…
badai-nguyen Oct 20, 2022
8ce6674
feat!: deactivate localization component during the pose initializati…
kminoda Oct 20, 2022
206bcdb
refactor(detected_object_validation): apply util functions defined in…
ktro2828 Oct 20, 2022
1953ad7
docs(behavior_path_planner): update debug marker topic information (#…
zulfaqar-azmi-t4 Oct 20, 2022
3fc4b5c
refactor!: remove tier4 control mode msg (#1533)
TakaHoribe Oct 20, 2022
15d0e83
refactor(planning_debug_tools): rename wlid with with_lane_id (#2121)
kenji-miyake Oct 20, 2022
4fb77da
chore(system_error_monitor): fix typo in fix_system_param.yaml (#2123)
ito-san Oct 20, 2022
80d0cc6
chore: fix typos (#2122)
kenji-miyake Oct 20, 2022
f22ba93
refactor(obstacle_avoidance,obstacle_cruise): unify virtual wall mark…
taikitanaka3 Oct 20, 2022
f70cb22
fix(mpc): bilinear discretization (#1567)
TakaHoribe Oct 20, 2022
5d11abd
feat(mpc): update steer rate calculation (#1566)
TakaHoribe Oct 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
common/autoware_ad_api_specs/** [email protected]
common/autoware_auto_common/** [email protected]
common/autoware_auto_geometry/** [email protected]
common/autoware_auto_perception_rviz_plugin/** [email protected] taichi.higashide@tier4.jp
common/autoware_auto_perception_rviz_plugin/** [email protected] [email protected] taiki.tanaka@tier4.jp
common/autoware_auto_tf2/** [email protected]
common/autoware_point_types/** [email protected]
common/autoware_testing/** [email protected]
Expand All @@ -25,12 +25,14 @@ common/osqp_interface/** [email protected]
common/path_distance_calculator/** [email protected]
common/perception_utils/** [email protected] [email protected] [email protected] [email protected]
common/polar_grid/** [email protected]
common/rtc_manager_rviz_plugin/** [email protected]
common/signal_processing/** [email protected]
common/tier4_api_utils/** [email protected]
common/tier4_autoware_utils/** [email protected] [email protected]
common/tier4_calibration_rviz_plugin/** [email protected]
common/tier4_control_rviz_plugin/** [email protected]
common/tier4_datetime_rviz_plugin/** [email protected]
common/tier4_debug_rviz_plugin/** [email protected]
common/tier4_debug_tools/** [email protected]
common/tier4_localization_rviz_plugin/** [email protected]
common/tier4_perception_rviz_plugin/** [email protected]
Expand Down Expand Up @@ -62,7 +64,7 @@ launch/tier4_autoware_api_launch/** [email protected] ryohsuke.mitsudome@tie
launch/tier4_control_launch/** [email protected]
launch/tier4_localization_launch/** [email protected]
launch/tier4_map_launch/** [email protected]
launch/tier4_perception_launch/** [email protected]
launch/tier4_perception_launch/** [email protected] [email protected]
launch/tier4_planning_launch/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
launch/tier4_sensing_launch/** [email protected]
launch/tier4_simulator_launch/** [email protected]
Expand Down Expand Up @@ -94,12 +96,15 @@ perception/ground_segmentation/** [email protected] yukihiro.saito@tier4.
perception/heatmap_visualizer/** [email protected]
perception/image_projection_based_fusion/** [email protected] [email protected]
perception/lidar_apollo_instance_segmentation/** [email protected]
perception/lidar_apollo_segmentation_tvm/** [email protected]
perception/lidar_apollo_segmentation_tvm_nodes/** [email protected]
perception/lidar_centerpoint/** [email protected]
perception/map_based_prediction/** [email protected]
perception/multi_object_tracker/** [email protected] [email protected]
perception/object_merger/** [email protected]
perception/object_range_splitter/** [email protected]
perception/occupancy_grid_map_outlier_filter/** [email protected] [email protected]
perception/probabilistic_occupancy_grid_map/** [email protected]
perception/radar_fusion_to_detected_object/** [email protected]
perception/radar_tracks_msgs_converter/** [email protected]
perception/shape_estimation/** [email protected]
Expand All @@ -114,7 +119,7 @@ planning/costmap_generator/** [email protected]
planning/external_velocity_limit_selector/** [email protected]
planning/freespace_planner/** [email protected]
planning/freespace_planning_algorithms/** [email protected]
planning/mission_planner/** [email protected]
planning/mission_planner/** [email protected] [email protected]
planning/motion_velocity_smoother/** [email protected]
planning/obstacle_avoidance_planner/** [email protected]
planning/obstacle_cruise_planner/** [email protected] [email protected]
Expand All @@ -125,6 +130,7 @@ planning/planning_evaluator/** [email protected]
planning/route_handler/** [email protected]
planning/rtc_auto_mode_manager/** [email protected]
planning/rtc_interface/** [email protected]
planning/rtc_replayer/** [email protected] [email protected]
planning/scenario_selector/** [email protected]
planning/surround_obstacle_checker/** [email protected]
sensing/geo_pos_conv/** [email protected]
Expand All @@ -134,7 +140,6 @@ sensing/image_transport_decompressor/** [email protected]
sensing/imu_corrector/** [email protected]
sensing/livox/livox_tag_filter/** [email protected]
sensing/pointcloud_preprocessor/** [email protected] [email protected]
sensing/probabilistic_occupancy_grid_map/** [email protected]
sensing/tier4_pcl_extensions/** [email protected]
sensing/vehicle_velocity_converter/** [email protected]
simulator/dummy_perception_publisher/** [email protected]
Expand All @@ -155,6 +160,6 @@ system/velodyne_monitor/** [email protected]
tools/simulator_test/simulator_compatibility_test/** [email protected]
vehicle/accel_brake_map_calibrator/accel_brake_map_calibrator/** [email protected]
vehicle/external_cmd_converter/** [email protected]
vehicle/raw_vehicle_cmd_converter/** [email protected]
vehicle/raw_vehicle_cmd_converter/** [email protected] [email protected]
vehicle/steer_offset_estimator/** [email protected]
vehicle/vehicle_info_util/** [email protected] [email protected] [email protected] [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <autoware_auto_perception_msgs/msg/object_classification.hpp>
#include <autoware_auto_perception_msgs/msg/predicted_path.hpp>
#include <autoware_auto_perception_msgs/msg/shape.hpp>
#include <geometry_msgs/msg/accel.hpp>
#include <geometry_msgs/msg/pose_with_covariance.hpp>
#include <geometry_msgs/msg/twist.hpp>
#include <geometry_msgs/msg/twist_with_covariance.hpp>
Expand Down Expand Up @@ -105,6 +106,11 @@ get_velocity_text_marker_ptr(
const geometry_msgs::msg::Twist & twist, const geometry_msgs::msg::Point & vis_pos,
const std_msgs::msg::ColorRGBA & color_rgba);

AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC visualization_msgs::msg::Marker::SharedPtr
get_acceleration_text_marker_ptr(
const geometry_msgs::msg::Accel & accel, const geometry_msgs::msg::Point & vis_pos,
const std_msgs::msg::ColorRGBA & color_rgba);

AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC visualization_msgs::msg::Marker::SharedPtr
get_twist_marker_ptr(
const geometry_msgs::msg::PoseWithCovariance & pose_with_covariance,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
this},
m_display_velocity_text_property{
"Display Velocity", true, "Enable/disable velocity text visualization", this},
m_display_acceleration_text_property{
"Display Acceleration", true, "Enable/disable acceleration text visualization", this},
m_display_twist_property{"Display Twist", true, "Enable/disable twist visualization", this},
m_display_predicted_paths_property{
"Display Predicted Paths", true, "Enable/disable predicted paths visualization", this},
Expand Down Expand Up @@ -127,6 +129,11 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
m_marker_common.addMessage(marker_ptr);
}

void add_marker(visualization_msgs::msg::MarkerArray::ConstSharedPtr markers_ptr)
{
m_marker_common.addMessage(markers_ptr);
}

protected:
/// \brief Convert given shape msg into a Marker
/// \tparam ClassificationContainerT List type with ObjectClassificationMsg
Expand Down Expand Up @@ -207,6 +214,19 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
}
}

template <typename ClassificationContainerT>
std::optional<Marker::SharedPtr> get_acceleration_text_marker_ptr(
const geometry_msgs::msg::Accel & accel, const geometry_msgs::msg::Point & vis_pos,
const ClassificationContainerT & labels) const
{
if (m_display_acceleration_text_property.getBool()) {
const std_msgs::msg::ColorRGBA color_rgba = get_color_rgba(labels);
return detail::get_acceleration_text_marker_ptr(accel, vis_pos, color_rgba);
} else {
return std::nullopt;
}
}

std::optional<Marker::SharedPtr> get_twist_marker_ptr(
const geometry_msgs::msg::PoseWithCovariance & pose_with_covariance,
const geometry_msgs::msg::TwistWithCovariance & twist_with_covariance) const
Expand Down Expand Up @@ -356,6 +376,8 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC ObjectPolygonDisplayBase
rviz_common::properties::BoolProperty m_display_pose_with_covariance_property;
// Property to enable/disable velocity text visualization
rviz_common::properties::BoolProperty m_display_velocity_text_property;
// Property to enable/disable acceleration text visualization
rviz_common::properties::BoolProperty m_display_acceleration_text_property;
// Property to enable/disable twist visualization
rviz_common::properties::BoolProperty m_display_twist_property;
// Property to enable/disable predicted paths visualization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@

#include <autoware_auto_perception_msgs/msg/predicted_objects.hpp>

#include <boost/functional/hash.hpp>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>

#include <condition_variable>
#include <list>
#include <map>
#include <string>
#include <unordered_map>
#include <vector>

namespace autoware
Expand Down Expand Up @@ -93,10 +95,23 @@ class AUTOWARE_AUTO_PERCEPTION_RVIZ_PLUGIN_PUBLIC PredictedObjectsDisplay
return id_map.at(uuid);
}

std::map<boost::uuids::uuid, int32_t> id_map;
std::vector<visualization_msgs::msg::Marker::SharedPtr> createMarkers(
PredictedObjects::ConstSharedPtr msg);
void workerThread();

void update(float wall_dt, float ros_dt) override;

std::unordered_map<boost::uuids::uuid, int32_t, boost::hash<boost::uuids::uuid>> id_map;
// std::unordered_map<boost::uuids::uuid, int32_t> id_map;
std::list<int32_t> unused_marker_ids;
int32_t marker_id = 0;
const int32_t PATH_ID_CONSTANT = 1e3;

PredictedObjects::ConstSharedPtr msg;
bool consumed{false};
std::mutex mutex;
std::condition_variable condition;
std::vector<visualization_msgs::msg::Marker::SharedPtr> markers;
};

} // namespace object_detection
Expand Down
3 changes: 2 additions & 1 deletion common/autoware_auto_perception_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<version>1.0.0</version>
<description>Contains plugins to visualize object detection outputs</description>
<maintainer email="[email protected]">Apex.AI, Inc.</maintainer>
<maintainer email="[email protected]">Taichi Higashide</maintainer>
<maintainer email="[email protected]">Satoshi Tanaka</maintainer>
<maintainer email="[email protected]">Taiki Tanaka</maintainer>
<license>Apache 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,24 @@

#include <algorithm>
#include <cmath>
#include <iomanip>
#include <memory>
#include <sstream>
#include <string>
#include <vector>

namespace
{
// get string of double value rounded after first decimal place
// e.g. roundAfterFirstDecimalPlace(12.345) -> "1.2"
std::string getRoundedDoubleString(const double val)
{
std::stringstream ss;
ss << std::fixed << std::setprecision(1) << val;
return ss.str();
}
} // namespace

namespace autoware
{
namespace rviz_plugins
Expand Down Expand Up @@ -130,6 +144,27 @@ visualization_msgs::msg::Marker::SharedPtr get_velocity_text_marker_ptr(
return marker_ptr;
}

visualization_msgs::msg::Marker::SharedPtr get_acceleration_text_marker_ptr(
const geometry_msgs::msg::Accel & accel, const geometry_msgs::msg::Point & vis_pos,
const std_msgs::msg::ColorRGBA & color_rgba)
{
auto marker_ptr = std::make_shared<Marker>();
marker_ptr->type = visualization_msgs::msg::Marker::TEXT_VIEW_FACING;
marker_ptr->ns = std::string("acceleration");
marker_ptr->scale.x = 0.5;
marker_ptr->scale.z = 0.5;

double acc = std::sqrt(
accel.linear.x * accel.linear.x + accel.linear.y * accel.linear.y +
accel.linear.z * accel.linear.z);
marker_ptr->text = getRoundedDoubleString(acc) + std::string("[m/s^2]");
marker_ptr->action = visualization_msgs::msg::Marker::MODIFY;
marker_ptr->pose.position = vis_pos;
marker_ptr->lifetime = rclcpp::Duration::from_seconds(0.2);
marker_ptr->color = color_rgba;
return marker_ptr;
}

visualization_msgs::msg::Marker::SharedPtr get_pose_with_covariance_marker_ptr(
const geometry_msgs::msg::PoseWithCovariance & pose_with_covariance)
{
Expand Down
Loading