Update of /cvsroot/playerstage/code/player/server/drivers/mixed/erratic
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1338/server/drivers/mixed/erratic
Modified Files:
erratic.cc packet.cc robot_params.h
Log Message:
applied patch 1749747 to transition to 3d pose structures
Index: erratic.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/erratic.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** erratic.cc 18 Dec 2006 07:43:43 -0000 1.13
--- erratic.cc 9 Jul 2007 17:18:00 -0000 1.14
***************
*** 1173,1181 ****
return(-1);
}
! player_position2d_geom_t geom;
geom.pose.px = -RobotParams[param_idx]->RobotAxleOffset / 1e3;
- geom.pose.py = 0.0;
- geom.pose.pa = 0.0;
geom.size.sl = RobotParams[param_idx]->RobotLength / 1e3;
--- 1173,1179 ----
return(-1);
}
! player_position2d_geom_t geom={{0}};
geom.pose.px = -RobotParams[param_idx]->RobotAxleOffset / 1e3;
geom.size.sl = RobotParams[param_idx]->RobotLength / 1e3;
Index: robot_params.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/robot_params.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** robot_params.h 18 Dec 2006 06:03:27 -0000 1.3
--- robot_params.h 9 Jul 2007 17:18:00 -0000 1.4
***************
*** 92,96 ****
sonar_pose_t sonar_pose[32];
int NumIR;
! player_pose_t IRPose[8];
} RobotParams_t;
--- 92,96 ----
sonar_pose_t sonar_pose[32];
int NumIR;
! player_pose3d_t IRPose[8];
} RobotParams_t;
Index: packet.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/packet.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packet.cc 22 Sep 2006 07:08:15 -0000 1.2
--- packet.cc 9 Jul 2007 17:18:00 -0000 1.3
***************
*** 110,116 ****
readpoll.revents = 0;
fd_set read_set, error_set;
struct timeval tv;
- #ifdef USE_SELECT
FD_ZERO(&read_set);
FD_ZERO(&error_set);
--- 110,116 ----
readpoll.revents = 0;
+ #ifdef USE_SELECT
fd_set read_set, error_set;
struct timeval tv;
FD_ZERO(&read_set);
FD_ZERO(&error_set);
-------------------------------------------------------------------------
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
