Update of /cvsroot/playerstage/code/player/libplayerxdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7522/libplayerxdr
Modified Files:
Tag: release-2-0-patches
functiontable.c
Log Message:
more backports from HEAD
Index: functiontable.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/functiontable.c,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -C2 -d -r1.54 -r1.54.2.1
*** functiontable.c 10 Apr 2006 13:27:47 -0000 1.54
--- functiontable.c 9 Jun 2006 18:13:50 -0000 1.54.2.1
***************
*** 157,160 ****
--- 157,162 ----
/* graphics2d messages */
+ {PLAYER_GRAPHICS2D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_GRAPHICS2D_CMD_CLEAR,
+ (player_pack_fn_t)player_graphics2d_cmd_points_pack},
{PLAYER_GRAPHICS2D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_GRAPHICS2D_CMD_POINTS,
(player_pack_fn_t)player_graphics2d_cmd_points_pack},
***************
*** 164,167 ****
--- 166,175 ----
(player_pack_fn_t)player_graphics2d_cmd_polyline_pack},
+ /* graphics3d messages */
+ {PLAYER_GRAPHICS3D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_GRAPHICS3D_CMD_CLEAR,
+ (player_pack_fn_t)player_graphics3d_cmd_draw_pack},
+ {PLAYER_GRAPHICS3D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_GRAPHICS3D_CMD_DRAW,
+ (player_pack_fn_t)player_graphics3d_cmd_draw_pack},
+
/* gripper messages */
{PLAYER_GRIPPER_CODE, PLAYER_MSGTYPE_DATA, PLAYER_GRIPPER_DATA_STATE,
***************
*** 253,259 ****
{PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_DATA, PLAYER_OPAQUE_DATA_STATE,
(player_pack_fn_t)player_opaque_data_pack},
! {PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_DATA, PLAYER_OPAQUE_CMD,
(player_pack_fn_t)player_opaque_data_pack},
! {PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_DATA, PLAYER_OPAQUE_REQ,
(player_pack_fn_t)player_opaque_data_pack},
--- 261,267 ----
{PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_DATA, PLAYER_OPAQUE_DATA_STATE,
(player_pack_fn_t)player_opaque_data_pack},
! {PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_CMD, PLAYER_OPAQUE_CMD,
(player_pack_fn_t)player_opaque_data_pack},
! {PLAYER_OPAQUE_CODE, PLAYER_MSGTYPE_REQ, PLAYER_OPAQUE_REQ,
(player_pack_fn_t)player_opaque_data_pack},
***************
*** 344,347 ****
--- 352,372 ----
{PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_DATA, PLAYER_POSITION3D_DATA_STATE,
(player_pack_fn_t)player_position3d_data_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION3D_DATA_GEOMETRY,
+ (player_pack_fn_t)player_position3d_data_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_POSITION3D_CMD_SET_POS,
+ (player_pack_fn_t)player_position3d_cmd_pos_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_POSITION3D_CMD_SET_VEL,
+ (player_pack_fn_t)player_position3d_cmd_vel_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_MOTOR_POWER,
+ (player_pack_fn_t)player_position3d_power_config_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION3D_POSITION_MODE,
+ (player_pack_fn_t)player_position3d_position_mode_req_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_RESET_ODOM,
+ (player_pack_fn_t)player_position3d_reset_odom_config_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_SET_ODOM,
+ (player_pack_fn_t)player_position3d_set_odom_req_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION3D_VELOCITY_MODE,
+ (player_pack_fn_t)player_position3d_velocity_mode_config_pack},
+
/* power messages */
***************
*** 397,402 ****
(player_pack_fn_t)player_speech_recognition_data_pack},
! /* speech recognition messages */
! {PLAYER_SPEECH_RECOGNITION_CODE, PLAYER_MSGTYPE_DATA,
PLAYER_WAVEFORM_DATA_SAMPLE,
(player_pack_fn_t)player_waveform_data_pack},
--- 422,427 ----
(player_pack_fn_t)player_speech_recognition_data_pack},
! /* waveform messages */
! {PLAYER_WAVEFORM_CODE, PLAYER_MSGTYPE_DATA, PLAYER_WAVEFORM_DATA_SAMPLE,
(player_pack_fn_t)player_waveform_data_pack},
***************
*** 511,515 ****
curr = ftable + i;
// Make sure the interface and subtype match exactly.
! if(curr->interf == interf &&
curr->type == type &&
curr->subtype == subtype)
--- 536,541 ----
curr = ftable + i;
// Make sure the interface and subtype match exactly.
! // match anyway if interface = 0 (universal data types)
! if((curr->interf == interf || curr->interf == 0) &&
curr->type == type &&
curr->subtype == subtype)
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
