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

Fix name for accelerometer and gyrometer + Add fields for proper mapping in config file.

parent cc57de80
No related branches found
No related tags found
No related merge requests found
......@@ -541,10 +541,10 @@ namespace talos_sot_controller
std::string orientation_s("orientation_");
setSensorsImu(orientation_s, idIMU, DataOneIter_.orientation);
std::string gyrometer_s("gyrometer_");
std::string gyrometer_s("gyrometer_0");
setSensorsImu(gyrometer_s, idIMU, DataOneIter_.gyrometer);
std::string accelerometer_s("accelerometer_");
std::string accelerometer_s("accelerometer_0");
setSensorsImu(accelerometer_s, idIMU, DataOneIter_.accelerometer);
}
}
......@@ -552,7 +552,6 @@ namespace talos_sot_controller
void RCSotController::
fillForceSensors()
{
for(unsigned int idFS=0;idFS<ft_sensors_.size();
idFS++)
{
......
......@@ -8,6 +8,6 @@ sot_controller:
arm_right_1_joint, arm_right_2_joint, arm_right_3_joint, arm_right_4_joint, arm_right_5_joint, arm_right_6_joint, arm_right_7_joint, gripper_right_joint,
head_1_joint, head_2_joint ]
map_rc_to_sot_device: { motor-angles: motor-angles ,
joint-angles: joint-angles, velocities: velocities,
joint-angles: joint-angles, velocities: velocities, forces: forces, currents: currents,
torques: torques, cmd-joints: control, cmd-effort: control }
control_mode: EFFORT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment