Skip to content

Commit 279942d

Browse files
committed
update gimbal_position_controller to mit velocity mode
1 parent 3c2f076 commit 279942d

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

decomposition/meta_gimbal_controller/include/gimbal_controller/gimbal_position_controller.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ class GimbalPositionController : public controller_interface::ChainableControlle
7474
input_feedback_;
7575

7676
std::shared_ptr<control_toolbox::PidROS> yaw_pos2vel_pid_;
77-
std::shared_ptr<control_toolbox::PidROS> pitch_pos2vel_pid_;
78-
std::shared_ptr<control_toolbox::PidROS> yaw_vel2eff_pid_;
79-
std::shared_ptr<control_toolbox::PidROS> pitch_vel2eff_pid_;
8077

8178
using ControllerStatePublisher =
8279
realtime_tools::RealtimePublisher<ControllerStateMsg>;

decomposition/meta_gimbal_controller/src/gimbal_position_controller.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ GimbalPositionController::update_and_write_commands(const rclcpp::Time &time,
258258
// for cybergear negative up, for imu negative up, for reference it should be negative up too
259259
pitch_pos_ref = -reference_interfaces_[1];
260260
pitch_pos_err = angles::shortest_angular_distance(pitch_pos_fb, pitch_pos_ref);
261+
command_interfaces_[3].set_value(pitch_enc_pos + pitch_pos_err);
261262
}
262263
}
263264
// Publish state

decomposition/metav_description/urdf/hero/hero.xacro

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,12 @@
5454
<param name="master_id">48</param> <!-- 0x30-->
5555
</hardware>
5656
<joint name="yaw_gimbal_joint">
57-
<command_interface name="position" />
57+
<command_interface name="position"/>
58+
<command_interface name="velocity">
59+
<param name="min">-0.1</param>
60+
<param name="max">0.1</param>
61+
</command_interface>
62+
<command_interface name="effort"/>
5863
<state_interface name="position" />
5964
<state_interface name="velocity" />
6065
<state_interface name="effort" />
@@ -66,7 +71,7 @@
6671
<param name="max_effort">12.0</param>
6772
<param name="offset">0.0</param>
6873
<param name="control_mode">mit</param>
69-
<param name="Kp">5.0</param>
74+
<param name="Kp">0.0</param>
7075
<param name="Kd">0.5</param>
7176
</joint>
7277
</ros2_control>

meta_bringup/config/hero.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ gimbal_position_controller:
8383
name: pitch_gimbal_joint
8484

8585
imu_topic: /imu
86+
gains:
87+
yaw_gimbal_joint_pos2vel:
88+
{ p: 7.0, i: 0.0, d: 0.1, i_clamp_max: 1.0, i_clamp_min: -1.0, antiwindup: true }
8689

8790

8891
shoot_controller:

0 commit comments

Comments
 (0)