Skip to content
Snippets Groups Projects
Commit a46c2a90 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[control_loop] Fix the gains for H1.

parent 13df4a58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 28 additions and 28 deletions
tools/control_loop.cc
+ 28
− 28
View file @ a46c2a90
...@@ -87,33 +87,33 @@ int main(int argc, char **argv) ...@@ -87,33 +87,33 @@ int main(int argc, char **argv)
}; };
gz_transport_hw_tools::RobotCtrlJointInfos h1_2_ctrl_joint_infos { gz_transport_hw_tools::RobotCtrlJointInfos h1_2_ctrl_joint_infos {
{ "left_shoulder_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_shoulder_pitch_joint", ControlJointValue( 10000.0, 0.01, 1.0, 14.0, 0.0, 0.0) },
{ "left_shoulder_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_shoulder_roll_joint", ControlJointValue( 10000.0, 0.01, 1.0, 14.0, 0.0, 0.0) },
{ "left_shoulder_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_shoulder_yaw_joint", ControlJointValue( 5000.0, 0.0, 1.0, 9.0, 0.0, 0.0) },
{ "left_elbow_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_elbow_joint", ControlJointValue( 5000.0, 0.0, 1.0, 9.0, 0.0, 0.0) },
{ "left_wrist_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_wrist_roll_joint", ControlJointValue( 500.0, 1.0, 0.1, 5.0, 0.0, 0.0) },
{ "left_wrist_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_wrist_pitch_joint", ControlJointValue( 500.0, 1.0, 0.1, 5.0, 0.0, 0.0) },
{ "left_wrist_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_wrist_yaw_joint", ControlJointValue( 500.0, 1.0, 0.1, 3.0, 0.0, 0.0) },
{ "right_shoulder_pitch_joint",ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_shoulder_pitch_joint",ControlJointValue(10000.0, 0.01, 1.0, 0.0, 0.0, 0.0) },
{ "right_shoulder_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_shoulder_roll_joint", ControlJointValue(10000.0, 0.01, 1.0, 0.0, 0.0, 0.0) },
{ "right_shoulder_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_shoulder_yaw_joint", ControlJointValue( 5000.0, 0.0, 1.0, 0.0, 0.0, 0.0) },
{ "right_elbow_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_elbow_joint", ControlJointValue( 5000.0, 0.0, 1.0, 0.0, 0.0, 0.0) },
{ "right_wrist_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_wrist_roll_joint", ControlJointValue( 500.0, 1.0, 0.1, 0.0, 0.0, 0.0) },
{ "right_wrist_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_wrist_pitch_joint", ControlJointValue( 500.0, 1.0, 0.1, 0.0, 0.0, 0.0) },
{ "right_wrist_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_wrist_yaw_joint", ControlJointValue( 500.0, 1.0, 0.1, 0.0, 0.0, 0.0) },
{ "left_hip_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_hip_yaw_joint", ControlJointValue( 5000.0, 20.0, 5.0, 7.0, 0.0, 0.0) },
{ "left_hip_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_hip_pitch_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "left_hip_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_hip_roll_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "left_knee_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_knee_joint", ControlJointValue( 5000.0, 20.0, 5.0, 25.0, 0.0, 0.0) },
{ "left_ankle_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_ankle_pitch_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "left_ankle_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "left_ankle_roll_joint", ControlJointValue( 5000.0, 20.0, 5.0, 9.0, 0.0, 0.0) },
{ "right_hip_yaw_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_hip_yaw_joint", ControlJointValue( 5000.0, 20.0, 5.0, 7.0, 0.0, 0.0) },
{ "right_hip_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_hip_pitch_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "right_hip_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_hip_roll_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "right_knee_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_knee_joint", ControlJointValue( 5000.0, 20.0, 5.0, 25.0, 0.0, 0.0) },
{ "right_ankle_pitch_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_ankle_pitch_joint", ControlJointValue( 5000.0, 20.0, 5.0, 14.0, 0.0, 0.0) },
{ "right_ankle_roll_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "right_ankle_roll_joint", ControlJointValue( 5000.0, 20.0, 5.0, 9.0, 0.0, 0.0) },
{ "torso_joint", ControlJointValue( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }, { "torso_joint", ControlJointValue(10000.0, 20.0, 1.0, 10.0, 0.0, 0.0) },
}; };
...@@ -134,7 +134,7 @@ int main(int argc, char **argv) ...@@ -134,7 +134,7 @@ int main(int argc, char **argv)
a_robot_ctrl_joint_infos = (choice==0) ? a_robot_ctrl_joint_infos = (choice==0) ?
h1_2_ctrl_joint_infos: talos_ctrl_joint_infos ; h1_2_ctrl_joint_infos: talos_ctrl_joint_infos ;
bool debug_level = false; bool debug_level = true;
gz_transport_hw_tools::PerceptionActionLoop a_pal(a_robot_ctrl_joint_infos, gz_transport_hw_tools::PerceptionActionLoop a_pal(a_robot_ctrl_joint_infos,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment