Update of /cvsroot/playerstage/code/player/server/drivers/shell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/server/drivers/shell
Modified Files:
dummy.cc kartowriter.cc readlog.cc writelog.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: writelog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/writelog.cc,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** writelog.cc 4 Aug 2007 03:12:07 -0000 1.79
--- writelog.cc 20 Aug 2007 06:37:30 -0000 1.80
***************
*** 93,99 ****
@par Configuration requests
! - PLAYER_LOG_SET_WRITE_STATE
! - PLAYER_LOG_GET_STATE
! - PLAYER_LOG_SET_FILENAME
@par Configuration file options
--- 93,99 ----
@par Configuration requests
! - PLAYER_LOG_REQ_SET_WRITE_STATE
! - PLAYER_LOG_REQ_SET_STATE
! - PLAYER_LOG_REQ_SET_FILENAME
@par Configuration file options
***************
*** 538,542 ****
if(!(msg = device->device->Request(this->InQueue,
PLAYER_MSGTYPE_REQ,
! PLAYER_BUMPER_GET_GEOM,
NULL, 0, NULL, true)))
{
--- 538,542 ----
if(!(msg = device->device->Request(this->InQueue,
PLAYER_MSGTYPE_REQ,
! PLAYER_BUMPER_REQ_GET_GEOM,
NULL, 0, NULL, true)))
{
***************
*** 558,562 ****
if(!(msg = device->device->Request(this->InQueue,
PLAYER_MSGTYPE_REQ,
! PLAYER_IR_POSE,
NULL, 0, NULL, true)))
{
--- 558,562 ----
if(!(msg = device->device->Request(this->InQueue,
PLAYER_MSGTYPE_REQ,
! PLAYER_IR_REQ_POSE,
NULL, 0, NULL, true)))
{
***************
*** 1269,1273 ****
switch(hdr->subtype)
{
! case PLAYER_WSN_DATA:
wdata = (player_wsn_data_t*)data;
fprintf(this->file,"%d %d %d %f %f %f %f %f %f %f %f %f
%f",
--- 1269,1273 ----
switch(hdr->subtype)
{
! case PLAYER_WSN_DATA_STATE:
wdata = (player_wsn_data_t*)data;
fprintf(this->file,"%d %d %d %f %f %f %f %f %f %f %f %f
%f",
***************
*** 1611,1615 ****
for (uint32_t mask(1); mask != (1ul << inputs->count); mask <<= 1)
! fprintf(this->file, "%d ", !!(mask & inputs->digin));
return 0;
--- 1611,1615 ----
for (uint32_t mask(1); mask != (1ul << inputs->count); mask <<= 1)
! fprintf(this->file, "%d ", !!(mask & inputs->bits));
return 0;
***************
*** 1645,1649 ****
// Check the subtype
switch (hdr->subtype) {
! case PLAYER_RFID_DATA: {
player_rfid_data_t* rdata(static_cast<player_rfid_data_t*>(data));
--- 1645,1649 ----
// Check the subtype
switch (hdr->subtype) {
! case PLAYER_RFID_DATA_TAGS: {
player_rfid_data_t* rdata(static_cast<player_rfid_data_t*>(data));
***************
*** 1696,1711 ****
switch(hdr->subtype)
{
! /* case PLAYER_IR_DATA_GEOM:
! // Format:
! // bumper_def_count x0 y0 a0 l0 r0 x1 y1 a1 l1 r1...
! geom = (player_ir_pose_t*)data;
! fprintf(this->file, "%u ", geom->poses_count);
! for(i=0;i<geom->poses_count;i++)
! fprintf(this->file, "%+07.3f %+07.3f %+07.4f ",
! geom->poses[i].px,
! geom->poses[i].py,
! geom->poses[i].pa);
! return(0);
! */
case PLAYER_IR_DATA_RANGES:
// Format:
--- 1696,1700 ----
switch(hdr->subtype)
{
!
case PLAYER_IR_DATA_RANGES:
// Format:
***************
*** 1725,1729 ****
switch(hdr->subtype)
{
! case PLAYER_IR_POSE:
// Format:
// bumper_def_count x0 y0 a0 l0 r0 x1 y1 a1 l1 r1...
--- 1714,1718 ----
switch(hdr->subtype)
{
! case PLAYER_IR_REQ_POSE:
// Format:
// bumper_def_count x0 y0 a0 l0 r0 x1 y1 a1 l1 r1...
***************
*** 1791,1795 ****
switch(hdr->subtype)
{
! case PLAYER_BUMPER_GET_GEOM:
// Format:
// bumper_def_count x0 y0 a0 l0 r0 x1 y1 a1 l1 r1...
--- 1780,1784 ----
switch(hdr->subtype)
{
! case PLAYER_BUMPER_REQ_GET_GEOM:
// Format:
// bumper_def_count x0 y0 a0 l0 r0 x1 y1 a1 l1 r1...
Index: readlog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/readlog.cc,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** readlog.cc 4 Aug 2007 03:12:07 -0000 1.49
--- readlog.cc 20 Aug 2007 06:37:30 -0000 1.50
***************
*** 1849,1853 ****
switch(subtype)
{
! case PLAYER_WSN_DATA:
{
if(token_count < 20)
--- 1849,1853 ----
switch(subtype)
{
! case PLAYER_WSN_DATA_STATE:
{
if(token_count < 20)
***************
*** 2217,2221 ****
inputs.count = atoi(tokens[7]);
! inputs.digin = 0;
if (token_count - 8 != static_cast<int>(inputs.count)) {
--- 2217,2221 ----
inputs.count = atoi(tokens[7]);
! inputs.bits = 0;
if (token_count - 8 != static_cast<int>(inputs.count)) {
***************
*** 2234,2238 ****
for (uint32_t mask(1); mask != (1ul << inputs.count);
mask <<=1, ++t) {
! if (strcmp(*t, "1") == 0) inputs.digin |= mask;
}
--- 2234,2238 ----
for (uint32_t mask(1); mask != (1ul << inputs.count);
mask <<=1, ++t) {
! if (strcmp(*t, "1") == 0) inputs.bits |= mask;
}
***************
*** 2262,2266 ****
case PLAYER_MSGTYPE_DATA:
switch (subtype) {
! case PLAYER_RFID_DATA: {
player_rfid_data_t rdata;
--- 2262,2266 ----
case PLAYER_MSGTYPE_DATA:
switch (subtype) {
! case PLAYER_RFID_DATA_TAGS: {
player_rfid_data_t rdata;
Index: kartowriter.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/kartowriter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kartowriter.cc 4 Aug 2007 03:12:07 -0000 1.3
--- kartowriter.cc 20 Aug 2007 06:37:30 -0000 1.4
***************
*** 55,61 ****
@par Configuration requests
! - PLAYER_LOG_SET_WRITE_STATE
! - PLAYER_LOG_GET_STATE
! - PLAYER_LOG_SET_FILENAME (not yet implemented)
@par Example
--- 55,61 ----
@par Configuration requests
! - PLAYER_LOG_REQ_SET_WRITE_STATE
! - PLAYER_LOG_REQ_GET_STATE
! - PLAYER_LOG_REQ_SET_FILENAME (not yet implemented)
@par Example
Index: dummy.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/dummy.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dummy.cc 5 Jul 2006 16:24:15 -0000 1.17
--- dummy.cc 20 Aug 2007 06:37:30 -0000 1.18
***************
*** 310,314 ****
Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
! PLAYER_WSN_DATA, (void*)&data,
sizeof (data), NULL);
break;
--- 310,314 ----
Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
! PLAYER_WSN_DATA_STATE, (void*)&data,
sizeof (data), NULL);
break;
-------------------------------------------------------------------------
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
