Revision 32327f15 src/server/joint_interface.cpp

View differences:

src/server/joint_interface.cpp
66 66 
//! \param joint name
67 67 
//! \param position
68 68 
//! \param timestamp when the position was measured
69 
void JointInterface::store_incoming_position(int joint_id, float position, double timestamp){
69 
void JointInterface::store_incoming_position(int joint_id, float position, Timestamp timestamp){
70 70 
    //lock the tsd_list for this access. by doing this we assure
71 71 
    //that no other thread accessing this element can diturb the
72 72 
    //following atomic instructions:
73 73 
    mutex::scoped_lock scoped_lock(joint_ts_position_map_access_mutex);
74 74 

  		




  75
  
  
    
    //printf("> humotion: incoming joint position for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,position,timestamp);


  		




  
  75
  
    
    //printf("> humotion: incoming joint position for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,position,timestamp.to_seconds());


  		




  76
  76
  
    
    joint_ts_position_map[joint_id].insert(timestamp, position);


  		




  77
  77
  
    

  		




  78
  78
  
    
    incoming_position_count++;


  		




  ......




  91
  91
  
    
//! \param joint name


  		




  92
  92
  
    
//! \param speed


  		




  93
  93
  
    
//! \param timestamp when the position was measured


  		




  94
  
  
    
void JointInterface::store_incoming_speed(int joint_id, float speed, double timestamp){


  		




  
  94
  
    
void JointInterface::store_incoming_speed(int joint_id, float speed, Timestamp timestamp){


  		




  95
  95
  
    
    //lock the tsd_list for this access. by doing this we assure


  		




  96
  96
  
    
    //that no other thread accessing this element can diturb the


  		




  97
  97
  
    
    //following atomic instructions:


  		




  98
  98
  
    
    mutex::scoped_lock scoped_lock(joint_ts_speed_map_access_mutex);


  		




  99
  99
  
    

  		




  100
  
  
    
    //printf("> humotion: incoming joint speed for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,speed,timestamp);


  		




  
  100
  
    
    //printf("> humotion: incoming joint speed for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,speed,timestamp.to_seconds());


  		




  101
  101
  
    
    joint_ts_speed_map[joint_id].insert(timestamp, speed);


  		




  102
  102
  
    
}


  		




  103
  103
  
    

  		












Also available in:  Unified diff