Skip to content

Commit bb8bdc5

Browse files
committed
Clean up for PR
Signed-off-by: AdamPettinger <adam.l.pettinger@gmail.com>
1 parent aa29e79 commit bb8bdc5

File tree

2 files changed

+6
-560
lines changed

2 files changed

+6
-560
lines changed

ur_controllers/include/ur_controllers/gravity_update_controller.hpp

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,10 @@
4343
#include <unordered_map>
4444
#include <vector>
4545

46-
// #include "std_srvs/srv/trigger.hpp"
47-
4846
#include "controller_interface/controller_interface.hpp"
49-
// #include "ur_msgs/msg/io_states.hpp"
50-
// #include "ur_msgs/msg/tool_data_msg.hpp"
51-
// #include "ur_dashboard_msgs/msg/robot_mode.hpp"
52-
// #include "ur_dashboard_msgs/msg/safety_mode.hpp"
5347
#include "ur_msgs/srv/set_gravity.hpp"
54-
// #include "ur_msgs/srv/set_io.hpp"
55-
// #include "ur_msgs/srv/set_analog_output.hpp"
56-
// #include "ur_msgs/srv/set_speed_slider_fraction.hpp"
57-
// #include "ur_msgs/srv/set_payload.hpp"
5848
#include "rclcpp/time.hpp"
5949
#include "rclcpp/duration.hpp"
60-
// #include "std_msgs/msg/bool.hpp"
6150
#include "tf2/LinearMath/Quaternion.hpp"
6251
#include "tf2_geometry_msgs/tf2_geometry_msgs.hpp"
6352
#include "tf2_ros/buffer.hpp"
@@ -97,69 +86,11 @@ class GravityUpdateController : public controller_interface::ControllerInterface
9786
CallbackReturn on_init() override;
9887

9988
private:
100-
// bool setIO(ur_msgs::srv::SetIO::Request::SharedPtr req, ur_msgs::srv::SetIO::Response::SharedPtr resp);
101-
102-
// bool setAnalogOutput(ur_msgs::srv::SetAnalogOutput::Request::SharedPtr req,
103-
// ur_msgs::srv::SetAnalogOutput::Response::SharedPtr resp);
104-
105-
// bool setSpeedSlider(ur_msgs::srv::SetSpeedSliderFraction::Request::SharedPtr req,
106-
// ur_msgs::srv::SetSpeedSliderFraction::Response::SharedPtr resp);
107-
108-
// bool resendRobotProgram(std_srvs::srv::Trigger::Request::SharedPtr req,
109-
// std_srvs::srv::Trigger::Response::SharedPtr resp);
110-
111-
// bool handBackControl(std_srvs::srv::Trigger::Request::SharedPtr req,
112-
// std_srvs::srv::Trigger::Response::SharedPtr resp);
113-
114-
// bool setPayload(const ur_msgs::srv::SetPayload::Request::SharedPtr req,
115-
// ur_msgs::srv::SetPayload::Response::SharedPtr resp);
116-
11789
bool setGravity(const ur_msgs::srv::SetGravity::Request::SharedPtr req,
11890
ur_msgs::srv::SetGravity::Response::SharedPtr resp);
11991

120-
// bool zeroFTSensor(std_srvs::srv::Trigger::Request::SharedPtr req, std_srvs::srv::Trigger::Response::SharedPtr resp);
121-
122-
// void publishIO();
123-
124-
// void publishToolData();
125-
126-
// void publishRobotMode();
127-
128-
// void publishSafetyMode();
129-
130-
// void publishProgramRunning();
131-
13292
protected:
133-
// void initMsgs();
134-
135-
// bool first_pass_;
136-
137-
// internal commands
138-
// std::array<double, 18> standard_digital_output_cmd_;
139-
// std::array<double, 18> standard_analog_output_cmd_;
140-
// double target_speed_fraction_cmd_;
141-
142-
// services
143-
// rclcpp::Service<std_srvs::srv::Trigger>::SharedPtr resend_robot_program_srv_;
144-
// rclcpp::Service<std_srvs::srv::Trigger>::SharedPtr hand_back_control_srv_;
145-
// rclcpp::Service<ur_msgs::srv::SetSpeedSliderFraction>::SharedPtr set_speed_slider_srv_;
146-
// rclcpp::Service<ur_msgs::srv::SetIO>::SharedPtr set_io_srv_;
147-
// rclcpp::Service<ur_msgs::srv::SetAnalogOutput>::SharedPtr set_analog_output_srv_;
148-
// rclcpp::Service<ur_msgs::srv::SetPayload>::SharedPtr set_payload_srv_;
14993
rclcpp::Service<ur_msgs::srv::SetGravity>::SharedPtr set_gravity_srv_;
150-
// rclcpp::Service<std_srvs::srv::Trigger>::SharedPtr tare_sensor_srv_;
151-
152-
// std::shared_ptr<rclcpp::Publisher<ur_msgs::msg::IOStates>> io_pub_;
153-
// std::shared_ptr<rclcpp::Publisher<ur_msgs::msg::ToolDataMsg>> tool_data_pub_;
154-
// std::shared_ptr<rclcpp::Publisher<ur_dashboard_msgs::msg::RobotMode>> robot_mode_pub_;
155-
// std::shared_ptr<rclcpp::Publisher<ur_dashboard_msgs::msg::SafetyMode>> safety_mode_pub_;
156-
// std::shared_ptr<rclcpp::Publisher<std_msgs::msg::Bool>> program_state_pub_;
157-
158-
// ur_msgs::msg::IOStates io_msg_;
159-
// ur_msgs::msg::ToolDataMsg tool_data_msg_;
160-
// ur_dashboard_msgs::msg::RobotMode robot_mode_msg_;
161-
// ur_dashboard_msgs::msg::SafetyMode safety_mode_msg_;
162-
// std_msgs::msg::Bool program_running_msg_;
16394

16495
std::shared_ptr<tf2_ros::Buffer> tf_buffer_;
16596
std::shared_ptr<tf2_ros::TransformListener> tf_listener_;
@@ -169,9 +100,6 @@ class GravityUpdateController : public controller_interface::ControllerInterface
169100
gravity_update_controller::Params params_;
170101

171102
static constexpr double ASYNC_WAITING = 2.0;
172-
// TODO(anyone) publishers to add: tcp_pose_pub_
173-
// TODO(anyone) subscribers to add: script_command_sub_
174-
// TODO(anyone) service servers to add: resend_robot_program_srv_, deactivate_srv_, set_payload_srv_, tare_sensor_srv_
175103

176104
/**
177105
* @brief wait until a command interface isn't in state ASYNC_WAITING anymore or until the parameter maximum_retries

0 commit comments

Comments
 (0)