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

fix(ad_service_state_monitor): modify build error in rolling #716

Merged
merged 1 commit into from
Apr 24, 2022
Merged

fix(ad_service_state_monitor): modify build error in rolling #716

merged 1 commit into from
Apr 24, 2022

Conversation

wep21
Copy link
Contributor

@wep21 wep21 commented Apr 17, 2022

Description

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.

After all checkboxes are checked, anyone who has write access can merge the PR.

@wep21 wep21 requested a review from kenji-miyake April 17, 2022 17:00
@wep21 wep21 added ros:rolling Continuous ROS Rolling Ridley release. ros:humble ROS Humble Hawksbill release. labels Apr 17, 2022
@codecov
Copy link

codecov bot commented Apr 18, 2022

Codecov Report

Merging #716 (519416a) into main (632178e) will decrease coverage by 0.03%.
The diff coverage is 0.00%.

@@           Coverage Diff            @@
##            main    #716      +/-   ##
========================================
- Coverage   9.63%   9.60%   -0.04%     
========================================
  Files        907     907              
  Lines      56520   56746     +226     
  Branches    6694    6694              
========================================
  Hits        5448    5448              
- Misses     46577   46803     +226     
  Partials    4495    4495              
Flag Coverage Δ *Carryforward flag
differential 0.00% <ø> (?)
total 9.63% <0.00%> (ø) Carriedforward from 632178e

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
...y_planner/include/utilization/trajectory_utils.hpp 0.00% <0.00%> (ø)
...include/ad_service_state_monitor/state_machine.hpp 0.00% <ø> (ø)
...ate_monitor_node/ad_service_state_monitor_node.cpp 0.00% <ø> (ø)
.../src/ad_service_state_monitor_node/diagnostics.cpp 0.00% <ø> (ø)
...rc/ad_service_state_monitor_node/state_machine.cpp 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 572410f...519416a. Read the comment docs.

esteve
esteve previously requested changes Apr 18, 2022
@@ -29,6 +29,11 @@ ament_auto_add_executable(ad_service_state_monitor
${AD_SERVICE_STATE_MONITOR_SRC}
)

# workaround to allow deprecated header to build on both galactic and rolling
target_compile_options(ad_service_state_monitor PRIVATE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please apply the same solution as in #720 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@esteve addressed at 0fa477b.

@wep21 wep21 requested a review from esteve April 21, 2022 10:23
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
isamu-takagi pushed a commit to isamu-takagi/autoware.universe that referenced this pull request Apr 21, 2022
* Feature/porting control performance analysis (autowarefoundation#1671)

* Feature/control performance analysis (autowarefoundation#1212)

* First commit of kinematic_controller

* First commit.

* second commit

* Just setup updated Autoware.

* changed package name.

* Messages variables are created.

* Writing subscribers and publishers.

* Writing subscribers. Traj, pose and control_values are read into the node.

* Computing control performance variables.

* Computing control performance variables.

* Current velocity subscribed.

* Acceleration performance is computed.

* Publishing completed. Will start rqt_multiplot

* Publishing completed. Decay rate fixed. Will start rqt_multiplot

* rqt_multiplot first configuration.

* Update pure_pursuit.launch

* Update pure_pursuit.launch

* Update .gitignore

* Update Error.msg

* Update control_performance_utils.cpp

* Update ErrorStamped.msg

* Update package.xml

* rqt_multiplot first configuration.

* Update controller_performance_core.cpp

* Update controller_performance_core.cpp

* Update CMakeLists.txt

* Update control_performance_analysis_param.yaml

* EPS is added for value_decay_rate.

* There is a  bug.

* Bug removed.

* Bug removed.

* lateral_acceleration is published.

* Interpolated pose is added.

* Update controller_performance_node.cpp

* find Curve index bug is removed.

* dot product on projection is updated.

* Vehicle measured steering is included in the node and rqt_graph.

* Review will be requested.

* After the test:
Three point curvature module is added. Std:vector will be fixed.

* After the test:
Curvature plot is added.

* After the test:
Fine tuned.

* rqt curvature is modified.

* Pure pursuit curvature is implemented and tested. Results are fine.

* addressed some code review issues. Will replace get_pose.

* GetPose is removed.

* All the core review issues have been addressed.

* Rename files

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Porting control performance analysis

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Apply lint

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Add boost dependency for optional

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Remove confusing abbreviation

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Fix dependency in packages.xml

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Add missing new line

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Add comment for eigen macro

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* pre-commit fixes

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

Co-authored-by: Ali BOYALI <boyali@users.noreply.github.com>

* Fix package.xml (autowarefoundation#2056)

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix typo for control_performance_analysis (autowarefoundation#2328)

* fix typo

* fix Contro -> Control

* fix for spellcheck

* fix

* Change formatter to clang-format and black (autowarefoundation#2332)

* Revert "Temporarily comment out pre-commit hooks"

This reverts commit 748e9cdb145ce12f8b520bcbd97f5ff899fc28a3.

* Replace ament_lint_common with autoware_lint_common

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Remove ament_cmake_uncrustify and ament_clang_format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply Black

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply clang-format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix build errors

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix for cpplint

* Fix include double quotes to angle brackets

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Apply clang-format

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Fix build errors

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* Add COLCON_IGNORE (autowarefoundation#500)

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* adapt to actuation cmd/status as control msg (autowarefoundation#646)

* adapt to actuation cmd/status as control msg

* fix readme

* fix topics

* fix remaing topics

* as to pacmod interface

* fix vehicle status

* add header to twist

* revert gyro_odometer_change

* revert twist topic change

* revert unchanged package

* port control_performance_analysis (autowarefoundation#698)

* port control_performance_analysis

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* rename

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* fix topic name

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* remove unnecessary depedency

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* change name of odom topic

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* add readme in control_performance_analysis (autowarefoundation#716)

* add readme

Signed-off-by: kosuke murakami <kosuke.murakami@tier4.jp>

* update readme

* update readme

* Update control/control_performance_analysis/README.md

* Update twist topic name (autowarefoundation#736)

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* Apply suggestions from code review

Co-authored-by: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com>
Co-authored-by: Ali BOYALI <boyali@users.noreply.github.com>
Co-authored-by: Kenji Miyake <kenji.miyake@tier4.jp>
Co-authored-by: Hiroki OTA <hiroki.ota@tier4.jp>
Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Co-authored-by: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com>
Co-authored-by: Kosuke Murakami <kosuke.murakami@tier4.jp>
Co-authored-by: Tomoya Kimura <tomoya.kimura@tier4.jp>
#define FMT_HEADER_ONLY
#include "ad_service_state_monitor/state_machine.hpp"

#define FMT_HEADER_ONLY // NOLINT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just out of curiosity, what's this NOLINT for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenji-miyake pre-commit fixes include order as below.

#define FMT_HEADER_ONLY
#include "ad_service_state_monitor/state_machine.hpp"

#include <fmt/format.h>

I felt this order is a little bit weird, so I added NOLINT

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, but I think it's okay to define all macros at the top of headers.

@wep21 wep21 merged commit 12c6492 into autowarefoundation:main Apr 24, 2022
@wep21 wep21 deleted the fix/rolling-ad-service-monitor branch April 24, 2022 14:41
boyali referenced this pull request in boyali/autoware.universe Sep 28, 2022
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
boyali referenced this pull request in boyali/autoware.universe Oct 3, 2022
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
boyali referenced this pull request in boyali/autoware.universe Oct 19, 2022
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
yn-mrse referenced this pull request in tier4/autoware.universe Dec 22, 2022
Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
satoshi-ota pushed a commit to satoshi-ota/autoware.universe that referenced this pull request Aug 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ros:humble ROS Humble Hawksbill release. ros:rolling Continuous ROS Rolling Ridley release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants