Skip to content

Commit 8c7a3f1

Browse files
committed
change argument order for state_publisher and command_forwarder
1 parent df287c4 commit 8c7a3f1

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

hardware_interface/include/hardware_interface/distributed_control_interface/command_forwarder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CommandForwarder final
2424
public:
2525
explicit CommandForwarder(
2626
std::unique_ptr<hardware_interface::LoanedCommandInterface> loaned_command_interface_ptr,
27-
std::chrono::milliseconds period_in_ms, const std::string & ns = "");
27+
const std::string & ns, std::chrono::milliseconds period_in_ms);
2828

2929
CommandForwarder() = delete;
3030

hardware_interface/include/hardware_interface/distributed_control_interface/state_publisher.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class StatePublisher final
2222
public:
2323
explicit StatePublisher(
2424
std::unique_ptr<hardware_interface::LoanedStateInterface> loaned_state_interface_ptr,
25-
std::chrono::milliseconds period_in_ms, const std::string & ns = "");
25+
const std::string & ns, std::chrono::milliseconds period_in_ms);
2626

2727
StatePublisher() = delete;
2828

@@ -49,7 +49,7 @@ class StatePublisher final
4949

5050
std::unique_ptr<hardware_interface::LoanedStateInterface> loaned_state_interface_ptr_;
5151
const std::string namespace_;
52-
std::chrono::milliseconds period_in_ms_;
52+
const std::chrono::milliseconds period_in_ms_;
5353

5454
const std::string topic_name_;
5555
std::shared_ptr<rclcpp_lifecycle::LifecycleNode> node_;

hardware_interface/src/hardware_interface/distributed_control_interface/command_forwarder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ namespace distributed_control
1313

1414
CommandForwarder::CommandForwarder(
1515
std::unique_ptr<hardware_interface::LoanedCommandInterface> loaned_command_interface_ptr,
16-
std::chrono::milliseconds period_in_ms, const std::string & ns)
16+
const std::string & ns, std::chrono::milliseconds period_in_ms)
1717
: loaned_command_interface_ptr_(std::move(loaned_command_interface_ptr)),
18-
period_in_ms_(period_in_ms),
1918
namespace_(ns),
19+
period_in_ms_(period_in_ms),
2020
topic_name_(loaned_command_interface_ptr_->get_underscore_separated_name() + "_command_state")
2121
{
2222
rclcpp::NodeOptions node_options;

hardware_interface/src/hardware_interface/distributed_control_interface/state_publisher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ namespace distributed_control
1313

1414
StatePublisher::StatePublisher(
1515
std::unique_ptr<hardware_interface::LoanedStateInterface> loaned_state_interface_ptr,
16-
std::chrono::milliseconds period_in_ms, const std::string & ns)
16+
const std::string & ns, std::chrono::milliseconds period_in_ms)
1717
: loaned_state_interface_ptr_(std::move(loaned_state_interface_ptr)),
18-
period_in_ms_(period_in_ms),
1918
namespace_(ns),
19+
period_in_ms_(period_in_ms),
2020
topic_name_(loaned_state_interface_ptr_->get_underscore_separated_name() + "_state")
2121
{
2222
rclcpp::NodeOptions node_options;

hardware_interface/src/resource_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ ResourceManager::create_hardware_state_publishers(
963963
auto state_publisher = std::make_shared<distributed_control::StatePublisher>(
964964
std::move(std::make_unique<hardware_interface::LoanedStateInterface>(
965965
claim_state_interface(state_interface))),
966-
update_period, ns);
966+
ns, update_period);
967967

968968
resource_storage_->add_state_publisher(state_publisher);
969969
state_publishers_vec.push_back(state_publisher);
@@ -985,7 +985,7 @@ ResourceManager::create_hardware_command_forwarders(
985985
auto command_forwarder = std::make_shared<distributed_control::CommandForwarder>(
986986
std::move(std::make_unique<hardware_interface::LoanedCommandInterface>(
987987
claim_command_interface(command_interface))),
988-
update_period, ns);
988+
ns, update_period);
989989

990990
resource_storage_->add_command_forwarder(command_forwarder);
991991
command_forwarders_vec.push_back(command_forwarder);

0 commit comments

Comments
 (0)