Skip to content

Commit 5a4ecff

Browse files
committed
Fixed timer issue: starting only if active and for enable msgs
1 parent 920e60f commit 5a4ecff

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ur_controllers/src/freedrive_mode_controller.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ controller_interface::return_type ur_controllers::FreedriveModeController::updat
181181
// teach pendant.
182182
if (!std::isnan(abort_command_interface_->get().get_value()) &&
183183
abort_command_interface_->get().get_value() == 1.0) {
184-
RCLCPP_INFO(get_node()->get_logger(), "Freedrive mode aborted by hardware, aborting action.");
184+
RCLCPP_INFO(get_node()->get_logger(), "Freedrive mode aborted by hardware, aborting request.");
185185
freedrive_active_ = false;
186186
return controller_interface::return_type::OK;
187187
} else {
@@ -231,7 +231,7 @@ void FreedriveModeController::readFreedriveModeCmd(const std_msgs::msg::Bool::Sh
231231
if((freedrive_active_) && (!change_requested_)){
232232
freedrive_active_ = false;
233233
change_requested_ = true;
234-
start_timer();
234+
//start_timer();
235235
}
236236
}
237237

@@ -257,7 +257,7 @@ void FreedriveModeController::start_timer()
257257

258258
void FreedriveModeController::timeout_callback()
259259
{
260-
if(timer_started_){
260+
if(timer_started_ && freedrive_active_){
261261
RCLCPP_INFO(get_node()->get_logger(), "Freedrive mode will be deactivated since client is not reachable.");
262262

263263
freedrive_active_ = false;

0 commit comments

Comments
 (0)