Update of /cvsroot/playerstage/code/player/server/drivers/mixed/erratic
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18943/server/drivers/mixed/erratic
Modified Files:
Tag: release-2-0-patches
erratic.cc robot_params.cc
Log Message:
Index: robot_params.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/robot_params.cc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** robot_params.cc 26 Dec 2006 19:36:19 -0000 1.1.2.5
--- robot_params.cc 10 Jan 2007 08:15:55 -0000 1.1.2.6
***************
*** 78,88 ****
{ // sonar poses, in m and rads
{ 0.180, 0.110, DTOR(90) },
! { 0.200, 0.85, DTOR(0) },
! { 0.190, 0.65, DTOR(-53) },
! { 0.170, 0.45, DTOR(-24) },
! { 0.180,-0.110, DTOR(-90) },
! { 0.200, -0.85, DTOR( 0) },
! { 0.190, -0.65, DTOR( 53) },
! { 0.170, -0.45, DTOR( 24) },
},
2,
--- 78,88 ----
{ // sonar poses, in m and rads
{ 0.180, 0.110, DTOR(90) },
! { 0.200, 0.085, DTOR(0) },
! { 0.190, 0.065, DTOR(-53) },
! { 0.170, 0.045, DTOR(-24) },
! { 0.170, -0.045, DTOR( 24) },
! { 0.190, -0.065, DTOR( 53) },
! { 0.200, -0.085, DTOR( 0) },
! { 0.180, -0.110, DTOR(-90) },
},
2,
Index: erratic.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/erratic.cc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** erratic.cc 9 Jan 2007 06:02:52 -0000 1.1.2.11
--- erratic.cc 10 Jan 2007 08:15:55 -0000 1.1.2.12
***************
*** 873,877 ****
maxcount =
RobotParams[this->param_idx]->NumSonars;
count = packet.packet[4];
! erratic_data.sonar.ranges_count = count;
for (int i = 0; i < count; i++)
{
--- 873,877 ----
maxcount =
RobotParams[this->param_idx]->NumSonars;
count = packet.packet[4];
! erratic_data.sonar.ranges_count = maxcount;
for (int i = 0; i < count; i++)
{
***************
*** 883,886 ****
--- 883,887 ----
erratic_data.sonar.ranges[ch] =
.001 * (double)(packet.packet[6+i*3]
+ 256*packet.packet[7+i*3]);
+ //
printf("Sonar %d: %.2f\n", ch, erratic_data.sonar.ranges[ch]);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
