From 952620c0a8eff25df4bc182add7d37dad75c49ca Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 25 May 2023 12:28:08 +0200 Subject: [PATCH] fixes --- src/drone_controls/src/PositionChanger.cpp | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/drone_controls/src/PositionChanger.cpp b/src/drone_controls/src/PositionChanger.cpp index 4f9ab0d1..23ac7d5c 100644 --- a/src/drone_controls/src/PositionChanger.cpp +++ b/src/drone_controls/src/PositionChanger.cpp @@ -94,15 +94,15 @@ public: this->trajectory_request->yaw = this->current_yaw; auto trajectory_response = this->trajectory_client->async_send_request(this->trajectory_requeststd::bind(&PositionChanger::trajectory_message_callback, this, std::placeholders::_1)); - if (rclcpp::spin_until_future_complete(this, trajectory_response) == - rclcpp::FutureReturnCode::SUCCESS) - { - RCLCPP_INFO(this->get_logger(), "Trajectory set result: %d", trajectory_response.get()->success); - } - else - { - RCLCPP_ERROR(this->get_logger(), "Failed to call service to set trajectory"); - } + // if (rclcpp::spin_until_future_complete(this, trajectory_response) == + // rclcpp::FutureReturnCode::SUCCESS) + // { + // RCLCPP_INFO(this->get_logger(), "Trajectory set result: %d", trajectory_response.get()->success); + // } + // else + // { + // RCLCPP_ERROR(this->get_logger(), "Failed to call service to set trajectory"); + // } } /** @@ -215,10 +215,10 @@ private: float lidar_sensor_values[4]; // last distance measured by the lidar sensors float lidar_imu_readings[4]; // last imu readings from the lidar sensors - float currrent_yaw = 0; // in radians - float current_x_speed = 0; - float current_y_speed = 0; - float current_z_speed = 0; + float current_yaw = 0; // in radians + float current_speed_x = 0; + float current_speed_y = 0; + float current_speed_z = 0; bool move_direction_allowed[4] = {true}; float collision_prevention_weights[4] = {0}; @@ -230,13 +230,13 @@ private: if (!rclcpp::ok()) { RCLCPP_ERROR(this->get_logger(), "Interrupted while waiting for the service. Exiting."); - return 0; + return; } RCLCPP_INFO(this->get_logger(), "service not available, waiting again..."); } } }; -; + int main(int argc, char *argv[]) { rclcpp::init(argc, argv);