Update of /cvsroot/playerstage/code/player/server/drivers/ranger
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/ranger
Modified Files:
lasertoranger.cc sonartoranger.cc toranger.cc toranger.h
Log Message:
applied Toby's autopointer patches
Index: sonartoranger.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/ranger/sonartoranger.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sonartoranger.cc 11 Aug 2007 00:22:43 -0000 1.3
--- sonartoranger.cc 23 Aug 2007 19:58:47 -0000 1.4
***************
*** 98,106 ****
protected:
// Child message handler, for handling messages from the input
device
! int ProcessMessage (MessageQueue *respQueue, player_msghdr
*hdr, void *data);
// Function called when a property has been changed so it can
be passed on to the input driver
bool PropertyChanged (void);
// Set power state
! int SetPower (MessageQueue *respQueue, player_msghdr *hdr,
uint8_t state);
// Convert sonar geometry to ranger geometry
int ConvertGeom (player_sonar_geom_t *geom);
--- 98,106 ----
protected:
// Child message handler, for handling messages from the input
device
! int ProcessMessage (QueuePointer &respQueue, player_msghdr
*hdr, void *data);
// Function called when a property has been changed so it can
be passed on to the input driver
bool PropertyChanged (void);
// Set power state
! int SetPower (QueuePointer &respQueue, player_msghdr *hdr,
uint8_t state);
// Convert sonar geometry to ranger geometry
int ConvertGeom (player_sonar_geom_t *geom);
***************
*** 254,258 ****
// Publish the data
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_RANGE, reinterpret_cast<void*> (&rangeData), sizeof
(rangeData), NULL);
// Clean up
--- 254,258 ----
// Publish the data
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_RANGER_DATA_RANGE,
reinterpret_cast<void*> (&rangeData), sizeof (rangeData), NULL);
// Clean up
***************
*** 262,266 ****
}
! int SonarToRanger::ProcessMessage (MessageQueue *respQueue, player_msghdr
*hdr, void *data)
{
// Check the parent message handler
--- 262,266 ----
}
! int SonarToRanger::ProcessMessage (QueuePointer &respQueue, player_msghdr
*hdr, void *data)
{
// Check the parent message handler
***************
*** 316,320 ****
if (ConvertGeom (reinterpret_cast<player_sonar_geom_t*> (data))
== 0)
{
! Publish (device_addr, NULL, PLAYER_MSGTYPE_RESP_ACK,
PLAYER_RANGER_REQ_GET_GEOM, reinterpret_cast<void*> (&deviceGeom), sizeof
(deviceGeom), NULL);
return 0;
}
--- 316,320 ----
if (ConvertGeom (reinterpret_cast<player_sonar_geom_t*> (data))
== 0)
{
! Publish (device_addr, PLAYER_MSGTYPE_RESP_ACK,
PLAYER_RANGER_REQ_GET_GEOM, reinterpret_cast<void*> (&deviceGeom), sizeof
(deviceGeom), NULL);
return 0;
}
***************
*** 349,353 ****
if (ConvertGeom (reinterpret_cast<player_sonar_geom_t*> (data))
== 0)
{
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_GEOM, reinterpret_cast<void*> (&deviceGeom), sizeof
(deviceGeom), NULL);
return 0;
}
--- 349,353 ----
if (ConvertGeom (reinterpret_cast<player_sonar_geom_t*> (data))
== 0)
{
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_GEOM, reinterpret_cast<void*> (&deviceGeom), sizeof
(deviceGeom), NULL);
return 0;
}
Index: toranger.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/ranger/toranger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toranger.h 17 Jun 2007 00:28:01 -0000 1.2
--- toranger.h 23 Aug 2007 19:58:47 -0000 1.3
***************
*** 39,43 ****
// Message processor - must be called first by child classes if
overridden
! virtual int ProcessMessage (MessageQueue *resp_queue,
player_msghdr *hdr, void *data);
virtual int Setup (void);
--- 39,43 ----
// Message processor - must be called first by child classes if
overridden
! virtual int ProcessMessage (QueuePointer &resp_queue,
player_msghdr *hdr, void *data);
virtual int Setup (void);
Index: lasertoranger.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/ranger/lasertoranger.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lasertoranger.cc 11 Aug 2007 00:22:43 -0000 1.4
--- lasertoranger.cc 23 Aug 2007 19:58:47 -0000 1.5
***************
*** 100,108 ****
protected:
// Child message handler, for handling messages from the input
device
! int ProcessMessage (MessageQueue *respQueue, player_msghdr
*hdr, void *data);
// Set power state
! int SetPower (MessageQueue *respQueue, player_msghdr *hdr,
uint8_t state);
// Set intensity data state
! int SetIntensity (MessageQueue *respQueue, player_msghdr *hdr,
uint8_t state);
// Convert laser data to ranger data
int ConvertData (player_msghdr *hdr, void *data);
--- 100,108 ----
protected:
// Child message handler, for handling messages from the input
device
! int ProcessMessage (QueuePointer &respQueue, player_msghdr
*hdr, void *data);
// Set power state
! int SetPower (QueuePointer &respQueue, player_msghdr *hdr,
uint8_t state);
// Set intensity data state
! int SetIntensity (QueuePointer &respQueue, player_msghdr *hdr,
uint8_t state);
// Convert laser data to ranger data
int ConvertData (player_msghdr *hdr, void *data);
***************
*** 260,268 ****
// Send off this chunk of data, with pose if necessary
if (pose == NULL)
! Publish (device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_RANGER_DATA_RANGE, reinterpret_cast<void*>
(&rangeData.data), sizeof (rangeData.data), NULL);
else
{
rangeData.geom = deviceGeom;
! Publish (device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_RANGER_DATA_RANGEPOSE, reinterpret_cast<void*>
(&rangeData), sizeof (rangeData), NULL);
}
// Delete the space we allocated for the data
--- 260,268 ----
// Send off this chunk of data, with pose if necessary
if (pose == NULL)
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_RANGE, reinterpret_cast<void*> (&rangeData.data), sizeof
(rangeData.data), NULL);
else
{
rangeData.geom = deviceGeom;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_RANGEPOSE, reinterpret_cast<void*> (&rangeData), sizeof
(rangeData), NULL);
}
// Delete the space we allocated for the data
***************
*** 283,291 ****
// Send off this chunk of data, with pose if necessary
if (pose == NULL)
! Publish (device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_RANGER_DATA_INTNS, reinterpret_cast<void*>
(&intensityData.data), sizeof (intensityData.data), NULL);
else
{
rangeData.geom = deviceGeom;
! Publish (device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_RANGER_DATA_INTNSPOSE, reinterpret_cast<void*>
(&intensityData), sizeof (intensityData), NULL);
}
// Delete the space we allocated for the data
--- 283,291 ----
// Send off this chunk of data, with pose if necessary
if (pose == NULL)
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_INTNS, reinterpret_cast<void*> (&intensityData.data), sizeof
(intensityData.data), NULL);
else
{
rangeData.geom = deviceGeom;
! Publish (device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_RANGER_DATA_INTNSPOSE, reinterpret_cast<void*> (&intensityData), sizeof
(intensityData), NULL);
}
// Delete the space we allocated for the data
***************
*** 328,332 ****
}
! int LaserToRanger::ProcessMessage (MessageQueue *respQueue, player_msghdr
*hdr, void *data)
{
// Check the parent message handler
--- 328,332 ----
}
! int LaserToRanger::ProcessMessage (QueuePointer &respQueue, player_msghdr
*hdr, void *data)
{
// Check the parent message handler
Index: toranger.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/ranger/toranger.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toranger.cc 17 Jun 2007 00:28:01 -0000 1.2
--- toranger.cc 23 Aug 2007 19:58:47 -0000 1.3
***************
*** 84,88 ****
// Message processing
! int ToRanger::ProcessMessage (MessageQueue *respQueue, player_msghdr *hdr,
void *data)
{
// Check for capabilities requests first
--- 84,88 ----
// Message processing
! int ToRanger::ProcessMessage (QueuePointer &respQueue, player_msghdr *hdr,
void *data)
{
// Check for capabilities requests first
-------------------------------------------------------------------------
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
