Revision f10ec142 examples/meka/src/mekajointinterface.cpp

View differences:

examples/meka/src/mekajointinterface.cpp
130 130

  
131 131
    trajectory_msgs::JointTrajectoryPoint p;
132 132
    p.positions.push_back(joint_target[ID_NECK_TILT] * M_PI / 180.0);
133
    p.positions.push_back(joint_target[ID_NECK_PAN] * M_PI / 180.0);
133
    //pan joint is inverted!
134
    p.positions.push_back(-joint_target[ID_NECK_PAN] * M_PI / 180.0);
134 135
    //printf("targets pan=%4.1f tilt=%4.1f (eye p %4.1f t %4.2f)\n",joint_target[ID_NECK_TILT],joint_target[ID_NECK_PAN],joint_target[ID_EYES_LEFT_LR],joint_target[ID_EYES_BOTH_UD]);
135 136

  
136 137
    p.time_from_start = ros::Duration(1.2 * 1.0 / humotion::server::Server::MOTION_UPDATERATE);
......
209 210
}
210 211

  
211 212
void MekaJointInterface::init_joints(){
212
    store_min_max(ID_NECK_TILT, -18, 1);
213
    store_min_max(ID_NECK_PAN, -56, 56);
213
    store_min_max(ID_NECK_TILT, -37, 1);
214
    store_min_max(ID_NECK_PAN, -70, 70);
214 215

  
215 216
    store_min_max(ID_NECK_ROLL, -1, 1);
216 217
    store_min_max(ID_EYES_BOTH_UD, -1, 1);

Also available in: Unified diff