Update of /cvsroot/playerstage/code/player/server/drivers/mixed/khepera
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/khepera
Modified Files:
khepera.cc khepera.h
Log Message:
applied Toby's autopointer patches
Index: khepera.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/khepera/khepera.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** khepera.cc 20 Aug 2007 06:37:28 -0000 1.18
--- khepera.cc 23 Aug 2007 19:58:45 -0000 1.19
***************
*** 159,163 ****
}
! int Khepera::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr,
void * data)
{
assert(hdr);
--- 159,163 ----
}
! int Khepera::ProcessMessage(QueuePointer & resp_queue, player_msghdr * hdr,
void * data)
{
assert(hdr);
***************
*** 491,500 ****
// put position data
! Publish(position_addr,NULL,PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, (unsigned char *) &position_data,
sizeof(player_position2d_data_t),NULL);
UpdateIRData(&ir_data);
// put ir data
! Publish(position_addr,NULL,PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES,
(unsigned char *) &ir_data, sizeof(ir_data),NULL);
}
--- 491,500 ----
// put position data
! Publish(position_addr,PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
(unsigned char *) &position_data, sizeof(player_position2d_data_t),NULL);
UpdateIRData(&ir_data);
// put ir data
! Publish(position_addr,PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES, (unsigned
char *) &ir_data, sizeof(ir_data),NULL);
}
***************
*** 601,605 ****
player_position2d_data_t data;
memset(&data,0,sizeof(player_position2d_data_t));
! Publish(position_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, &data, sizeof(data),NULL);
x=y=yaw=0;
--- 601,605 ----
player_position2d_data_t data;
memset(&data,0,sizeof(player_position2d_data_t));
! Publish(position_addr, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
&data, sizeof(data),NULL);
x=y=yaw=0;
Index: khepera.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/khepera/khepera.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** khepera.h 20 Jan 2006 01:12:56 -0000 1.7
--- khepera.h 23 Aug 2007 19:58:45 -0000 1.8
***************
*** 122,126 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr *
hdr, void * data);
private:
--- 122,126 ----
// MessageHandler
! int ProcessMessage(QueuePointer & resp_queue, player_msghdr *
hdr, void * data);
private:
-------------------------------------------------------------------------
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
