Update of /cvsroot/playerstage/code/player/server/drivers/mixed/garcia
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/garcia
Modified Files:
garcia_mixed.cc garcia_mixed.h
Log Message:
applied Toby's autopointer patches
Index: garcia_mixed.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/garcia/garcia_mixed.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** garcia_mixed.h 30 Apr 2006 14:07:55 -0000 1.3
--- garcia_mixed.h 23 Aug 2007 19:58:45 -0000 1.4
***************
*** 45,49 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 45,49 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
Index: garcia_mixed.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/garcia/garcia_mixed.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** garcia_mixed.cc 20 Aug 2007 06:37:28 -0000 1.8
--- garcia_mixed.cc 23 Aug 2007 19:58:45 -0000 1.9
***************
*** 356,360 ****
// Process an incoming message
int
! GarciaDriver::ProcessMessage(MessageQueue* resp_queue,
player_msghdr* hdr,
void* data)
--- 356,360 ----
// Process an incoming message
int
! GarciaDriver::ProcessMessage(QueuePointer & resp_queue,
player_msghdr* hdr,
void* data)
***************
*** 527,531 ****
geom.size.sw = mWidth; // [m]
! Publish(mPos2dAddr, NULL,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_POSITION2D_REQ_GET_GEOM,
--- 527,531 ----
geom.size.sw = mWidth; // [m]
! Publish(mPos2dAddr,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_POSITION2D_REQ_GET_GEOM,
***************
*** 547,551 ****
memcpy(pose.poses, poses, 6*sizeof(player_pose_t));
! Publish(mIrAddr, NULL,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_IR_REQ_POSE,
--- 547,551 ----
memcpy(pose.poses, poses, 6*sizeof(player_pose_t));
! Publish(mIrAddr,
PLAYER_MSGTYPE_RESP_ACK,
PLAYER_IR_REQ_POSE,
***************
*** 566,570 ****
mPos2dData.vel.pa = 0.0;
! Publish(mPos2dAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
reinterpret_cast<void*>(&mPos2dData), sizeof(mPos2dData), NULL);
--- 566,570 ----
mPos2dData.vel.pa = 0.0;
! Publish(mPos2dAddr,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
reinterpret_cast<void*>(&mPos2dData), sizeof(mPos2dData), NULL);
***************
*** 581,585 ****
mIrData.ranges[5] =
mGarcia->getNamedValue("rear-ranger-right")->getFloatVal();
! Publish(mIrAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
reinterpret_cast<void*>(&mIrData), sizeof(mIrData), NULL);
--- 581,585 ----
mIrData.ranges[5] =
mGarcia->getNamedValue("rear-ranger-right")->getFloatVal();
! Publish(mIrAddr,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
reinterpret_cast<void*>(&mIrData), sizeof(mIrData), NULL);
***************
*** 590,594 ****
mDioData.digin = ++dio_test;
! Publish(mDioAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_DIO_DATA_VALUES,
reinterpret_cast<void*>(&mDioData), sizeof(mDioData), NULL);
--- 590,594 ----
mDioData.digin = ++dio_test;
! Publish(mDioAddr,
PLAYER_MSGTYPE_DATA, PLAYER_DIO_DATA_VALUES,
reinterpret_cast<void*>(&mDioData), sizeof(mDioData), NULL);
***************
*** 598,602 ****
mPowerData.percent = mGarcia->getNamedValue("battery-level")->getFloatVal();
! Publish(mPowerAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE,
reinterpret_cast<void*>(&mPowerData), sizeof(mPowerData), NULL);
--- 598,602 ----
mPowerData.percent = mGarcia->getNamedValue("battery-level")->getFloatVal();
! Publish(mPowerAddr,
PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE,
reinterpret_cast<void*>(&mPowerData), sizeof(mPowerData), NULL);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
