Skip to content

Commit

Permalink
feat: rename existing packages name starting with autoware to differe…
Browse files Browse the repository at this point in the history
…nt names (autowarefoundation#180)

* autoware_api_utils -> tier4_api_utils

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_debug_tools -> tier4_debug_tools

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_error_monitor -> system_error_monitor

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_utils -> tier4_autoware_utils

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_global_parameter_loader -> global_parameter_loader

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_iv_auto_msgs_converter -> tier4_auto_msgs_converter

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_joy_controller -> joy_controller

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_error_monitor -> system_error_monitor(launch)

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_state_monitor -> ad_service_state_monitor

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_web_controller -> web_controller

Signed-off-by: tomoya.kimura <[email protected]>

* remove autoware_version

Signed-off-by: tomoya.kimura <[email protected]>

* remove autoware_rosbag_recorder

Signed-off-by: tomoya.kimura <[email protected]>

* autoware_*_rviz_plugin -> tier4_*_rviz_plugin

Signed-off-by: tomoya.kimura <[email protected]>

* fix ad_service_state_monitor

Signed-off-by: tomoya.kimura <[email protected]>

* ci(pre-commit): autofix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
tkimura4 and pre-commit-ci[bot] authored Dec 14, 2021
1 parent 69877e5 commit 8364b4f
Show file tree
Hide file tree
Showing 411 changed files with 1,404 additions and 1,514 deletions.
2 changes: 1 addition & 1 deletion awapi/awapi_awiv_adapter/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<depend>autoware_auto_planning_msgs</depend>
<depend>autoware_auto_system_msgs</depend>
<depend>autoware_auto_vehicle_msgs</depend>
<depend>autoware_iv_auto_msgs_converter</depend>
<depend>diagnostic_msgs</depend>
<depend>geometry_msgs</depend>
<depend>nav_msgs</depend>
Expand All @@ -24,6 +23,7 @@
<depend>tf2</depend>
<depend>tf2_geometry_msgs</depend>
<depend>tier4_api_msgs</depend>
<depend>tier4_auto_msgs_converter</depend>
<depend>tier4_control_msgs</depend>
<depend>tier4_external_api_msgs</depend>
<depend>tier4_planning_msgs</depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include "awapi_awiv_adapter/awapi_autoware_state_publisher.hpp"

#include "autoware_iv_auto_msgs_converter/autoware_iv_auto_msgs_converter.hpp"
#include "awapi_awiv_adapter/diagnostics_filter.hpp"
#include "tier4_auto_msgs_converter/tier4_auto_msgs_converter.hpp"

#include <regex>
#include <string>
Expand Down Expand Up @@ -67,7 +67,7 @@ void AutowareIvAutowareStatePublisher::getAutowareStateInfo(
}

// get autoware_state
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->autoware_state = convert(*autoware_state_ptr).state;
status->arrived_goal = isGoal(autoware_state_ptr);
}
Expand All @@ -82,7 +82,7 @@ void AutowareIvAutowareStatePublisher::getControlModeInfo(
}

// get control mode
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->control_mode = convert(*control_mode_ptr).data;
}

Expand Down Expand Up @@ -155,7 +155,7 @@ void AutowareIvAutowareStatePublisher::getHazardStatusInfo(
}

// get emergency
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->hazard_status = convert(*aw_info.hazard_status_ptr);

// filter leaf diagnostics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "awapi_awiv_adapter/awapi_lane_change_state_publisher.hpp"

#include "autoware_iv_auto_msgs_converter/autoware_iv_auto_msgs_converter.hpp"
#include "tier4_auto_msgs_converter/tier4_auto_msgs_converter.hpp"

namespace autoware_api
{
Expand Down Expand Up @@ -81,7 +81,7 @@ void AutowareIvLaneChangeStatePublisher::getCandidatePathInfo(
return;
}

using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->candidate_path = convert(*path_ptr);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "awapi_awiv_adapter/awapi_obstacle_avoidance_state_publisher.hpp"

#include "autoware_iv_auto_msgs_converter/autoware_iv_auto_msgs_converter.hpp"
#include "tier4_auto_msgs_converter/tier4_auto_msgs_converter.hpp"

namespace autoware_api
{
Expand Down Expand Up @@ -67,7 +67,7 @@ void AutowareIvObstacleAvoidanceStatePublisher::getCandidatePathInfo(
return;
}

using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->candidate_path = convert(*path_ptr);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "awapi_awiv_adapter/awapi_vehicle_state_publisher.hpp"

#include "autoware_iv_auto_msgs_converter/autoware_iv_auto_msgs_converter.hpp"
#include "tier4_auto_msgs_converter/tier4_auto_msgs_converter.hpp"

#include <limits>
#include <memory>
Expand Down Expand Up @@ -93,7 +93,7 @@ void AutowareIvVehicleStatePublisher::getSteerInfo(
}

// get steer
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->steering = convert(*steer_ptr).data;

// get steer vel
Expand Down Expand Up @@ -144,7 +144,7 @@ void AutowareIvVehicleStatePublisher::getTurnSignalInfo(
}

// get turn signal
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->turn_signal = convert(*turn_indicators_ptr, *hazard_lights_ptr).data;
}

Expand Down Expand Up @@ -191,7 +191,7 @@ void AutowareIvVehicleStatePublisher::getGearInfo(
}

// get gear (shift)
using autoware_iv_auto_msgs_converter::convert;
using tier4_auto_msgs_converter::convert;
status->gear = convert(*gear_ptr).shift.data;
}

Expand Down
15 changes: 0 additions & 15 deletions common/autoware_debug_tools/scripts/stop_reason2tf

This file was deleted.

17 changes: 0 additions & 17 deletions common/autoware_rosbag_recorder/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions common/autoware_rosbag_recorder/Readme.md

This file was deleted.

18 changes: 0 additions & 18 deletions common/autoware_rosbag_recorder/package.xml

This file was deleted.

21 changes: 0 additions & 21 deletions common/autoware_rosbag_recorder/scripts/record.sh

This file was deleted.

37 changes: 0 additions & 37 deletions common/autoware_utils/include/autoware_utils/autoware_utils.hpp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
project(autoware_global_parameter_loader)
project(global_parameter_loader)

find_package(ament_cmake_auto REQUIRED)
ament_auto_find_build_dependencies()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Add the following lines to the launch file of the node in which you want to get

```xml
<!-- Global parameters -->
<include file="$(find-pkg-share autoware_global_parameter_loader)/launch/global_params.launch.py">
<include file="$(find-pkg-share global_parameter_loader)/launch/global_params.launch.py">
<arg name="vehicle_model" value="$(var vehicle_model)"/>
</include>
```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="3">
<name>autoware_global_parameter_loader</name>
<name>global_parameter_loader</name>
<version>0.1.0</version>
<description>The autoware_global_parameter_loader package</description>
<description>The global_parameter_loader package</description>
<maintainer email="[email protected]">Kenji Miyake</maintainer>
<license>Apache License 2.0</license>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_

#include <autoware_utils/geometry/pose_deviation.hpp>
#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/geometry/pose_deviation.hpp>

#include <autoware_auto_planning_msgs/msg/route.hpp>
#include <geometry_msgs/msg/pose_stamped.hpp>
Expand All @@ -25,7 +25,7 @@

namespace goal_distance_calculator
{
using autoware_utils::PoseDeviation;
using tier4_autoware_utils::PoseDeviation;

struct Param
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include "goal_distance_calculator/goal_distance_calculator.hpp"

#include <autoware_utils/ros/debug_publisher.hpp>
#include <autoware_utils/ros/self_pose_listener.hpp>
#include <rclcpp/rclcpp.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
#include <tier4_autoware_utils/ros/self_pose_listener.hpp>

#include <autoware_auto_planning_msgs/msg/route.hpp>
#include <geometry_msgs/msg/pose_stamped.hpp>
Expand All @@ -45,7 +45,7 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
private:
// Subscriber
rclcpp::Subscription<geometry_msgs::msg::PoseStamped>::SharedPtr sub_initial_pose_;
autoware_utils::SelfPoseListener self_pose_listener_;
tier4_autoware_utils::SelfPoseListener self_pose_listener_;
rclcpp::Subscription<autoware_auto_planning_msgs::msg::Route>::SharedPtr sub_route_;

// Data Buffer
Expand All @@ -56,7 +56,7 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
void onRoute(const autoware_auto_planning_msgs::msg::Route::ConstSharedPtr & msg);

// Publisher
autoware_utils::DebugPublisher debug_publisher_;
tier4_autoware_utils::DebugPublisher debug_publisher_;

// Timer
rclcpp::TimerBase::SharedPtr timer_;
Expand Down
2 changes: 1 addition & 1 deletion common/goal_distance_calculator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<buildtool_depend>ament_cmake</buildtool_depend>

<depend>autoware_auto_planning_msgs</depend>
<depend>autoware_utils</depend>
<depend>geometry_msgs</depend>
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_debug_msgs</depend>

<test_depend>ament_lint_auto</test_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Output GoalDistanceCalculator::update(const Input & input)
Output output{};

output.goal_deviation =
autoware_utils::calcPoseDeviation(input.route->goal_point.pose, input.current_pose->pose);
tier4_autoware_utils::calcPoseDeviation(input.route->goal_point.pose, input.current_pose->pose);

return output;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

#include "goal_distance_calculator/goal_distance_calculator_node.hpp"

#include <autoware_utils/math/unit_conversion.hpp>
#include <rclcpp/rclcpp.hpp>
#include <rclcpp/timer.hpp>
#include <tier4_autoware_utils/math/unit_conversion.hpp>

#include <tier4_debug_msgs/msg/float64_stamped.hpp>

Expand Down Expand Up @@ -112,7 +112,7 @@ void GoalDistanceCalculatorNode::onTimer()
output_ = goal_distance_calculator_->update(input_);

{
using autoware_utils::rad2deg;
using tier4_autoware_utils::rad2deg;
const auto & deviation = output_.goal_deviation;

debug_publisher_.publish<tier4_debug_msgs::msg::Float64Stamped>(
Expand Down
2 changes: 1 addition & 1 deletion common/path_distance_calculator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>autoware_auto_planning_msgs</depend>
<depend>autoware_utils</depend>
<depend>rclcpp</depend>
<depend>rclcpp_components</depend>
<depend>tier4_autoware_utils</depend>
<depend>tier4_debug_msgs</depend>
<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
Loading

0 comments on commit 8364b4f

Please sign in to comment.