Skip to content

Commit

Permalink
Fixed check of external joints size
Browse files Browse the repository at this point in the history
  • Loading branch information
jontje committed Mar 13, 2020
1 parent 1ebaebf commit 726d4c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/egm_trajectory_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ wrapper::trajectory::ExecutionProgress_SubState EGMTrajectoryInterface::Trajecto
void EGMTrajectoryInterface::TrajectoryMotion::MotionStep::resetMotionStep()
{
unsigned int robot_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.external().joints().position().values_size();

internal_goal.Clear();
external_goal.Clear();
Expand Down Expand Up @@ -243,7 +243,7 @@ void EGMTrajectoryInterface::TrajectoryMotion::MotionStep::resetMotionStep()
void EGMTrajectoryInterface::TrajectoryMotion::MotionStep::prepareNormalGoal(const bool last_point)
{
unsigned int robot_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.external().joints().position().values_size();

data.mode = (external_goal.robot().has_cartesian() ? EGMPose : EGMJoint);

Expand Down Expand Up @@ -394,7 +394,7 @@ double EGMTrajectoryInterface::TrajectoryMotion::MotionStep::estimateDuration()
double estimate = 0.0;

unsigned int robot_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.robot().joints().position().values_size();
unsigned int external_joints = data.feedback.external().joints().position().values_size();

// Reset robot joint values.
reset(internal_goal.mutable_robot()->mutable_joints()->mutable_velocity(), robot_joints);
Expand Down

0 comments on commit 726d4c0

Please sign in to comment.