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

refactor(autoware_ad_api_specs): prefix package and namespace with autoware #9250

Merged
merged 7 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Automatically generated from package.xml ###
common/autoware_ad_api_specs/** [email protected] [email protected]
common/autoware_adapi_specs/** [email protected] [email protected]
common/autoware_auto_common/** [email protected] [email protected] [email protected] [email protected]
common/autoware_component_interface_specs/** [email protected] [email protected]
common/autoware_component_interface_tools/** [email protected]
Expand Down
2 changes: 1 addition & 1 deletion common/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ nav:
- 'Goal Distance Calculator': common/goal_distance_calculator/Readme
- 'Path Distance Calculator': common/autoware_path_distance_calculator/Readme
- 'Others':
- 'autoware_ad_api_specs': common/autoware_ad_api_specs
- 'autoware_adapi_specs': common/autoware_adapi_specs
- 'component_interface_specs': common/component_interface_specs
- 'component_interface_tools': common/component_interface_tools
- 'component_interface_utils': common/component_interface_utils
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_ad_api_specs)
project(autoware_adapi_specs)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
#define AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
#define AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/mrm_state.hpp>

namespace autoware_ad_api::fail_safe
namespace autoware::adapi_specs::fail_safe
{

struct MrmState
Expand All @@ -31,6 +31,6 @@ struct MrmState
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::fail_safe
} // namespace autoware::adapi_specs::fail_safe

#endif // AUTOWARE_AD_API_SPECS__FAIL_SAFE_HPP_
#endif // AUTOWARE__ADAPI_SPECS__FAIL_SAFE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
#define AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
#define AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_

#include <autoware_adapi_version_msgs/srv/interface_version.hpp>

namespace autoware_ad_api::interface
namespace autoware::adapi_specs::interface
{

struct Version
Expand All @@ -26,6 +26,6 @@ struct Version
static constexpr char name[] = "/api/interface/version";
};

} // namespace autoware_ad_api::interface
} // namespace autoware::adapi_specs::interface

#endif // AUTOWARE_AD_API_SPECS__INTERFACE_HPP_
#endif // AUTOWARE__ADAPI_SPECS__INTERFACE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
#define AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
#define AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/localization_initialization_state.hpp>
#include <autoware_adapi_v1_msgs/srv/initialize_localization.hpp>

namespace autoware_ad_api::localization
namespace autoware::adapi_specs::localization
{

struct Initialize
Expand All @@ -38,6 +38,6 @@ struct InitializationState
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::localization
} // namespace autoware::adapi_specs::localization

#endif // AUTOWARE_AD_API_SPECS__LOCALIZATION_HPP_
#endif // AUTOWARE__ADAPI_SPECS__LOCALIZATION_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__MOTION_HPP_
#define AUTOWARE_AD_API_SPECS__MOTION_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__MOTION_HPP_
#define AUTOWARE__ADAPI_SPECS__MOTION_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/motion_state.hpp>
#include <autoware_adapi_v1_msgs/srv/accept_start.hpp>

namespace autoware_ad_api::motion
namespace autoware::adapi_specs::motion
{

struct AcceptStart
Expand All @@ -38,6 +38,6 @@ struct State
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::motion
} // namespace autoware::adapi_specs::motion

#endif // AUTOWARE_AD_API_SPECS__MOTION_HPP_
#endif // AUTOWARE__ADAPI_SPECS__MOTION_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
#define AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
#define AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
#include <autoware_adapi_v1_msgs/srv/change_operation_mode.hpp>

namespace autoware_ad_api::operation_mode
namespace autoware::adapi_specs::operation_mode
{

struct ChangeToStop
Expand Down Expand Up @@ -68,6 +68,6 @@ struct OperationModeState
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::operation_mode
} // namespace autoware::adapi_specs::operation_mode

#endif // AUTOWARE_AD_API_SPECS__OPERATION_MODE_HPP_
#endif // AUTOWARE__ADAPI_SPECS__OPERATION_MODE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
#define AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
#define AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/dynamic_object_array.hpp>

namespace autoware_ad_api::perception
namespace autoware::adapi_specs::perception
{

struct DynamicObjectArray
Expand All @@ -31,6 +31,6 @@ struct DynamicObjectArray
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
};

} // namespace autoware_ad_api::perception
} // namespace autoware::adapi_specs::perception

#endif // AUTOWARE_AD_API_SPECS__PERCEPTION_HPP_
#endif // AUTOWARE__ADAPI_SPECS__PERCEPTION_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__PLANNING_HPP_
#define AUTOWARE_AD_API_SPECS__PLANNING_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
#define AUTOWARE__ADAPI_SPECS__PLANNING_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/steering_factor_array.hpp>
#include <autoware_adapi_v1_msgs/msg/velocity_factor_array.hpp>

namespace autoware_ad_api::planning
namespace autoware::adapi_specs::planning
{

struct VelocityFactors
Expand All @@ -41,6 +41,6 @@ struct SteeringFactors
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
};

} // namespace autoware_ad_api::planning
} // namespace autoware::adapi_specs::planning

#endif // AUTOWARE_AD_API_SPECS__PLANNING_HPP_
#endif // AUTOWARE__ADAPI_SPECS__PLANNING_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__ROUTING_HPP_
#define AUTOWARE_AD_API_SPECS__ROUTING_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
#define AUTOWARE__ADAPI_SPECS__ROUTING_HPP_

#include <rclcpp/qos.hpp>

Expand All @@ -23,7 +23,7 @@
#include <autoware_adapi_v1_msgs/srv/set_route.hpp>
#include <autoware_adapi_v1_msgs/srv/set_route_points.hpp>

namespace autoware_ad_api::routing
namespace autoware::adapi_specs::routing
{

struct SetRoutePoints
Expand Down Expand Up @@ -74,6 +74,6 @@ struct Route
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::routing
} // namespace autoware::adapi_specs::routing

#endif // AUTOWARE_AD_API_SPECS__ROUTING_HPP_
#endif // AUTOWARE__ADAPI_SPECS__ROUTING_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
#define AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
#define AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_

#include <rclcpp/qos.hpp>

#include <autoware_adapi_v1_msgs/msg/heartbeat.hpp>

namespace autoware_ad_api::system
namespace autoware::adapi_specs::system
{

struct Heartbeat
Expand All @@ -31,6 +31,6 @@ struct Heartbeat
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_VOLATILE;
};

} // namespace autoware_ad_api::system
} // namespace autoware::adapi_specs::system

#endif // AUTOWARE_AD_API_SPECS__SYSTEM_HPP_
#endif // AUTOWARE__ADAPI_SPECS__SYSTEM_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
#define AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
#ifndef AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
#define AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_

#include <rclcpp/qos.hpp>

Expand All @@ -24,7 +24,7 @@
#include <autoware_adapi_v1_msgs/srv/get_vehicle_dimensions.hpp>
#include <autoware_adapi_v1_msgs/srv/set_door_command.hpp>

namespace autoware_ad_api::vehicle
namespace autoware::adapi_specs::vehicle
{

struct VehicleKinematics
Expand Down Expand Up @@ -72,6 +72,6 @@ struct DoorStatus
static constexpr auto durability = RMW_QOS_POLICY_DURABILITY_TRANSIENT_LOCAL;
};

} // namespace autoware_ad_api::vehicle
} // namespace autoware::adapi_specs::vehicle

#endif // AUTOWARE_AD_API_SPECS__VEHICLE_HPP_
#endif // AUTOWARE__ADAPI_SPECS__VEHICLE_HPP_
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>autoware_ad_api_specs</name>
<name>autoware_adapi_specs</name>
<version>0.38.0</version>
<description>The autoware_ad_api_specs package</description>
<description>The autoware_adapi_specs package</description>
<maintainer email="[email protected]">Takagi, Isamu</maintainer>
<maintainer email="[email protected]">Ryohsuke Mitsudome</maintainer>
<license>Apache License 2.0</license>
Expand Down
2 changes: 1 addition & 1 deletion common/tier4_adapi_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_ad_api_specs</depend>
<depend>autoware_adapi_specs</depend>
<depend>autoware_component_interface_utils</depend>
<depend>autoware_vehicle_msgs</depend>
<depend>geometry_msgs</depend>
Expand Down
8 changes: 4 additions & 4 deletions common/tier4_adapi_rviz_plugin/src/door_panel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
#include <autoware/adapi_specs/vehicle.hpp>
#include <autoware/component_interface_utils/rclcpp.hpp>
#include <autoware_ad_api_specs/vehicle.hpp>
#include <rclcpp/rclcpp.hpp>
#include <rviz_common/panel.hpp>

Expand All @@ -31,9 +31,9 @@ namespace tier4_adapi_rviz_plugins
class DoorPanel : public rviz_common::Panel
{
Q_OBJECT
using DoorCommand = autoware_ad_api::vehicle::DoorCommand;
using DoorLayout = autoware_ad_api::vehicle::DoorLayout;
using DoorStatus = autoware_ad_api::vehicle::DoorStatus;
using DoorCommand = autoware::adapi_specs::vehicle::DoorCommand;
using DoorLayout = autoware::adapi_specs::vehicle::DoorLayout;
using DoorStatus = autoware::adapi_specs::vehicle::DoorStatus;

public:
explicit DoorPanel(QWidget * parent = nullptr);
Expand Down
8 changes: 4 additions & 4 deletions common/tier4_adapi_rviz_plugin/src/route_panel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <QGroupBox>
#include <QLabel>
#include <QPushButton>
#include <autoware/adapi_specs/routing.hpp>
#include <autoware/component_interface_utils/rclcpp.hpp>
#include <autoware_ad_api_specs/routing.hpp>
#include <rclcpp/rclcpp.hpp>
#include <rviz_common/panel.hpp>

Expand All @@ -35,9 +35,9 @@ namespace tier4_adapi_rviz_plugins
class RoutePanel : public rviz_common::Panel
{
Q_OBJECT
using ClearRoute = autoware_ad_api::routing::ClearRoute;
using SetRoutePoints = autoware_ad_api::routing::SetRoutePoints;
using ChangeRoutePoints = autoware_ad_api::routing::ChangeRoutePoints;
using ClearRoute = autoware::adapi_specs::routing::ClearRoute;
using SetRoutePoints = autoware::adapi_specs::routing::SetRoutePoints;
using ChangeRoutePoints = autoware::adapi_specs::routing::ChangeRoutePoints;
using PoseStamped = geometry_msgs::msg::PoseStamped;

public:
Expand Down
2 changes: 1 addition & 1 deletion common/tier4_camera_view_rviz_plugin/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_ad_api_specs</depend>
<depend>autoware_adapi_specs</depend>
<depend>autoware_component_interface_utils</depend>
<depend>geometry_msgs</depend>
<depend>libqt5-core</depend>
Expand Down
2 changes: 1 addition & 1 deletion system/autoware_default_adapi/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<depend>autoware_ad_api_specs</depend>
<depend>autoware_adapi_specs</depend>
<depend>autoware_adapi_v1_msgs</depend>
<depend>autoware_adapi_version_msgs</depend>
<depend>autoware_component_interface_specs</depend>
Expand Down
Loading
Loading