Skip to content

Commit 6d2012b

Browse files
committed
Rolling update
Signed-off-by: Francisco Martín Rico <[email protected]>
2 parents 924b399 + f4a7d4f commit 6d2012b

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

plansys2_bt_example/src/assemble_controller_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "plansys2_pddl_parser/Utils.hpp"
16-
1715
#include <memory>
1816

17+
#include "plansys2_pddl_parser/Utils.hpp"
18+
1919
#include "plansys2_msgs/msg/action_execution_info.hpp"
2020
#include "plansys2_msgs/msg/plan.hpp"
2121

plansys2_patrol_navigation_example/src/patrolling_controller_node.cpp

+18-14
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "plansys2_pddl_parser/Utils.hpp"
16-
1715
#include <memory>
1816

17+
#include "plansys2_pddl_parser/Utils.hpp"
18+
1919
#include "plansys2_msgs/msg/action_execution_info.hpp"
2020
#include "plansys2_msgs/msg/plan.hpp"
2121

@@ -119,12 +119,12 @@ class PatrollingController : public rclcpp::Node
119119
if (action_feedback.status == plansys2_msgs::msg::ActionExecutionInfo::FAILED) {
120120
RCLCPP_ERROR_STREAM(
121121
get_logger(), "[" << action_feedback.action <<
122-
"] finished with error: " << action_feedback.message_status);
122+
"] finished with error: " << action_feedback.message_status);
123123
}
124124
}
125125
break;
126126
}
127-
127+
128128
// Compute the plan
129129
auto domain = domain_expert_->getDomain();
130130
auto problem = problem_expert_->getProblem();
@@ -137,7 +137,8 @@ class PatrollingController : public rclcpp::Node
137137
}
138138

139139
// Execute the plan
140-
if (executor_client_->getResult().value().result == plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
140+
if (executor_client_->getResult().value().result ==
141+
plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
141142
executor_client_->start_plan_execution(plan.value()))
142143
{
143144
state_ = PATROL_WP2;
@@ -176,12 +177,12 @@ class PatrollingController : public rclcpp::Node
176177
if (action_feedback.status == plansys2_msgs::msg::ActionExecutionInfo::FAILED) {
177178
RCLCPP_ERROR_STREAM(
178179
get_logger(), "[" << action_feedback.action <<
179-
"] finished with error: " << action_feedback.message_status);
180+
"] finished with error: " << action_feedback.message_status);
180181
}
181182
}
182183
break;
183184
}
184-
185+
185186
// Compute the plan
186187
auto domain = domain_expert_->getDomain();
187188
auto problem = problem_expert_->getProblem();
@@ -194,7 +195,8 @@ class PatrollingController : public rclcpp::Node
194195
}
195196

196197
// Execute the plan
197-
if (executor_client_->getResult().value().result == plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
198+
if (executor_client_->getResult().value().result ==
199+
plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
198200
executor_client_->start_plan_execution(plan.value()))
199201
{
200202
state_ = PATROL_WP2;
@@ -233,12 +235,12 @@ class PatrollingController : public rclcpp::Node
233235
if (action_feedback.status == plansys2_msgs::msg::ActionExecutionInfo::FAILED) {
234236
RCLCPP_ERROR_STREAM(
235237
get_logger(), "[" << action_feedback.action <<
236-
"] finished with error: " << action_feedback.message_status);
238+
"] finished with error: " << action_feedback.message_status);
237239
}
238240
}
239241
break;
240242
}
241-
243+
242244
// Compute the plan
243245
auto domain = domain_expert_->getDomain();
244246
auto problem = problem_expert_->getProblem();
@@ -251,7 +253,8 @@ class PatrollingController : public rclcpp::Node
251253
}
252254

253255
// Execute the plan
254-
if (executor_client_->getResult().value().result == plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
256+
if (executor_client_->getResult().value().result ==
257+
plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
255258
executor_client_->start_plan_execution(plan.value()))
256259
{
257260
state_ = PATROL_WP2;
@@ -290,12 +293,12 @@ class PatrollingController : public rclcpp::Node
290293
if (action_feedback.status == plansys2_msgs::msg::ActionExecutionInfo::FAILED) {
291294
RCLCPP_ERROR_STREAM(
292295
get_logger(), "[" << action_feedback.action <<
293-
"] finished with error: " << action_feedback.message_status);
296+
"] finished with error: " << action_feedback.message_status);
294297
}
295298
}
296299
break;
297300
}
298-
301+
299302
// Compute the plan
300303
auto domain = domain_expert_->getDomain();
301304
auto problem = problem_expert_->getProblem();
@@ -308,7 +311,8 @@ class PatrollingController : public rclcpp::Node
308311
}
309312

310313
// Execute the plan
311-
if (executor_client_->getResult().value().result == plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
314+
if (executor_client_->getResult().value().result ==
315+
plansys2_msgs::action::ExecutePlan::Result::SUCCESS &&
312316
executor_client_->start_plan_execution(plan.value()))
313317
{
314318
state_ = PATROL_WP2;

0 commit comments

Comments
 (0)