Revision 1efa78e9

View differences:

examples/yarp_icub/src/icub_jointinterface.cpp
136 136

  
137 137

  
138 138
void iCubJointInterface::run(){
139
    iCubDataReceiver *data_receiver = new iCubDataReceiver(1000.0 / MAIN_LOOP_FREQUENCY, iencs, this);
139
    iCubDataReceiver *data_receiver = new iCubDataReceiver(0.5 * 1000.0 / MAIN_LOOP_FREQUENCY, iencs, this);
140 140
    data_receiver->start();
141 141
}
142 142

  
src/server/reflexxes_motion_generator.cpp
64 64
    reflexxes_position_input->MaxAccelerationVector->VecData[dof] = max_accel;
65 65
    reflexxes_position_input->TargetVelocityVector->VecData[dof]  = 0.0; //target speed is zero (really?)
66 66
    // feed back current pos & velocity
67
    reflexxes_position_input->CurrentPositionVector->VecData[dof]  = current_position;
68
    reflexxes_position_input->CurrentVelocityVector->VecData[dof]  = current_speed;
67
    //reflexxes_position_input->CurrentPositionVector->VecData[dof]  = current_position;
68
    //reflexxes_position_input->CurrentVelocityVector->VecData[dof]  = current_speed;
69 69

  
70 70
    // safety: libreflexxes does not like zero accellerations...
71 71
    if (reflexxes_position_input->MaxAccelerationVector->VecData[dof] == 0.0){
......
89 89

  
90 90
    //feed back values:
91 91
    for(int i=0; i<dof_count; i++){
92
        //reflexxes_position_input->CurrentPositionVector->VecData[i]     = reflexxes_position_output->NewPositionVector->VecData[i];
93
        //reflexxes_position_input->CurrentVelocityVector->VecData[i]     = reflexxes_position_output->NewVelocityVector->VecData[i];
94
        //reflexxes_position_input->CurrentAccelerationVector->VecData[i] = reflexxes_position_output->NewAccelerationVector->VecData[i];
92
        reflexxes_position_input->CurrentPositionVector->VecData[i]     = reflexxes_position_output->NewPositionVector->VecData[i];
93
        reflexxes_position_input->CurrentVelocityVector->VecData[i]     = reflexxes_position_output->NewVelocityVector->VecData[i];
94
        reflexxes_position_input->CurrentAccelerationVector->VecData[i] = reflexxes_position_output->NewAccelerationVector->VecData[i];
95 95
    }
96 96
}

Also available in: Unified diff