Update of /cvsroot/playerstage/code/gazebo/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26594/player
Modified Files:
GripperInterface.cc Makefile.am
Log Message:
Updates
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/player/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.am 2 Nov 2006 19:52:57 -0000 1.10
--- Makefile.am 15 Dec 2006 18:56:20 -0000 1.11
***************
*** 21,25 ****
libgazeboplugin_la_CPPFLAGS = $(AM_CPPFLAGS) @PLAYER_CFLAGS@ -I../libgazebo
! #libgazeboplugin_la_LDFLAGS = -L../libgazebo
libgazeboplugin_la_LIBADD = @PLAYER_LIBS@ -lgazebo
--- 21,25 ----
libgazeboplugin_la_CPPFLAGS = $(AM_CPPFLAGS) @PLAYER_CFLAGS@ -I../libgazebo
! libgazeboplugin_la_LDFLAGS = -L../libgazebo
libgazeboplugin_la_LIBADD = @PLAYER_LIBS@ -lgazebo
Index: GripperInterface.cc
===================================================================
RCS file: /cvsroot/playerstage/code/gazebo/player/GripperInterface.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GripperInterface.cc 2 Nov 2006 17:06:32 -0000 1.3
--- GripperInterface.cc 15 Dec 2006 18:56:20 -0000 1.4
***************
*** 72,75 ****
--- 72,78 ----
player_msghdr_t *hdr, void *data)
{
+
+ // This code works with Player CVS
+ #ifdef PLAYER_GRIPPER_CMD_OPEN
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_CMD,
PLAYER_GRIPPER_CMD_OPEN, this->device_addr))
***************
*** 150,153 ****
--- 153,157 ----
return 0;
}
+ #endif
return -1;
***************
*** 183,187 ****
data.beams |= this->iface->data->left_paddle_open ? 0x10 : 0x00;
data.beams |= this->iface->data->right_paddle_open ? 0x20 : 0x00;
!
// set the proper state
if (this->iface->data->state == GAZEBO_GRIPPER_STATE_OPEN)
--- 187,193 ----
data.beams |= this->iface->data->left_paddle_open ? 0x10 : 0x00;
data.beams |= this->iface->data->right_paddle_open ? 0x20 : 0x00;
!
! // This works with player cvs.
! #ifdef PLAYER_GRIPPER_STATE_OPEN
// set the proper state
if (this->iface->data->state == GAZEBO_GRIPPER_STATE_OPEN)
***************
*** 193,196 ****
--- 199,203 ----
else if (this->iface->data->state == GAZEBO_GRIPPER_STATE_ERROR)
data.state = PLAYER_GRIPPER_STATE_ERROR;
+ #endif
this->driver->Publish( this->device_addr, NULL,
-------------------------------------------------------------------------
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
