Update of /cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/server/drivers/mixed/wbr/914
Modified Files:
wbr914.cc wbr914.h
Log Message:
overhaul of the player interface definitions
interfaces are now defined with a very light weight IDL allowing them to be
edited in a single file
some subtype names were also modified as a side effect, making them more
consistent globally
Index: wbr914.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914/wbr914.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wbr914.cc 9 Jul 2007 17:18:01 -0000 1.7
--- wbr914.cc 20 Aug 2007 06:37:29 -0000 1.8
***************
*** 64,74 ****
- @ref interface_position2d :
! - PLAYER_POSITION_SET_ODOM_REQ
! - PLAYER_POSITION_MOTOR_POWER_REQ
! - PLAYER_POSITION_RESET_ODOM_REQ
! - PLAYER_POSITION_GET_GEOM_REQ
- @ref interface_ir :
! - PLAYER_IR_POSE
@par Supported commands
--- 64,74 ----
- @ref interface_position2d :
! - PLAYER_POSITION2D_REQ_SET_ODOM
! - PLAYER_POSITION2D_REQ_MOTOR_POWER
! - PLAYER_POSITION2D_REQ_RESET_ODOM
! - PLAYER_POSITION2D_REQ_GET_GEOM
- @ref interface_ir :
! - PLAYER_IR_REQ_POSE
@par Supported commands
***************
*** 766,770 ****
}
else if(Message::MatchMessage(hdr,PLAYER_MSGTYPE_REQ,
! PLAYER_IR_POSE,
ir_id))
{
--- 766,770 ----
}
else if(Message::MatchMessage(hdr,PLAYER_MSGTYPE_REQ,
! PLAYER_IR_REQ_POSE,
ir_id))
{
***************
*** 805,809 ****
this->dio_id))
{
! HandleDigitalOutCommand( (player_dio_cmd_t*)data );
return(0);
}
--- 805,809 ----
this->dio_id))
{
! HandleDigitalOutCommand( (player_dio_data_t*)data );
return(0);
}
***************
*** 861,865 ****
}
! void wbr914::HandleDigitalOutCommand( player_dio_cmd_t* doutCmd )
{
SetDigitalData( doutCmd );
--- 861,865 ----
}
! void wbr914::HandleDigitalOutCommand( player_dio_data_t* doutCmd )
{
SetDigitalData( doutCmd );
***************
*** 1043,1047 ****
// Byte flip the data to make the Input from the
// optional I/O board show up in the upper byte.
! d->digin = (uint32_t)( (din>>8) | (din<<8));
}
--- 1043,1047 ----
// Byte flip the data to make the Input from the
// optional I/O board show up in the upper byte.
! d->bits = (uint32_t)( (din>>8) | (din<<8));
}
***************
*** 1052,1059 ****
board attached to the M3 so blindly set the data.
*/
! void wbr914::SetDigitalData( player_dio_cmd_t * d )
{
// We only have 16 bits of Dig out, so strip extra bits
! uint16_t data = d->digout & 0xFFFF;
// Different number of digital bits being requested to
--- 1052,1059 ----
board attached to the M3 so blindly set the data.
*/
! void wbr914::SetDigitalData( player_dio_data_t * d )
{
// We only have 16 bits of Dig out, so strip extra bits
! uint16_t data = d->bits & 0xFFFF;
// Different number of digital bits being requested to
Index: wbr914.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/wbr/914/wbr914.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wbr914.h 28 Nov 2006 20:14:25 -0000 1.4
--- wbr914.h 20 Aug 2007 06:37:29 -0000 1.5
***************
*** 182,187 ****
int HandleCommand(player_msghdr * hdr, void * data);
void HandleVelocityCommand(player_position2d_cmd_vel_t* cmd );
! void HandleDigitalOutCommand( player_dio_cmd_t* doutCmd );
! void SetDigitalData( player_dio_cmd_t * d );
// Robot data retrievers
--- 182,187 ----
int HandleCommand(player_msghdr * hdr, void * data);
void HandleVelocityCommand(player_position2d_cmd_vel_t* cmd );
! void HandleDigitalOutCommand( player_dio_data_t* doutCmd );
! void SetDigitalData( player_dio_data_t * d );
// Robot data retrievers
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
