Update of /cvsroot/playerstage/code/player/server/drivers/mixed/irobot/roomba
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/irobot/roomba
Modified Files:
roomba_driver.cc
Log Message:
applied Toby's autopointer patches
Index: roomba_driver.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/irobot/roomba/roomba_driver.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roomba_driver.cc 20 Aug 2007 06:37:28 -0000 1.15
--- roomba_driver.cc 23 Aug 2007 19:58:45 -0000 1.16
***************
*** 120,124 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 120,124 ----
// MessageHandler
! int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 298,302 ****
posdata.pos.pa = this->roomba_dev->oa;
! this->Publish(this->position_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
(void*)&posdata, sizeof(posdata), NULL);
--- 298,302 ----
posdata.pos.pa = this->roomba_dev->oa;
! this->Publish(this->position_addr,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
(void*)&posdata, sizeof(posdata), NULL);
***************
*** 320,324 ****
PLAYER_POWER_MASK_CHARGING);
! this->Publish(this->power_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE,
(void*)&powerdata, sizeof(powerdata), NULL);
--- 320,324 ----
PLAYER_POWER_MASK_CHARGING);
! this->Publish(this->power_addr,
PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE,
(void*)&powerdata, sizeof(powerdata), NULL);
***************
*** 333,337 ****
bumperdata.bumpers[1] = this->roomba_dev->bumper_right;
! this->Publish(this->bumper_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE,
(void*)&bumperdata, sizeof(bumperdata), NULL);
--- 333,337 ----
bumperdata.bumpers[1] = this->roomba_dev->bumper_right;
! this->Publish(this->bumper_addr,
PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE,
(void*)&bumperdata, sizeof(bumperdata), NULL);
***************
*** 355,359 ****
irdata.ranges[10] = (float)this->roomba_dev->wheeldrop_right;
! this->Publish(this->ir_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
(void*)&irdata, sizeof(irdata), NULL);
--- 355,359 ----
irdata.ranges[10] = (float)this->roomba_dev->wheeldrop_right;
! this->Publish(this->ir_addr,
PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
(void*)&irdata, sizeof(irdata), NULL);
***************
*** 369,373 ****
gripperdata.stored=0;
! this->Publish(this->gripper_addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
--- 369,373 ----
gripperdata.stored=0;
! this->Publish(this->gripper_addr,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
***************
*** 387,391 ****
cpdata.data[4]=this->roomba_dev->remote_opcode;
! this->Publish(this->opaque_addr, NULL,
PLAYER_MSGTYPE_DATA,PLAYER_OPAQUE_DATA_STATE,
(void*)&cpdata, sizeof(cpdata), NULL);
--- 387,391 ----
cpdata.data[4]=this->roomba_dev->remote_opcode;
! this->Publish(this->opaque_addr,
PLAYER_MSGTYPE_DATA,PLAYER_OPAQUE_DATA_STATE,
(void*)&cpdata, sizeof(cpdata), NULL);
***************
*** 396,400 ****
int
! Roomba::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 396,400 ----
int
! Roomba::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
-------------------------------------------------------------------------
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
