fix(fetch upstream): fix conflict #2

tzhong518 · 2022-04-27T02:21:06Z

Note: Confirm the contribution guidelines before submitting a pull request.

Click the Preview tab and select a PR template:

Do NOT send a PR with this description.

fix: bugprone-integer-division Signed-off-by: kobayu858 <[email protected]>

…9629) fix: bugprone-branch-clone Signed-off-by: kobayu858 <[email protected]>

fix: bugprone-branch-clone Signed-off-by: kobayu858 <[email protected]>

…_dispatch (#9638) Signed-off-by: M. Fatih Cırıt <[email protected]>

…to 2 mins (#9639) Signed-off-by: M. Fatih Cırıt <[email protected]>

… geometric shift pull out planner (#9640) * feat(behavior_path_planner): add unit tests for geometric pull-out planner and improve collision check Signed-off-by: kyoichi-sugahara <[email protected]> * feat(behavior_path_planner): add boolean parameter for divide_pull_out_path and update tests Signed-off-by: kyoichi-sugahara <[email protected]> --------- Signed-off-by: kyoichi-sugahara <[email protected]>

…v-maintained-packages (#9646) chore(codecov.yaml): comment out unmaintained planning components Signed-off-by: kyoichi-sugahara <[email protected]>

* fix: bugprone-reserved-identifier Signed-off-by: kobayu858 <[email protected]> * fix: fmt Signed-off-by: kobayu858 <[email protected]> --------- Signed-off-by: kobayu858 <[email protected]>

Signed-off-by: Mamoru Sobue <[email protected]>

* feat: optimize voxel indexing in preprocess_kernel.cu Signed-off-by: Taekjin LEE <[email protected]> * fix: remove redundant index check Signed-off-by: Taekjin LEE <[email protected]> * fix: modify voxel index for better memory access Signed-off-by: Taekjin LEE <[email protected]> --------- Signed-off-by: Taekjin LEE <[email protected]>

…ameters (#9621) * refactor(autoware_multi_object_tracker): add configurable tracker parameters Signed-off-by: jkoronczok <[email protected]> * style(pre-commit): autofix * refactor(autoware_multi_object_tracker): remove default values from parameter declarations Signed-off-by: jkoronczok <[email protected]> * refactor(autoware_multi_object_tracker): update schema file Signed-off-by: jkoronczok <[email protected]> * style(pre-commit): autofix * Update perception/autoware_multi_object_tracker/src/processor/processor.cpp * Update perception/autoware_multi_object_tracker/src/processor/processor.cpp --------- Signed-off-by: jkoronczok <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Taekjin LEE <[email protected]>

…anning (#9644) Signed-off-by: Mamoru Sobue <[email protected]>

Signed-off-by: Mamoru Sobue <[email protected]>

* add timekeeper Signed-off-by: a-maumau <[email protected]> * chore: refactor time-keeper position Signed-off-by: Taekjin LEE <[email protected]> * chore: bring back a missing comment Signed-off-by: Taekjin LEE <[email protected]> * chore: remove redundant timekeepers Signed-off-by: Taekjin LEE <[email protected]> --------- Signed-off-by: a-maumau <[email protected]> Signed-off-by: Taekjin LEE <[email protected]> Co-authored-by: Taekjin LEE <[email protected]>

fix: bugprone-errors Signed-off-by: kobayu858 <[email protected]>

…on between 'map' and 'base_link' (#9655) Signed-off-by: Y.Hisaki <[email protected]>

…9654) fix: bugprone-error Signed-off-by: kobayu858 <[email protected]>

* fix: bugprone-exception-escape Signed-off-by: kobayu858 <[email protected]> * fix: cpplint Signed-off-by: kobayu858 <[email protected]> --------- Signed-off-by: kobayu858 <[email protected]>

* add behavior determination flowchart * add cruise planning block diagram * style(pre-commit): autofix --------- Signed-off-by: mitukou1109 <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

…tifier (#9658) fix: bugprone-error Signed-off-by: kobayu858 <[email protected]>

…bug_values, adopt rate limit fillter (#9656) Signed-off-by: yuki-takagi-66 <[email protected]>

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]>

Signed-off-by: Mamoru Sobue <[email protected]>

…ntroduce planning_factor (#9927) Signed-off-by: satoshi-ota <[email protected]> Signed-off-by: Mamoru Sobue <[email protected]> Co-authored-by: Satoshi OTA <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]> Co-authored-by: satoshi-ota <[email protected]>

Signed-off-by: Mamoru Sobue <[email protected]>

…tialization (#9944)

* refactor(lane_change): parameterize incoming object yaw threshold Signed-off-by: Zulfaqar Azmi <[email protected]> * Readme Signed-off-by: Zulfaqar Azmi <[email protected]> * Update planning/behavior_path_planner/autoware_behavior_path_lane_change_module/src/manager.cpp Co-authored-by: Maxime CLEMENT <[email protected]> * Add missing parameters Signed-off-by: Zulfaqar Azmi <[email protected]> * missing dot Signed-off-by: Zulfaqar Azmi <[email protected]> * Update planning/behavior_path_planner/autoware_behavior_path_lane_change_module/README.md Co-authored-by: mkquda <[email protected]> * update readme Signed-off-by: Zulfaqar Azmi <[email protected]> --------- Signed-off-by: Zulfaqar Azmi <[email protected]> Co-authored-by: Maxime CLEMENT <[email protected]> Co-authored-by: mkquda <[email protected]>

…9943) * feat(behavior_velocity_planner)!: remove velocity_factor completely Signed-off-by: Mamoru Sobue <[email protected]> * minimize diff Signed-off-by: Mamoru Sobue <[email protected]> --------- Signed-off-by: Mamoru Sobue <[email protected]>

* fix(obstacle_stop_planner): migrate planning factor Signed-off-by: satoshi-ota <[email protected]> * fix(autoware_default_adapi): add coversion map Signed-off-by: satoshi-ota <[email protected]> --------- Signed-off-by: satoshi-ota <[email protected]>

…#9950) add clear before insert Signed-off-by: a-maumau <[email protected]>

* modify docs Signed-off-by: MasatoSaeki <[email protected]> * fix title Signed-off-by: MasatoSaeki <[email protected]> * fix docs Signed-off-by: MasatoSaeki <[email protected]> * fix word Signed-off-by: MasatoSaeki <[email protected]> * add comment about debug markers Signed-off-by: MasatoSaeki <[email protected]> * fix docs Signed-off-by: MasatoSaeki <[email protected]> --------- Signed-off-by: MasatoSaeki <[email protected]>

…params (#9818) * modify readme and related params Signed-off-by: MasatoSaeki <[email protected]> * fix typo Signed-off-by: MasatoSaeki <[email protected]> * fix Signed-off-by: MasatoSaeki <[email protected]> --------- Signed-off-by: MasatoSaeki <[email protected]>

#9853) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files control/autoware_trajectory_follower_node Signed-off-by: vish0012 <[email protected]>

#9851)

…o autoware_internal_debug_msgs in fil… (#9871) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files perception/autoware_detected_object_validation Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

…#9948) * chore: add new package for planning factor interface Signed-off-by: satoshi-ota <[email protected]> * chore(surround_obstacle_checker): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(obstacle_stop_planner): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(obstacle_cruise_planner): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(motion_velocity_planner): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(bpp): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(bvp-common): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(blind_spot): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(crosswalk): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(detection_area): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(intersection): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(no_drivable_area): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(no_stopping_area): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(occlusion_spot): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(run_out): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(speed_bump): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(stop_line): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(template_module): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(traffic_light): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(vtl): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(walkway): update include file Signed-off-by: satoshi-ota <[email protected]> * chore(motion_utils): remove factor interface Signed-off-by: satoshi-ota <[email protected]> --------- Signed-off-by: satoshi-ota <[email protected]>

…are_internal_debug_msgs in autoware_planning_validator (#9911) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files planning/autoware_planning_validator Signed-off-by: vish0012 <[email protected]>

#9904) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files planning/autoware_mission_planner Signed-off-by: vish0012 <[email protected]>

#9902) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files planning/autoware_external_velocity_limit_selector Signed-off-by: vish0012 <[email protected]>

…#9951) fix(imu_corrector): remove force_update() in timer callback Signed-off-by: Takahisa.Ishikawa <[email protected]> Co-authored-by: Takahisa.Ishikawa <[email protected]>

…autoware_internal_debug_msgs in autoware_processing_time_checker (#9921) Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

…utoware_internal_debug_msgs in autoware_steer_offset_estimator (#9926) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files vehicle/autoware_steer_offset_estimator Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

…to autoware_internal_debug_msgs in autoware_accel_brake_map_calibrator (#9923) Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

…o autoware_internal_debug_msgs in autoware_raw_vehicle_cmd_converter (#9924) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files vehicle/autoware_raw_vehicle_cmd_converter Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

#9896) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files perception/autoware_raindrop_cluster_filter Signed-off-by: vish0012 <[email protected]>

…fficLightState and ExpandStopRange (#9953) * feat(autoware_planning_test_manager): remove dependency of virtual traffic light Signed-off-by: Takayuki Murooka <[email protected]> * modify obstacle_stop test code Signed-off-by: Takayuki Murooka <[email protected]> --------- Signed-off-by: Takayuki Murooka <[email protected]>

* feat: common test code in behavior_path_planner Signed-off-by: Takayuki Murooka <[email protected]> * deal with other modules Signed-off-by: Takayuki Murooka <[email protected]> * fix typo Signed-off-by: Takayuki Murooka <[email protected]> * update Signed-off-by: Takayuki Murooka <[email protected]> --------- Signed-off-by: Takayuki Murooka <[email protected]>

…ning_msgs::msg::LateralOffset (#9967) * feat(autoware_planning_test_manager): remove dependency of tier4_planning_msgs::msg::LateralOffset Signed-off-by: Takayuki Murooka <[email protected]> * fix Signed-off-by: Takayuki Murooka <[email protected]> --------- Signed-off-by: Takayuki Murooka <[email protected]>

…#9954) * feat(localization_evaluator): apply `autoware_` prefix (see below): * In this commit, I did not organize a folder structure. The folder structure will be organized in the next some commits. * The changes will follow the Autoware's guideline as below: - https://autowarefoundation.github.io/autoware-documentation/main/contributing/coding-guidelines/ros-nodes/directory-structure/#package-folder Signed-off-by: Junya Sasaki <[email protected]> * rename(localization_evaluator): move headers under `include/autoware`: * Fixes due to this changes for .hpp/.cpp files will be applied in the next commit Signed-off-by: Junya Sasaki <[email protected]> * fix(localization_evaluator): fix include paths * To follow the previous commit Signed-off-by: Junya Sasaki <[email protected]> * rename: `localization_evaluator` => `autoware_localization_evaluator` Signed-off-by: Junya Sasaki <[email protected]> * style(pre-commit): autofix --------- Signed-off-by: Junya Sasaki <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* feat: update param setting Signed-off-by: TetsuKawa <[email protected]> * style(pre-commit): autofix * modify: delete unnecessary include Signed-off-by: TetsuKawa <[email protected]> --------- Signed-off-by: TetsuKawa <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix segmentation fault Signed-off-by: Yamato Ando <[email protected]> * style(pre-commit): autofix --------- Signed-off-by: Yamato Ando <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* feat: delete ekf_localizer files Signed-off-by: Motsu-san <[email protected]> * doc: Modify ekf_localizer directory links Signed-off-by: Motsu-san <[email protected]> * ci: remove ekf_localizer from the codecov target list Signed-off-by: Motsu-san <[email protected]> --------- Signed-off-by: Motsu-san <[email protected]>

* docs(lane_change): object filtering description Signed-off-by: Zulfaqar Azmi <[email protected]> * Move section up Signed-off-by: Zulfaqar Azmi <[email protected]> * Update planning/behavior_path_planner/autoware_behavior_path_lane_change_module/README.md Co-authored-by: mkquda <[email protected]> * Update planning/behavior_path_planner/autoware_behavior_path_lane_change_module/README.md Co-authored-by: mkquda <[email protected]> --------- Signed-off-by: Zulfaqar Azmi <[email protected]> Co-authored-by: mkquda <[email protected]>

tzhong518 changed the title ~~fix conflicts~~ fix(fetch upstream) May 20, 2022

tzhong518 changed the title ~~fix(fetch upstream)~~ fix(fetch upstream): fix conflict May 20, 2022

tzhong518 self-assigned this May 20, 2022

xmfcx force-pushed the main branch from 38ab385 to 28d1440 Compare November 16, 2022 12:10

kobayu858 and others added 26 commits December 12, 2024 19:01

fix(tier4_state_rviz_plugin): fix bugprone-integer-division (#9628)

46cfadb

fix: bugprone-integer-division Signed-off-by: kobayu858 <[email protected]>

fix(autoware_pid_longitudinal_controller): fix bugprone-branch-clone (#…

413805a

…9629) fix: bugprone-branch-clone Signed-off-by: kobayu858 <[email protected]>

fix(perception_online_evaluator): fix bugprone-branch-clone (#9631)

e8ea100

fix: bugprone-branch-clone Signed-off-by: kobayu858 <[email protected]>

ci(build-and-test): set concurrency to sequential and remove workflow…

c77f1b9

…_dispatch (#9638) Signed-off-by: M. Fatih Cırıt <[email protected]>

build(autoware_freespace_planning_algorithms): increase test timeout …

2127ca8

…to 2 mins (#9639) Signed-off-by: M. Fatih Cırıt <[email protected]>

ci(codecov): comment out unmaintained planning components from tier-i…

fee8fe5

…v-maintained-packages (#9646) chore(codecov.yaml): comment out unmaintained planning components Signed-off-by: kyoichi-sugahara <[email protected]>

fix(autoware_stop_filter): fix bugprone-reserved-identifier (#9643)

9ff1c38

* fix: bugprone-reserved-identifier Signed-off-by: kobayu858 <[email protected]> * fix: fmt Signed-off-by: kobayu858 <[email protected]> --------- Signed-off-by: kobayu858 <[email protected]>

feat(goal_planner): divide Planners to isolated threads (#9514)

657c894

Signed-off-by: Mamoru Sobue <[email protected]>

feat(goal_planner): add bezier based pull over planner (#9642)

5ced41e

Signed-off-by: Mamoru Sobue <[email protected]>

perf(goal_planner): remove unnecessary call to setMap on freespace pl…

d5cd150

…anning (#9644) Signed-off-by: Mamoru Sobue <[email protected]>

refactor(goal_planner): divide sort function (#9650)

9ee2c5a

Signed-off-by: Mamoru Sobue <[email protected]>

fix(autoware_multi_object_tracker): fix bugprone-errors (#9651)

51a74c6

fix: bugprone-errors Signed-off-by: kobayu858 <[email protected]>

chore(autoware_costmap_generator): suppress Could not find a connecti…

932e87f

…on between 'map' and 'base_link' (#9655) Signed-off-by: Y.Hisaki <[email protected]>

fix(autoware_radar_fusion_to_detected_object): fix bugprone-errors (#…

a85c67b

…9654) fix: bugprone-error Signed-off-by: kobayu858 <[email protected]>

fix(autoware_control_evaluator): fix bugprone-exception-escape (#9630)

9167bfb

* fix: bugprone-exception-escape Signed-off-by: kobayu858 <[email protected]> * fix: cpplint Signed-off-by: kobayu858 <[email protected]> --------- Signed-off-by: kobayu858 <[email protected]>

fix(autoware_radar_tracks_msgs_converter): fix bugprone-reserved-iden…

219b8ca

…tifier (#9658) fix: bugprone-error Signed-off-by: kobayu858 <[email protected]>

feat(pid_longitudinal_controller): update trajectory_adaptive; add de…

e808fdc

…bug_values, adopt rate limit fillter (#9656) Signed-off-by: yuki-takagi-66 <[email protected]>

chore: sync files (#9602)

c7ecf7a

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]>

chore: update CODEOWNERS (#9623)

a37eca4

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]>

chore: sync files (#9665)

d99caf9

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]>

feat(autoware_test_utils): add visualization (#9603)

b9ebc42

Signed-off-by: Mamoru Sobue <[email protected]>

soblin and others added 30 commits January 16, 2025 18:30

feat(motion_utils): add detail and pass type to VirtualWall (#9940)

dd632fc

Signed-off-by: Mamoru Sobue <[email protected]>

fix(start_planner, goal_planner): refactor lane departure checker ini…

62e07a1

…tialization (#9944)

fix(map_based_prediction): fix unintentional accumulation of lanelets (…

7bc6a4e

…#9950) add clear before insert Signed-off-by: a-maumau <[email protected]>

feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in fil… (

bce4c44

#9853) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files control/autoware_trajectory_follower_node Signed-off-by: vish0012 <[email protected]>

feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in fil… (

dc75c7f

#9851)

feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in fil… (

c926e46

#9904) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files planning/autoware_mission_planner Signed-off-by: vish0012 <[email protected]>

feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in fil… (

b466796

#9902) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files planning/autoware_external_velocity_limit_selector Signed-off-by: vish0012 <[email protected]>

fix(imu_corrector): remove non-periodic publish to /diagnostics topic (…

f9c0aa6

…#9951) fix(imu_corrector): remove force_update() in timer callback Signed-off-by: Takahisa.Ishikawa <[email protected]> Co-authored-by: Takahisa.Ishikawa <[email protected]>

feat(autoware_processing_time_checker)!: tier4_debug_msgs changed to …

18da07d

…autoware_internal_debug_msgs in autoware_processing_time_checker (#9921) Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

feat(autoware_accel_brake_map_calibrator)!: tier4_debug_msgs changed …

e3e7fdb

…to autoware_internal_debug_msgs in autoware_accel_brake_map_calibrator (#9923) Signed-off-by: vish0012 <[email protected]> Co-authored-by: Ryohsuke Mitsudome <[email protected]>

feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in fil… (

64e4e21

#9896) feat: tier4_debug_msgs changed to autoware_internal_debug_msgs in files perception/autoware_raindrop_cluster_filter Signed-off-by: vish0012 <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(fetch upstream): fix conflict #2

fix(fetch upstream): fix conflict #2

tzhong518 commented Apr 27, 2022

fix(fetch upstream): fix conflict #2

Are you sure you want to change the base?

fix(fetch upstream): fix conflict #2

Conversation

tzhong518 commented Apr 27, 2022