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(controllers): remove duplicate function #140

Merged
merged 2 commits into from
Sep 18, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Release Versions:
- feat(components): use component description schema 1-1-1 to mark lifecycle property (#136)
- refactor(controllers): split up base class (#135)
- release: use updated base image (#139)
- fix(controllers): remove duplicate function (#140)

## 4.2.2

Expand Down
4 changes: 2 additions & 2 deletions aica-package.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#syntax=ghcr.io/aica-technology/package-builder:v1.1.0-rc0006

[metadata]
version = "5.0.0-rc0007"
version = "5.0.0-rc0008"
description = "Modular ROS 2 extension library for dynamic composition of components and controllers with the AICA robotics framework"

[metadata.collection]
name = "modulo"

[build]
type = "ros"
image = "v2.0.0-rc4-jazzy"
image = "v2.0.0-jazzy"

[build.dependencies]
"@aica/foss/control-libraries" = "v9.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,6 @@ class BaseControllerInterface : public controller_interface::ControllerInterface
*/
void set_qos(const rclcpp::QoS& qos);

/**
* @brief Get the current lifecycle state of the controller
*/
rclcpp_lifecycle::State get_lifecycle_state() const;

/**
* @brief Check if the controller is currently in state active or not.
* @return True if the controller is active, false otherwise
Expand Down
4 changes: 0 additions & 4 deletions source/modulo_controllers/src/BaseControllerInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,6 @@ void BaseControllerInterface::set_qos(const rclcpp::QoS& qos) {
qos_ = qos;
}

rclcpp_lifecycle::State BaseControllerInterface::get_lifecycle_state() const {
return get_node()->get_current_state();
}

bool BaseControllerInterface::is_active() const {
return get_lifecycle_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE;
}
Expand Down
Loading