diff --git a/hardware_interface/include/hardware_interface/actuator_interface.hpp b/hardware_interface/include/hardware_interface/actuator_interface.hpp index 1f96744f7d..6f4dfa4402 100644 --- a/hardware_interface/include/hardware_interface/actuator_interface.hpp +++ b/hardware_interface/include/hardware_interface/actuator_interface.hpp @@ -26,8 +26,8 @@ #include "hardware_interface/handle.hpp" #include "hardware_interface/hardware_info.hpp" #include "hardware_interface/types/hardware_interface_return_values.hpp" -#include "hardware_interface/types/hardware_interface_trigger_type.hpp" #include "hardware_interface/types/lifecycle_state_names.hpp" +#include "hardware_interface/types/trigger_type.hpp" #include "lifecycle_msgs/msg/state.hpp" #include "rclcpp/duration.hpp" #include "rclcpp/logger.hpp" diff --git a/hardware_interface/include/hardware_interface/system_interface.hpp b/hardware_interface/include/hardware_interface/system_interface.hpp index a8c34e5a06..e145deae5b 100644 --- a/hardware_interface/include/hardware_interface/system_interface.hpp +++ b/hardware_interface/include/hardware_interface/system_interface.hpp @@ -26,9 +26,9 @@ #include "hardware_interface/handle.hpp" #include "hardware_interface/hardware_info.hpp" #include "hardware_interface/types/hardware_interface_return_values.hpp" -#include "hardware_interface/types/hardware_interface_trigger_type.hpp" #include "hardware_interface/types/hardware_interface_type_values.hpp" #include "hardware_interface/types/lifecycle_state_names.hpp" +#include "hardware_interface/types/trigger_type.hpp" #include "lifecycle_msgs/msg/state.hpp" #include "rclcpp/duration.hpp" #include "rclcpp/logger.hpp" diff --git a/hardware_interface/include/hardware_interface/types/hardware_interface_trigger_type.hpp b/hardware_interface/include/hardware_interface/types/trigger_type.hpp similarity index 70% rename from hardware_interface/include/hardware_interface/types/hardware_interface_trigger_type.hpp rename to hardware_interface/include/hardware_interface/types/trigger_type.hpp index c4a9684c74..63970bc0f0 100644 --- a/hardware_interface/include/hardware_interface/types/hardware_interface_trigger_type.hpp +++ b/hardware_interface/include/hardware_interface/types/trigger_type.hpp @@ -1,4 +1,4 @@ -// Copyright 2017 Open Source Robotics Foundation, Inc. +// Copyright 2024 ros2_control Development Team // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef HARDWARE_INTERFACE__TYPES__HARDWARE_INTERFACE_TRIGGER_TYPE_HPP_ -#define HARDWARE_INTERFACE__TYPES__HARDWARE_INTERFACE_TRIGGER_TYPE_HPP_ +#ifndef HARDWARE_INTERFACE__TYPES__TRIGGER_TYPE_HPP_ +#define HARDWARE_INTERFACE__TYPES__TRIGGER_TYPE_HPP_ namespace hardware_interface { @@ -25,4 +25,4 @@ enum class TriggerType } // namespace hardware_interface -#endif // HARDWARE_INTERFACE__TYPES__HARDWARE_INTERFACE_TRIGGER_TYPE_HPP_ +#endif // HARDWARE_INTERFACE__TYPES__TRIGGER_TYPE_HPP_