From: Brian G. <ge...@us...> - 2007-08-23 12:59:21
|
Update of /cvsroot/playerstage/code/player/server/drivers/imu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/imu Modified Files: XSensMT.cc nimuplayer.cpp Log Message: applied Toby's autopointer patches Index: XSensMT.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/imu/XSensMT.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XSensMT.cc 18 Sep 2006 12:51:32 -0000 1.3 --- XSensMT.cc 23 Aug 2007 19:58:43 -0000 1.4 *************** *** 106,110 **** // This method will be invoked on each incoming message ! virtual int ProcessMessage (MessageQueue* resp_queue, player_msghdr * hdr, void * data); --- 106,110 ---- // This method will be invoked on each incoming message ! virtual int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void * data); *************** *** 274,278 **** //////////////////////////////////////////////////////////////////////////////// // ProcessMessage function ! int XSensMT::ProcessMessage (MessageQueue* resp_queue, player_msghdr * hdr, void * data) --- 274,278 ---- //////////////////////////////////////////////////////////////////////////////// // ProcessMessage function ! int XSensMT::ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void * data) *************** *** 421,425 **** imu_data_state.pose.pyaw = euler_data[2]; ! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_STATE, &imu_data_state, sizeof (player_imu_data_state_t), NULL); break; --- 421,425 ---- imu_data_state.pose.pyaw = euler_data[2]; ! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_STATE, &imu_data_state, sizeof (player_imu_data_state_t), NULL); break; *************** *** 429,433 **** imu_data_calib = GetCalibValues (data); ! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_CALIB, &imu_data_calib, sizeof (player_imu_data_calib_t), NULL); break; --- 429,433 ---- imu_data_calib = GetCalibValues (data); ! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_CALIB, &imu_data_calib, sizeof (player_imu_data_calib_t), NULL); break; *************** *** 445,449 **** imu_data_quat.q3 = quaternion_data[3]; ! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_QUAT, &imu_data_quat, sizeof (player_imu_data_quat_t), NULL); break; --- 445,449 ---- imu_data_quat.q3 = quaternion_data[3]; ! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_QUAT, &imu_data_quat, sizeof (player_imu_data_quat_t), NULL); break; *************** *** 460,464 **** imu_data_euler.orientation.pyaw = euler_data[2]; ! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_EULER, &imu_data_euler, sizeof (player_imu_data_euler_t), NULL); break; --- 460,464 ---- imu_data_euler.orientation.pyaw = euler_data[2]; ! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_EULER, &imu_data_euler, sizeof (player_imu_data_euler_t), NULL); break; Index: nimuplayer.cpp =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/imu/nimuplayer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** nimuplayer.cpp 19 Oct 2006 13:39:13 -0000 1.1 --- nimuplayer.cpp 23 Aug 2007 19:58:44 -0000 1.2 *************** *** 112,116 **** // This method will be invoked on each incoming message ! virtual int ProcessMessage (MessageQueue* resp_queue, player_msghdr * hdr, void * data); --- 112,116 ---- // This method will be invoked on each incoming message ! virtual int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void * data); *************** *** 237,241 **** imu_data_calib.magn_z = GET_VALUE_IN_UNITS(data.MagZ,MagRange); ! Publish( device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_CALIB, &imu_data_calib, sizeof(imu_data_calib)); nanosleep (&sleepTime, NULL); --- 237,241 ---- imu_data_calib.magn_z = GET_VALUE_IN_UNITS(data.MagZ,MagRange); ! Publish( device_addr, PLAYER_MSGTYPE_DATA, PLAYER_IMU_DATA_CALIB, &imu_data_calib, sizeof(imu_data_calib)); nanosleep (&sleepTime, NULL); *************** *** 245,249 **** //////////////////////////////////////////////////////////////////////////////// // ProcessMessage function ! int PlayerNIMU::ProcessMessage (MessageQueue* resp_queue, player_msghdr * hdr, void * data) --- 245,249 ---- //////////////////////////////////////////////////////////////////////////////// // ProcessMessage function ! int PlayerNIMU::ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void * data) |