Update of /cvsroot/playerstage/code/player/server/drivers/localization
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25787/server/drivers/localization
Modified Files:
Tag: b_thjc_dynamic_arrays
fakelocalize.cc .cvsignore
Log Message:
Merged some changes from head a while back
Work on updating drivers, A-J done, laser is next
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/localization/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -C2 -d -r1.1 -r1.1.20.1
*** .cvsignore 5 Dec 2002 00:47:02 -0000 1.1
--- .cvsignore 10 Oct 2007 09:26:10 -0000 1.1.20.1
***************
*** 1,2 ****
--- 1,5 ----
Makefile
Makefile.in
+ .deps
+ *.la
+ *.a
Index: fakelocalize.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/localization/fakelocalize.cc,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** fakelocalize.cc 23 Aug 2007 19:58:44 -0000 1.11
--- fakelocalize.cc 10 Oct 2007 09:26:10 -0000 1.11.2.1
***************
*** 244,248 ****
{
// we got a good reply so update our data
! assert(Reply->GetPayloadSize() == sizeof(cfg));
player_simulation_pose2d_req_t * resp =
reinterpret_cast<player_simulation_pose2d_req_t *> (Reply->GetPayload());
--- 244,248 ----
{
// we got a good reply so update our data
! assert(Reply->GetDataSize() == sizeof(cfg));
player_simulation_pose2d_req_t * resp =
reinterpret_cast<player_simulation_pose2d_req_t *> (Reply->GetPayload());
***************
*** 301,310 ****
this->localize_addr))
{
- if(hdr->size != sizeof(player_localize_set_pose_t))
- {
- PLAYER_ERROR2("request is wrong length (%d != %d); ignoring",
- hdr->size, sizeof(player_localize_set_pose_t));
- return(-1);
- }
setposereq = (player_localize_set_pose_t*)data;
player_simulation_pose2d_req_t req;
--- 301,304 ----
***************
*** 339,348 ****
{
player_simulation_pose2d_req_t cfg;
- if(hdr->size != 0)
- {
- PLAYER_ERROR2("request is wrong length (%d != %d); ignoring",
- hdr->size, 0);
- return(PLAYER_MSGTYPE_RESP_NACK);
- }
// Request pose
--- 333,336 ----
***************
*** 356,360 ****
if (Reply && Reply->GetHeader()->type == PLAYER_MSGTYPE_RESP_ACK)
{
! assert(Reply->GetPayloadSize() == sizeof(cfg));
player_simulation_pose2d_req_t * ans =
reinterpret_cast<player_simulation_pose2d_req_t *> (Reply->GetPayload());
--- 344,348 ----
if (Reply && Reply->GetHeader()->type == PLAYER_MSGTYPE_RESP_ACK)
{
! assert(Reply->GetDataSize() == sizeof(cfg));
player_simulation_pose2d_req_t * ans =
reinterpret_cast<player_simulation_pose2d_req_t *> (Reply->GetPayload());
-------------------------------------------------------------------------
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
