Revision a682d53f

View differences:

examples/yarp_icub/src/icub_data_receiver.cpp
45 45 
    //iencs->getEncoderSpeeds(velocities.data());
46 46 

  		




  47
  47
  
    
    //publish data to humotion


  		




  48
  
  
    
<<<<<<< HEAD


  		




  49
  48
  
    
    for(int i=0; i<yarp_positions_.size(); i++){


  		




  50
  49
  
    
        store_incoming_position(i, yarp_positions_[i], yarp_timestamps_[i]);


  		




  51
  
  
    
=======


  		




  52
  
  
    
    printf("\nMMM");


  		




  53
  
  
    
    for(int i=0; i<positions.size(); i++){


  		




  54
  
  
    
        icub_jointinterface->fetch_position(i, positions[i], timestamps[i]);


  		




  55
  
  
    
        icub_jointinterface->fetch_speed(i, velocities[i], timestamps[i]);


  		




  56
  
  
    
        if (i==iCubJointInterface::ICUB_ID_NECK_PAN){


  		




  57
  
  
    
            //printf("\nMMM p=%f v=%f\n",positions[i],velocities[i]);


  		




  58
  
  
    
        }


  		




  59
  
  
    
        printf("%d=%f  ", i,velocities[i]);


  		




  60
  
  
    
>>>>>>> 4dbb1a71a9f74efde2a2e93244963b873ce7af16


  		




  61
  50
  
    
    }


  		




  62
  51
  
    
    


  		




  63
  52
  
    
    printf("\n");


  		












Also available in:  Unified diff