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 #33

Merged
merged 20 commits into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
15f43bc
fix(tier4_state_rviz_plugin): change service and topic name for engag…
rej55 Apr 5, 2022
b8f666b
fix(motion_velocity_smoother): velocity limit when engage status (#621)
mkuri Apr 5, 2022
7d3ee50
fix(motion_velocity_smoother): add missing rclcpp dependency (#634)
takam5f2 Apr 5, 2022
61a09b8
chore: sync files (#629)
awf-autoware-bot[bot] Apr 5, 2022
1160713
ci(pre-commit): update pre-commit-hooks-ros (#625)
kenji-miyake Apr 5, 2022
05d0131
ci(pre-commit): autoupdate (#355)
pre-commit-ci[bot] Apr 5, 2022
27d01da
ci(codecov): fix diff coverage (#384)
KeisukeShima Apr 6, 2022
b1e10da
chore: sync files (#637)
awf-autoware-bot[bot] Apr 6, 2022
341b77f
fix(dummy_diag_publisher): use anon to make unique node name instead …
h-ohta Apr 6, 2022
90ee0ae
fix(behavior_velocity_planner): fix velocity interpolation changing t…
TakaHoribe Apr 6, 2022
200fefe
feat: add new diag for hdd_monitor to diagnostics aggregator (#642)
h-ohta Apr 7, 2022
ae97673
fix: localization and perception launch for tutorial (#645)
yukkysaito Apr 7, 2022
2fa1c16
fix(ekf_localizer): rosbag clock jump bug (#646)
YamatoAndo Apr 7, 2022
7ee98f4
feat(tier4_traffic_light_rviz_plugin): add traffic light publish pane…
satoshi-ota Apr 7, 2022
c341d4c
fix(behavior_path_planner): initialize scene module status (#650)
rej55 Apr 7, 2022
6044998
feat(dummy_diag_publisher): use as a component (#652)
h-ohta Apr 7, 2022
5df08c0
fix(ndt_scan_matcher): disable `march=native` when the target is Inte…
harihitode Apr 8, 2022
0b70df0
feat: pointcloud based probabilistic occupancy grid map (#624)
yukkysaito Apr 8, 2022
bb3bc19
feat(behavior_velocity): add velocity smoother to behavior velocity (…
taikitanaka3 Apr 8, 2022
a4e7e2f
Merge branch 'tier4/main' into sync-upstream
yn-mrse Apr 8, 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
1 change: 1 addition & 0 deletions .github/workflows/build-and-test-differential.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
files: ${{ steps.test.outputs.coverage-report-files }}
fail_ci_if_error: false
verbose: true
flags: differential

clang-tidy-differential:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ jobs:
files: ${{ steps.test.outputs.coverage-report-files }}
fail_ci_if_error: false
verbose: true
flags: total
14 changes: 8 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.30.0
rev: v0.31.1
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.5.1
rev: v2.6.2
hooks:
- id: prettier

Expand All @@ -35,19 +35,21 @@ repos:
- id: yamllint

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.5.1
rev: v0.6.0
hooks:
- id: prettier-xacro
- id: prettier-launch-xml
- id: prettier-package-xml
- id: sort-package-xml
- id: ros-include-guard

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.8.0.3
rev: v0.8.0.4
hooks:
- id: shellcheck

- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.4.2-1
rev: v3.4.3-1
hooks:
- id: shfmt
args: [-w, -s, -i=4]
Expand Down Expand Up @@ -86,7 +88,7 @@ repos:
types_or: [c++, c, cuda]

- repo: https://github.com/cpplint/cpplint
rev: 1.5.5
rev: 1.6.0
hooks:
- id: cpplint
args: [--quiet]
Expand Down
22 changes: 22 additions & 0 deletions codecov.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
coverage:
status:
project:
default:
target: auto
patch:
default:
target: auto

comment:
show_carryforward_flags: true

flag_management:
default_rules:
carryforward: true
statuses:
- name_prefix: project-
type: project
target: auto
- name_prefix: patch-
type: patch
target: auto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>
<arg name="oneshot" default="false" />
<arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml" />
<arg name="oneshot" default="false"/>
<arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml"/>
<node pkg="goal_distance_calculator" exec="goal_distance_calculator_node" name="goal_distance_calculator" output="screen">
<param from="$(var config_file)"/>
<param name="oneshot" value="$(var oneshot)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<launch>
<arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path" />
<arg name="distance" default="~/distance" />
<arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path"/>
<arg name="distance" default="~/distance"/>
<node pkg="path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
<remap from="~/input/path" to="$(var path)" />
<remap from="~/output/distance" to="$(var distance)" />
<remap from="~/input/path" to="$(var path)"/>
<remap from="~/output/distance" to="$(var distance)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<launch>

<arg name="lateral_error_publisher_param_path" default="$(find-pkg-share tier4_debug_tools)/config/lateral_error_publisher.param.yaml"/>
<arg name="lateral_error_publisher_param_path" default="$(find-pkg-share tier4_debug_tools)/config/lateral_error_publisher.param.yaml"/>

<!-- mpc for trajectory following -->
<node pkg="tier4_debug_tools" exec="lateral_error_publisher_node" name="lateral_error_publisher" output="screen">
Expand All @@ -9,5 +8,4 @@
<remap from="~/input/vehicle_pose_with_covariance" to="/localization/pose_with_covariance"/>
<remap from="~/input/ground_truth_pose_with_covariance" to="/localization/pose_with_covariance"/>
</node>

</launch>
4 changes: 2 additions & 2 deletions common/tier4_state_rviz_plugin/src/autoware_state_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ void AutowareStatePanel::onInitialize()
"/vehicle/status/gear_status", 10, std::bind(&AutowareStatePanel::onShift, this, _1));

sub_engage_ = raw_node_->create_subscription<tier4_external_api_msgs::msg::EngageStatus>(
"/api/external/get/engage", 10, std::bind(&AutowareStatePanel::onEngageStatus, this, _1));
"/api/autoware/get/engage", 10, std::bind(&AutowareStatePanel::onEngageStatus, this, _1));

client_engage_ = raw_node_->create_client<tier4_external_api_msgs::srv::Engage>(
"/api/external/set/engage", rmw_qos_profile_services_default);
"/api/autoware/set/engage", rmw_qos_profile_services_default);
}

void AutowareStatePanel::onGateMode(const tier4_control_msgs::msg::GateMode::ConstSharedPtr msg)
Expand Down
42 changes: 42 additions & 0 deletions common/tier4_traffic_light_rviz_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
cmake_minimum_required(VERSION 3.5)
project(tier4_traffic_light_rviz_plugin)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
endif()

find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()

find_package(Qt5 ${rviz_QT_VERSION} EXACT REQUIRED Core Widgets)
set(QT_LIBRARIES Qt5::Widgets)
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_definitions(-DQT_NO_KEYWORDS)

ament_auto_add_library(${PROJECT_NAME} SHARED
src/traffic_light_publish_panel.cpp
)

target_link_libraries(${PROJECT_NAME}
${QT_LIBRARIES}
)

# Export the plugin to be imported by rviz2
pluginlib_export_plugin_description_file(rviz_common plugins/plugin_description.xml)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
endif()

ament_auto_package(
INSTALL_TO_SHARE
icons
plugins
)
31 changes: 31 additions & 0 deletions common/tier4_traffic_light_rviz_plugin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# tier4_traffic_light_rviz_plugin

## Purpose

This plugin panel publishes dummy traffic light signals.

## Inputs / Outputs

### Output

| Name | Type | Description |
| ------------------------------------------------------- | -------------------------------------------------------- | ----------------------------- |
| `/perception/traffic_light_recognition/traffic_signals` | `autoware_auto_perception_msgs::msg::TrafficSignalArray` | Publish traffic light signals |

## HowToUse

<div align="center">
<img src="images/select_panels.png" width=50%>
</div>
<div align="center">
<img src="images/select_traffic_light_publish_panel.png" width=50%>
</div>

1. Start rviz and select panels/Add new panel.
2. Select TrafficLightPublishPanel and press OK.
3. Set `Traffic Light ID` & `Traffic Light Status` and press `SET` button.
4. Traffic light signals are published, while `PUBLISH` button is pushed.

<div align="center">
<img src="images/traffic_light_publish_panel.gif">
</div>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions common/tier4_traffic_light_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package format="2">
<name>tier4_traffic_light_rviz_plugin</name>
<version>0.0.0</version>
<description>The autoware state rviz plugin package</description>
<maintainer email="satoshi.ota@tier4.jp">Satoshi OTA</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
<depend>autoware_auto_perception_msgs</depend>
<depend>libqt5-core</depend>
<depend>libqt5-gui</depend>
<depend>libqt5-widgets</depend>
<depend>qtbase5-dev</depend>
<depend>rclcpp</depend>
<depend>rviz_common</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>

<export>
<build_type>ament_cmake</build_type>
<rviz plugin="${prefix}/plugins/plugin_description.xml"/>
</export>
</package>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<library path="tier4_traffic_light_rviz_plugin">

<class
type="rviz_plugins::TrafficLightPublishPanel"
base_class_type="rviz_common::Panel">
<description>TrafficLightPublishPanel</description>
</class>

</library>
Loading