From: Brian G. <ge...@us...> - 2007-08-23 12:59:15
|
Update of /cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/wbr/914 Modified Files: wbr914.cc wbr914.h Log Message: applied Toby's autopointer patches Index: wbr914.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914/wbr914.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wbr914.cc 20 Aug 2007 06:37:29 -0000 1.8 --- wbr914.cc 23 Aug 2007 19:58:46 -0000 1.9 *************** *** 573,577 **** { // put odometry data ! this->Publish(this->position_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, --- 573,577 ---- { // put odometry data ! this->Publish(this->position_id, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, *************** *** 584,588 **** { // put ir data ! this->Publish(this->ir_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES, --- 584,588 ---- { // put ir data ! this->Publish(this->ir_id, PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES, *************** *** 595,599 **** { // put Analog Input data ! this->Publish(this->aio_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_AIO_DATA_STATE, --- 595,599 ---- { // put Analog Input data ! this->Publish(this->aio_id, PLAYER_MSGTYPE_DATA, PLAYER_AIO_DATA_STATE, *************** *** 606,610 **** { // put Digital Input data ! this->Publish(this->dio_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_DIO_DATA_VALUES, --- 606,610 ---- { // put Digital Input data ! this->Publish(this->dio_id, PLAYER_MSGTYPE_DATA, PLAYER_DIO_DATA_VALUES, *************** *** 671,675 **** } ! int wbr914::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, void * data) --- 671,675 ---- } ! int wbr914::ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void * data) *************** *** 685,689 **** } ! int wbr914::HandleConfig(MessageQueue* resp_queue, player_msghdr * hdr, void * data) --- 685,689 ---- } ! int wbr914::HandleConfig(QueuePointer &resp_queue, player_msghdr * hdr, void * data) *************** *** 1136,1140 **** player_position2d_data_t data; memset(&data,0,sizeof(player_position2d_data_t)); ! Publish( position_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, &data, sizeof(data),NULL); */ _x = 0; --- 1136,1140 ---- player_position2d_data_t data; memset(&data,0,sizeof(player_position2d_data_t)); ! Publish( position_id, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, &data, sizeof(data),NULL); */ _x = 0; Index: wbr914.h =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914/wbr914.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wbr914.h 20 Aug 2007 06:37:29 -0000 1.5 --- wbr914.h 23 Aug 2007 19:58:46 -0000 1.6 *************** *** 152,156 **** // MessageHandler ! virtual int ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, void * data); --- 152,156 ---- // MessageHandler ! virtual int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void * data); *************** *** 175,179 **** int ResetRawPositions(); ! int HandleConfig(MessageQueue* resp_queue, player_msghdr * hdr, void* data); --- 175,179 ---- int ResetRawPositions(); ! int HandleConfig(QueuePointer &resp_queue, player_msghdr * hdr, void* data); |