Update of /cvsroot/playerstage/code/player/server/drivers/fiducial
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/server/drivers/fiducial
Modified Files:
laserbar.cc laserbarcode.cc laserfeature.cc
laservisualbarcode.cc laservisualbw.cc
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: laservisualbw.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbw.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** laservisualbw.cc 1 Mar 2007 20:41:46 -0000 1.17
--- laservisualbw.cc 20 Aug 2007 06:37:27 -0000 1.18
***************
*** 66,70 ****
@par Configuration requests
! - PLAYER_FIDUCIAL_GET_GEOM
@par Configuration file options
--- 66,70 ----
@par Configuration requests
! - PLAYER_FIDUCIAL_REQ_GET_GEOM
@par Configuration file options
***************
*** 417,426 ****
/*
! if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_GET_GEOM,
device_id))
{
assert(*resp_len>sizeof(player_fiducial_geom_t));
assert(*resp_len>sizeof(player_laser_geom_t));
! int ret = laser->ProcessMessage( PLAYER_MSGTYPE_REQ,
PLAYER_LASER_GET_GEOM,
laser_id, 0, resp_data, resp_data, resp_len);
if (ret != PLAYER_MSGTYPE_RESP_ACK)
--- 417,426 ----
/*
! if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_REQ_GET_GEOM,
device_id))
{
assert(*resp_len>sizeof(player_fiducial_geom_t));
assert(*resp_len>sizeof(player_laser_geom_t));
! int ret = laser->ProcessMessage( PLAYER_MSGTYPE_REQ,
PLAYER_LASER_REQ_GET_GEOM,
laser_id, 0, resp_data, resp_data, resp_len);
if (ret != PLAYER_MSGTYPE_RESP_ACK)
Index: laservisualbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laservisualbarcode.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** laservisualbarcode.cc 1 Mar 2007 20:41:46 -0000 1.13
--- laservisualbarcode.cc 20 Aug 2007 06:37:27 -0000 1.14
***************
*** 88,92 ****
@par Configuration requests
! - PLAYER_FIDUCIAL_GET_GEOM
@par Configuration file options
--- 88,92 ----
@par Configuration requests
! - PLAYER_FIDUCIAL_REQ_GET_GEOM
@par Configuration file options
***************
*** 435,441 ****
/*
! if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_GET_GEOM,
device_id))
{
! int ret = laser->ProcessMessage(PLAYER_MSGTYPE_REQ,
PLAYER_LASER_GET_GEOM, laser_id, 0, resp_data, resp_data, resp_len);
if (ret != PLAYER_MSGTYPE_RESP_ACK)
return ret;
--- 435,441 ----
/*
! if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_REQ_GET_GEOM,
device_id))
{
! int ret = laser->ProcessMessage(PLAYER_MSGTYPE_REQ,
PLAYER_LASER_REQ_GET_GEOM, laser_id, 0, resp_data, resp_data, resp_len);
if (ret != PLAYER_MSGTYPE_RESP_ACK)
return ret;
Index: laserfeature.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laserfeature.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** laserfeature.cc 1 Mar 2007 20:41:46 -0000 1.5
--- laserfeature.cc 20 Aug 2007 06:37:27 -0000 1.6
***************
*** 699,703 ****
switch (subtype)
{
! case PLAYER_FIDUCIAL_GET_GEOM:
HandleGetGeom(client, data, len);
break;
--- 699,703 ----
switch (subtype)
{
! case PLAYER_FIDUCIAL_REQ_GET_GEOM:
HandleGetGeom(client, data, len);
break;
Index: laserbarcode.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/fiducial/laserbarcode.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** laserbarcode.cc 1 Mar 2007 20:41:46 -0000 1.17
--- laserbarcode.cc 20 Aug 2007 06:37:27 -0000 1.18
***************
*** 82,86 ****
@par Configuration requests
! - PLAYER_FIDUCIAL_GET_GEOM
@par Configuration file options
--- 82,86 ----
@par Configuration requests
! - PLAYER_FIDUCIAL_REQ_GET_GEOM
@par Configuration file options
***************
*** 289,298 ****
}
! /* if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_GET_GEOM,
device_id))
{
hdr->device_index = laser_id.index;
! hdr->subtype = PLAYER_LASER_GET_GEOM;
int ret = laser_driver->ProcessMessage(BaseClient, hdr, data, resp_data,
resp_len);
! hdr->subtype = PLAYER_FIDUCIAL_GET_GEOM;
hdr->device_index = device_id.index;
--- 289,298 ----
}
! /* if (MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_FIDUCIAL_REQ_GET_GEOM,
device_id))
{
hdr->device_index = laser_id.index;
! hdr->subtype = PLAYER_LASER_REQ_GET_GEOM;
int ret = laser_driver->ProcessMessage(BaseClient, hdr, data, resp_data,
resp_len);
! hdr->subtype = PLAYER_FIDUCIAL_REQ_GET_GEOM;
hdr->device_index = device_id.index;
***************
*** 567,571 ****
switch (subtype)
{
! case PLAYER_FIDUCIAL_GET_GEOM:
{
HandleGetGeom(client, req, len);
--- 567,571 ----
switch (subtype)
{
! case PLAYER_FIDUCIAL_REQ_GET_GEOM:
{
HandleGetGeom(client, req, len);
Index: laserbar.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/fiducial/laserbar.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** laserbar.cc 9 Jul 2007 17:17:59 -0000 1.18
--- laserbar.cc 20 Aug 2007 06:37:27 -0000 1.19
***************
*** 70,74 ****
@par Configuration requests
! - PLAYER_FIDUCIAL_GET_GEOM
@par Configuration file options
--- 70,74 ----
@par Configuration requests
! - PLAYER_FIDUCIAL_REQ_GET_GEOM
@par Configuration file options
***************
*** 436,440 ****
switch (subtype)
{
! case PLAYER_FIDUCIAL_GET_GEOM:
{
HandleGetGeom(client, src, len);
--- 436,440 ----
switch (subtype)
{
! case PLAYER_FIDUCIAL_REQ_GET_GEOM:
{
HandleGetGeom(client, src, len);
-------------------------------------------------------------------------
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
