Skip to content

Commit

Permalink
Uncrustify
Browse files Browse the repository at this point in the history
Signed-off-by: Juancams <[email protected]>
  • Loading branch information
Juancams committed Apr 25, 2024
1 parent 0a15d6a commit af7706c
Show file tree
Hide file tree
Showing 23 changed files with 34 additions and 29 deletions.
3 changes: 2 additions & 1 deletion bt_nodes/arm/include/arm/manipulation/move_to_predefined.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ namespace manipulation
{

class MoveToPredefined : public manipulation::BtActionNode<
manipulation_interfaces::action::MoveToPredefined, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
manipulation_interfaces::action::MoveToPredefined,
rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit MoveToPredefined(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/arm/include/arm/manipulation/pick_object.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace manipulation
{

class PickObject : public manipulation::BtActionNode<
manipulation_interfaces::action::Pick, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
manipulation_interfaces::action::Pick, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit PickObject(
Expand Down
3 changes: 2 additions & 1 deletion bt_nodes/arm/src/manipulation/move_to_predefined.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ MoveToPredefined::MoveToPredefined(
const std::string & xml_tag_name, const std::string & action_name,
const BT::NodeConfiguration & conf)
: manipulation::BtActionNode<
manipulation_interfaces::action::MoveToPredefined, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
manipulation_interfaces::action::MoveToPredefined,
rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf) {}

void MoveToPredefined::on_tick()
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/arm/src/manipulation/pick_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ PickObject::PickObject(
const std::string & xml_tag_name, const std::string & action_name,
const BT::NodeConfiguration & conf)
: manipulation::BtActionNode<
manipulation_interfaces::action::Pick, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
manipulation_interfaces::action::Pick, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf) {}

void PickObject::on_tick()
Expand Down
4 changes: 2 additions & 2 deletions bt_nodes/bt_test/src/ask_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
int main(int argc, char * argv[])
{
rclcpp::init(argc, argv);
auto node = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
auto node = std::make_shared<rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
"ask_test_node");
BT::BehaviorTreeFactory factory;
BT::SharedLibrary loader;
Expand Down Expand Up @@ -42,7 +42,7 @@ int main(int argc, char * argv[])
status = tree.rootNode()->executeTick();
finish = (status == BT::NodeStatus::SUCCESS) ||
(status == BT::NodeStatus::FAILURE);

rate.sleep();
}
std::cout << "Ask Test Finished with status: " << status << std::endl;
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/bt_test/src/look_at_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ int main(int argc, char * argv[])
bool finish = false;
while (!finish && rclcpp::ok()) {
rclcpp::spin_some(node->get_node_base_interface());

finish = tree.rootNode()->executeTick() != BT::NodeStatus::SUCCESS;

rate.sleep();
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/configuration/include/configuration/SetWp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class SetWp : public BT::ActionNodeBase
}

private:
std::shared_ptr<rclcpp_cascade_lifecycle::CascadeLifecycleNode> node_;
std::shared_ptr<rclcpp_cascade_lifecycle::CascadeLifecycleNode> node_;
std::vector<std::string> wp_names_;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class InitCarry : public BT::ActionNodeBase
}

private:
std::shared_ptr<rclcpp_cascade_lifecycle::CascadeLifecycleNode> node_;
std::shared_ptr<rclcpp_cascade_lifecycle::CascadeLifecycleNode> node_;
std::string cam_frame_, home_pose_, offer_pose_;
int person_id;
geometry_msgs::msg::PoseStamped home_position_;
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/include/hri/dialog/DialogConfirmation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace dialog

class DialogConfirmation
: public dialog::BtActionNode<
whisper_msgs::action::STT, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
whisper_msgs::action::STT, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit DialogConfirmation(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/include/hri/dialog/Listen.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace dialog
{

class Listen : public dialog::BtActionNode<
whisper_msgs::action::STT, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
whisper_msgs::action::STT, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit Listen(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/include/hri/dialog/Query.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace dialog

class Query
: public dialog::BtActionNode<
llama_msgs::action::GenerateResponse, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
llama_msgs::action::GenerateResponse, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit Query(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/include/hri/dialog/Speak.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace dialog
{

class Speak : public dialog::BtActionNode<
audio_common_msgs::action::TTS, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
audio_common_msgs::action::TTS, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit Speak(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/src/hri/dialog/Listen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Listen::Listen(
const std::string & xml_tag_name, const std::string & action_name,
const BT::NodeConfiguration & conf)
: dialog::BtActionNode<whisper_msgs::action::STT, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name,conf)
xml_tag_name, action_name, conf)
{
publisher_start_ = node_->create_publisher<std_msgs::msg::Int8>("dialog_action", 10);
}
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/hri/src/hri/dialog/Query.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Query::Query(
const std::string & xml_tag_name, const std::string & action_name,
const BT::NodeConfiguration & conf)
: dialog::BtActionNode<
llama_msgs::action::GenerateResponse, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
llama_msgs::action::GenerateResponse, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf)
{
publisher_start_ = node_->create_publisher<std_msgs::msg::Int8>("dialog_action", 10);
Expand Down
3 changes: 2 additions & 1 deletion bt_nodes/hri/src/hri/dialog/Speak.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ using namespace std::placeholders;
Speak::Speak(
const std::string & xml_tag_name, const std::string & action_name,
const BT::NodeConfiguration & conf)
: dialog::BtActionNode<audio_common_msgs::action::TTS, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
: dialog::BtActionNode<audio_common_msgs::action::TTS,
rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf)
{
config().blackboard->get("node", node_);
Expand Down
7 changes: 4 additions & 3 deletions bt_nodes/motion/include/ctrl_support/BTActionNode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ class BtActionNode : public BT::ActionNodeBase
};

send_goal_options.feedback_callback =
std::bind(&BtActionNode::feedback_callback, this,
std::bind(
&BtActionNode::feedback_callback, this,
std::placeholders::_1, std::placeholders::_2);

auto future_goal_handle = action_client_->async_send_goal(goal_, send_goal_options);
Expand All @@ -252,7 +253,7 @@ class BtActionNode : public BT::ActionNodeBase
throw std::runtime_error("Goal was rejected by the action server");
}
}

void feedback_callback(
typename rclcpp_action::ClientGoalHandle<ActionT>::SharedPtr,
const typename ActionT::Feedback::ConstSharedPtr feedback)
Expand All @@ -263,7 +264,7 @@ class BtActionNode : public BT::ActionNodeBase

virtual void on_feedback()
{

}

void increment_recovery_count()
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/motion/include/motion/head/LookAt.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ class LookAt : public BT::ActionNodeBase

} // namespace navigation

#endif // NAVIGATION__LOOK_AT_HPP_
#endif // NAVIGATION__LOOK_AT_HPP_
5 changes: 3 additions & 2 deletions bt_nodes/motion/include/motion/head/Pan.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace head
{

class Pan : public motion::BtActionNode<
control_msgs::action::FollowJointTrajectory, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
control_msgs::action::FollowJointTrajectory, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit Pan(
Expand All @@ -44,7 +44,7 @@ class Pan : public motion::BtActionNode<
BT::NodeStatus on_success() override;
BT::NodeStatus on_aborted() override;
BT::NodeStatus on_cancelled() override;


static BT::PortsList providedPorts()
{
Expand All @@ -53,6 +53,7 @@ class Pan : public motion::BtActionNode<
BT::InputPort<std::string>("tf_frame"),
});
}

private:
rclcpp::Node::SharedPtr node_;
BT::Optional<std::string> point_to_pan_;
Expand Down
3 changes: 2 additions & 1 deletion bt_nodes/motion/include/motion/navigation/MoveTo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ namespace navigation
{

class MoveTo
: public motion::BtActionNode<nav2_msgs::action::NavigateToPose, rclcpp_cascade_lifecycle::CascadeLifecycleNode>
: public motion::BtActionNode<nav2_msgs::action::NavigateToPose,
rclcpp_cascade_lifecycle::CascadeLifecycleNode>
{
public:
explicit MoveTo(
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/motion/src/motion/head/LookAt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ void LookAt::halt() {RCLCPP_INFO(node_->get_logger(), "LookAt halted");}

BT_REGISTER_NODES(factory) {
factory.registerNodeType<head::LookAt>("LookAt");
}
}
6 changes: 3 additions & 3 deletions bt_nodes/motion/src/motion/head/Pan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Pan::Pan(
const std::string & action_name,
const BT::NodeConfiguration & conf)
: motion::BtActionNode<
control_msgs::action::FollowJointTrajectory, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
control_msgs::action::FollowJointTrajectory, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf)
{
config().blackboard->get("node", node_);
Expand All @@ -53,7 +53,7 @@ Pan::on_tick()
// point.time_from_start = rclcpp::Duration::from_seconds(5.0);

// goal_.trajectory.points.push_back(point);

}
}

Expand All @@ -80,7 +80,7 @@ Pan::on_success()
BT_REGISTER_NODES(factory)
{
BT::NodeBuilder builder = [](const std::string & name,
const BT::NodeConfiguration & config) {
const BT::NodeConfiguration & config) {
return std::make_unique<head::Pan>(
name, "/head_controller/follow_joint_trajectory", config);
};
Expand Down
2 changes: 1 addition & 1 deletion bt_nodes/motion/src/motion/navigation/MoveTo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ MoveTo::MoveTo(
const std::string & action_name,
const BT::NodeConfiguration & conf)
: motion::BtActionNode<
nav2_msgs::action::NavigateToPose, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
nav2_msgs::action::NavigateToPose, rclcpp_cascade_lifecycle::CascadeLifecycleNode>(
xml_tag_name, action_name, conf),
tf_buffer_(),
tf_listener_(tf_buffer_)
Expand Down
1 change: 0 additions & 1 deletion bt_nodes/perception/src/perception/FollowPerson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "perception_system/PerceptionListener.hpp"



#include "behaviortree_cpp_v3/behavior_tree.h"


Expand Down

0 comments on commit af7706c

Please sign in to comment.