Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2086/src
Modified Files:
p_blobfinder.cc p_bumper.cc p_fiducial.cc p_laser.cc
p_position.cc p_sonar.cc p_wifi.cc
Log Message:
applied patch 1749747 to transition to 3d pose structures
Index: p_wifi.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_wifi.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** p_wifi.cc 2 Mar 2006 23:19:03 -0000 1.1
--- p_wifi.cc 9 Jul 2007 17:18:37 -0000 1.2
***************
*** 66,68 ****
--- 66,69 ----
{
// PROCESS INCOMING REQUESTS HERE
+ return 0;
}
Index: p_sonar.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_sonar.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** p_sonar.cc 22 Jan 2006 04:16:57 -0000 1.8
--- p_sonar.cc 9 Jul 2007 17:18:37 -0000 1.9
***************
*** 118,122 ****
pgeom.poses[i].px = cfgs[i].pose.x;
pgeom.poses[i].py = cfgs[i].pose.y;
! pgeom.poses[i].pa = cfgs[i].pose.a;
}
--- 118,122 ----
pgeom.poses[i].px = cfgs[i].pose.x;
pgeom.poses[i].py = cfgs[i].pose.y;
! pgeom.poses[i].pyaw = cfgs[i].pose.a;
}
Index: p_bumper.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_bumper.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** p_bumper.cc 30 Mar 2006 02:59:04 -0000 1.1
--- p_bumper.cc 9 Jul 2007 17:18:37 -0000 1.2
***************
*** 113,117 ****
pgeom.bumper_def[i].pose.px = cfgs[i].pose.x;
pgeom.bumper_def[i].pose.py = cfgs[i].pose.y;
! pgeom.bumper_def[i].pose.pa = cfgs[i].pose.a;
pgeom.bumper_def[i].length = cfgs[i].length;
pgeom.bumper_def[i].radius = 0;
--- 113,117 ----
pgeom.bumper_def[i].pose.px = cfgs[i].pose.x;
pgeom.bumper_def[i].pose.py = cfgs[i].pose.y;
! pgeom.bumper_def[i].pose.pyaw = cfgs[i].pose.a;
pgeom.bumper_def[i].length = cfgs[i].length;
pgeom.bumper_def[i].radius = 0;
Index: p_position.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_position.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** p_position.cc 5 Oct 2006 22:27:07 -0000 1.15
--- p_position.cc 9 Jul 2007 17:18:37 -0000 1.16
***************
*** 67,71 ****
{
stg_position_cmd_t* cmd = (stg_position_cmd_t*)this->mod->cmd;
! stg_position_cfg_t* cfg = (stg_position_cfg_t*)this->mod->cfg;
// Is it a new motor command?
--- 67,71 ----
{
stg_position_cmd_t* cmd = (stg_position_cmd_t*)this->mod->cmd;
! //stg_position_cfg_t* cfg = (stg_position_cfg_t*)this->mod->cfg;
// Is it a new motor command?
***************
*** 143,147 ****
pgeom.pose.px = geom.pose.x;
pgeom.pose.py = geom.pose.y;
! pgeom.pose.pa = geom.pose.a;
pgeom.size.sl = geom.size.x;
--- 143,147 ----
pgeom.pose.px = geom.pose.x;
pgeom.pose.py = geom.pose.y;
! pgeom.pose.pyaw = geom.pose.a;
pgeom.size.sl = geom.size.x;
***************
*** 286,289 ****
--- 286,290 ----
return(-1);
}
+ return -1;
}
Index: p_blobfinder.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_blobfinder.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** p_blobfinder.cc 14 Jun 2006 17:51:22 -0000 1.8
--- p_blobfinder.cc 9 Jul 2007 17:18:37 -0000 1.9
***************
*** 55,59 ****
void InterfaceBlobfinder::Publish( void )
{
! size_t len=0;
stg_blobfinder_blob_t* blobs = (stg_blobfinder_blob_t*)mod->data;
--- 55,59 ----
void InterfaceBlobfinder::Publish( void )
{
! //size_t len=0;
stg_blobfinder_blob_t* blobs = (stg_blobfinder_blob_t*)mod->data;
Index: p_laser.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_laser.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** p_laser.cc 22 Mar 2006 08:46:29 -0000 1.18
--- p_laser.cc 9 Jul 2007 17:18:37 -0000 1.19
***************
*** 57,61 ****
void InterfaceLaser::Publish( void )
{
! size_t len = 0;
stg_laser_sample_t* samples = (stg_laser_sample_t*)mod->data;
int sample_count = mod->data_len / sizeof( stg_laser_sample_t );
--- 57,61 ----
void InterfaceLaser::Publish( void )
{
! //size_t len = 0;
stg_laser_sample_t* samples = (stg_laser_sample_t*)mod->data;
int sample_count = mod->data_len / sizeof( stg_laser_sample_t );
***************
*** 200,204 ****
pgeom.pose.px = pose.x;
pgeom.pose.py = pose.y;
! pgeom.pose.pa = pose.a;
pgeom.size.sl = geom.size.x;
pgeom.size.sw = geom.size.y;
--- 200,204 ----
pgeom.pose.px = pose.x;
pgeom.pose.py = pose.y;
! pgeom.pose.pyaw = pose.a;
pgeom.size.sl = geom.size.x;
pgeom.size.sw = geom.size.y;
Index: p_fiducial.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_fiducial.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** p_fiducial.cc 22 Jan 2006 04:16:57 -0000 1.8
--- p_fiducial.cc 9 Jul 2007 17:18:37 -0000 1.9
***************
*** 81,86 ****
{
PRINT_WARN2( "A Stage model has detected more fiducials than"
! " will fit in Player's buffer (%d/%d)\n",
! fcount, PLAYER_FIDUCIAL_MAX_SAMPLES );
fcount = PLAYER_FIDUCIAL_MAX_SAMPLES;
}
--- 81,86 ----
{
PRINT_WARN2( "A Stage model has detected more fiducials than"
! " will fit in Player's buffer (%u/%u)\n",
! (uint) fcount, PLAYER_FIDUCIAL_MAX_SAMPLES );
fcount = PLAYER_FIDUCIAL_MAX_SAMPLES;
}
***************
*** 143,147 ****
pgeom.pose.px = pose.x;
pgeom.pose.py = pose.y;
! pgeom.pose.pa = pose.a;
pgeom.size.sl = geom.size.x;
pgeom.size.sw = geom.size.y;
--- 143,147 ----
pgeom.pose.px = pose.x;
pgeom.pose.py = pose.y;
! pgeom.pose.pyaw = pose.a;
pgeom.size.sl = geom.size.x;
pgeom.size.sw = geom.size.y;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
