Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1338/client_libs/libplayerc

Modified Files:
        dev_laser.c dev_position1d.c dev_position2d.c device.c 
        playerc.h 
Log Message:
applied patch 1749747 to transition to 3d pose structures

Index: dev_laser.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_laser.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** dev_laser.c 14 Mar 2007 16:41:51 -0000      1.41
--- dev_laser.c 9 Jul 2007 17:17:58 -0000       1.42
***************
*** 257,261 ****
    device->pose[0] = config.pose.px;
    device->pose[1] = config.pose.py;
!   device->pose[2] = config.pose.pa;
    device->size[0] = config.size.sl;
    device->size[1] = config.size.sw;
--- 257,261 ----
    device->pose[0] = config.pose.px;
    device->pose[1] = config.pose.py;
!   device->pose[2] = config.pose.pyaw;
    device->size[0] = config.size.sl;
    device->size[1] = config.size.sw;

Index: dev_position2d.c
===================================================================
RCS file: 
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_position2d.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dev_position2d.c    14 Mar 2007 16:41:51 -0000      1.9
--- dev_position2d.c    9 Jul 2007 17:17:58 -0000       1.10
***************
*** 160,164 ****
    device->pose[0] = geom.pose.px;
    device->pose[1] = geom.pose.py;
!   device->pose[2] = geom.pose.pa;
    device->size[0] = geom.size.sl;
    device->size[1] = geom.size.sw;
--- 160,164 ----
    device->pose[0] = geom.pose.px;
    device->pose[1] = geom.pose.py;
!   device->pose[2] = geom.pose.pyaw;
    device->size[0] = geom.size.sl;
    device->size[1] = geom.size.sw;
***************
*** 189,193 ****
  int
  playerc_position2d_set_cmd_pose_with_vel(playerc_position2d_t *device,
!                                          player_pose_t pos, player_pose_t vel,
                                           int state)
  {
--- 189,193 ----
  int
  playerc_position2d_set_cmd_pose_with_vel(playerc_position2d_t *device,
!                                          player_pose2d_t pos, player_pose2d_t 
vel,
                                           int state)
  {

Index: dev_position1d.c
===================================================================
RCS file: 
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_position1d.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dev_position1d.c    14 Mar 2007 16:41:51 -0000      1.4
--- dev_position1d.c    9 Jul 2007 17:17:58 -0000       1.5
***************
*** 143,147 ****
    device->pose[0] = geom.pose.px;
    device->pose[1] = geom.pose.py;
!   device->pose[2] = geom.pose.pa;
    device->size[0] = geom.size.sl;
    device->size[1] = geom.size.sw;
--- 143,147 ----
    device->pose[0] = geom.pose.px;
    device->pose[1] = geom.pose.py;
!   device->pose[2] = geom.pose.pyaw;
    device->size[0] = geom.size.sl;
    device->size[1] = geom.size.sw;

Index: playerc.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/playerc.h,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** playerc.h   17 Jun 2007 00:28:01 -0000      1.225
--- playerc.h   9 Jul 2007 17:17:58 -0000       1.226
***************
*** 839,843 ****
  
  /** @brief Set a string property */
! int playerc_device_set_strprop(playerc_device_t *device, char *property, 
const char *value);
  
  
--- 839,843 ----
  
  /** @brief Set a string property */
! int playerc_device_set_strprop(playerc_device_t *device, char *property, char 
*value);
  
  
***************
*** 2438,2443 ****
  /** Set the target pose with given motion vel */
  int playerc_position2d_set_cmd_pose_with_vel(playerc_position2d_t *device,
!                                              player_pose_t pos,
!                                              player_pose_t vel,
                                               int state);
  
--- 2438,2443 ----
  /** Set the target pose with given motion vel */
  int playerc_position2d_set_cmd_pose_with_vel(playerc_position2d_t *device,
!                                              player_pose2d_t pos,
!                                              player_pose2d_t vel,
                                               int state);
  
***************
*** 2840,2844 ****
    /** Pose of each sonar relative to robot (m, m, radians).  This
        structure is filled by calling playerc_sonar_get_geom(). */
!   player_pose_t poses[PLAYERC_SONAR_MAX_SAMPLES];
  
    /** Number of points in the scan. */
--- 2840,2844 ----
    /** Pose of each sonar relative to robot (m, m, radians).  This
        structure is filled by calling playerc_sonar_get_geom(). */
!   player_pose3d_t poses[PLAYERC_SONAR_MAX_SAMPLES];
  
    /** Number of points in the scan. */

Index: device.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/device.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** device.c    29 Apr 2007 07:18:42 -0000      1.13
--- device.c    9 Jul 2007 17:17:58 -0000       1.14
***************
*** 202,206 ****
  }
  
! int playerc_device_set_strprop(playerc_device_t *device, char *property, 
const char *value)
  {
    int result = 0;
--- 202,206 ----
  }
  
! int playerc_device_set_strprop(playerc_device_t *device, char *property, char 
*value)
  {
    int result = 0;


-------------------------------------------------------------------------
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

Reply via email to