Revision ea29304b src/server/joint_interface.cpp

View differences:

src/server/joint_interface.cpp
80 80
    //following atomic instructions:
81 81
    mutex::scoped_lock scoped_lock(joint_ts_position_map_access_mutex);
82 82

  
83
    //printf("> humotion: incoming joint position for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,position,timestamp.to_seconds());
83
    printf("> humotion: incoming joint position for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,position,timestamp.to_seconds());
84 84
    joint_ts_position_map[joint_id].insert(timestamp, position);
85 85

  
86 86
    incoming_position_count++;
......
99 99
//! \param joint name
100 100
//! \param speed
101 101
//! \param timestamp when the position was measured
102
void JointInterface::store_incoming_speed(int joint_id, float speed, Timestamp timestamp){
102
void JointInterface::store_incoming_velocity(int joint_id, float velocity, Timestamp timestamp){
103 103
    //lock the tsd_list for this access. by doing this we assure
104 104
    //that no other thread accessing this element can diturb the
105 105
    //following atomic instructions:
106 106
    mutex::scoped_lock scoped_lock(joint_ts_speed_map_access_mutex);
107 107

  
108
    //printf("> humotion: incoming joint speed for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,speed,timestamp.to_seconds());
109
    joint_ts_speed_map[joint_id].insert(timestamp, speed);
108
    //printf("> humotion: incoming joint velocity for joint id 0x%02X = %4.2f (ts=%.2f)\n",joint_id,velocity,timestamp.to_seconds());
109
    joint_ts_speed_map[joint_id].insert(timestamp, velocity);
110 110
}
111 111

  
112 112
//! return the timestamped float for the given joints position

Also available in: Unified diff