From: Brian G. <ge...@us...> - 2006-11-27 16:02:22
|
Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31614/client_libs/libplayerc++ Modified Files: imuproxy.cc playerc++.h Log Message: applied patch 1603459 Index: playerc++.h =================================================================== RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** playerc++.h 21 Nov 2006 02:12:34 -0000 1.76 --- playerc++.h 28 Nov 2006 00:02:20 -0000 1.77 *************** *** 971,974 **** --- 971,984 ---- player_pose3d_t GetPose() const { return GetVar(mDevice->pose); }; /// get the raw values + float GetXAccel(); + float GetYAccel(); + float GetZAccel(); + float GetXGyro(); + float GetYGyro(); + float GetZGyro(); + float GetXMagn(); + float GetYMagn(); + float GetZMagn(); + player_imu_data_calib_t GetRawValues() const { return GetVar(mDevice->calib_data); }; Index: imuproxy.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc++/imuproxy.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** imuproxy.cc 19 Oct 2006 13:39:13 -0000 1.1 --- imuproxy.cc 28 Nov 2006 00:02:20 -0000 1.2 *************** *** 66,69 **** --- 66,123 ---- } + float ImuProxy::GetXAccel() + { + player_imu_data_calib_t data = GetRawValues(); + return data.accel_x; + } + + float ImuProxy::GetYAccel() + { + player_imu_data_calib_t data = GetRawValues(); + return data.accel_y; + } + + float ImuProxy::GetZAccel() + { + player_imu_data_calib_t data = GetRawValues(); + return data.accel_z; + } + + float ImuProxy::GetXGyro() + { + player_imu_data_calib_t data = GetRawValues(); + return data.gyro_x; + } + + float ImuProxy::GetYGyro() + { + player_imu_data_calib_t data = GetRawValues(); + return data.gyro_y; + } + + float ImuProxy::GetZGyro() + { + player_imu_data_calib_t data = GetRawValues(); + return data.gyro_z; + } + + float ImuProxy::GetXMagn() + { + player_imu_data_calib_t data = GetRawValues(); + return data.magn_x; + } + + float ImuProxy::GetYMagn() + { + player_imu_data_calib_t data = GetRawValues(); + return data.magn_y; + } + + float ImuProxy::GetZMagn() + { + player_imu_data_calib_t data = GetRawValues(); + return data.magn_z; + } + std::ostream& std::operator << (std::ostream &os, const PlayerCc::ImuProxy &c) |