From: Brian G. <ge...@us...> - 2007-08-23 12:59:23
|
Update of /cvsroot/playerstage/code/player/server/drivers/mixed/robotino In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/robotino Modified Files: robotino_driver.cc Log Message: applied Toby's autopointer patches Index: robotino_driver.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/robotino/robotino_driver.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** robotino_driver.cc 20 Aug 2007 06:37:29 -0000 1.3 --- robotino_driver.cc 23 Aug 2007 19:58:46 -0000 1.4 *************** *** 147,151 **** // This method will be invoked on each incoming message ! virtual int ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr, void *data); --- 147,151 ---- // This method will be invoked on each incoming message ! virtual int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void *data); *************** *** 347,351 **** /// Process messages int RobotinoDriver:: ! ProcessMessage (MessageQueue * resp_queue,player_msghdr * hdr,void *data) { //! Send a response if necessary, using Publish(). --- 347,351 ---- /// Process messages int RobotinoDriver:: ! ProcessMessage (QueuePointer &resp_queue,player_msghdr * hdr,void *data) { //! Send a response if necessary, using Publish(). *************** *** 597,601 **** timerEuler.start(); ! this->Publish(this->position_addr,NULL, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, (void*)&posdata,sizeof(posdata), NULL); --- 597,601 ---- timerEuler.start(); ! this->Publish(this->position_addr, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, (void*)&posdata,sizeof(posdata), NULL); *************** *** 608,612 **** PLAYER_POWER_MASK_WATTS); ! this->Publish(this->power_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE, (void*)&powerdata, sizeof(powerdata), NULL); --- 608,612 ---- PLAYER_POWER_MASK_WATTS); ! this->Publish(this->power_addr, PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE, (void*)&powerdata, sizeof(powerdata), NULL); *************** *** 619,623 **** //PLAYER_MSG1(2,"Robotino(R) :: Bumper = %d",bumperdata.bumpers[0]); ! this->Publish(this->bumper_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE, (void*)&bumperdata, sizeof(bumperdata), NULL); --- 619,623 ---- //PLAYER_MSG1(2,"Robotino(R) :: Bumper = %d",bumperdata.bumpers[0]); ! this->Publish(this->bumper_addr, PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE, (void*)&bumperdata, sizeof(bumperdata), NULL); |