Update of /cvsroot/playerstage/code/player/server/drivers/laser
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/laser
Modified Files:
RS4LeuzeLaserDriver.cc lasercspace.cc lasercutter.cc
laserposeinterpolator.cc laserrescan.cc lasertransform.cc
lasertransform.h pbs_driver.cc sicklms200.cc sicklms400.cc
sickpls.cc sicks3000.cc urglaserdriver.cc
Log Message:
applied Toby's autopointer patches
Index: sicks3000.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/sicks3000.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sicks3000.cc 9 Jul 2007 17:18:00 -0000 1.3
--- sicks3000.cc 23 Aug 2007 19:58:44 -0000 1.4
***************
*** 143,147 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 143,147 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 360,364 ****
int
! SickS3000::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 360,364 ----
int
! SickS3000::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 697,701 ****
this->Publish(this->device_addr,
- NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
--- 697,700 ----
Index: pbs_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/pbs_driver.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pbs_driver.cc 31 Jul 2007 08:33:45 -0000 1.1
--- pbs_driver.cc 23 Aug 2007 19:58:44 -0000 1.2
***************
*** 118,122 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 118,122 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 300,304 ****
/// Process messages
! int PBSDriver::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 300,304 ----
/// Process messages
! int PBSDriver::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 656,660 ****
data_packet.id ++;
this->Publish(this->device_addr,
- NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
--- 656,659 ----
Index: urglaserdriver.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/laser/urglaserdriver.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** urglaserdriver.cc 9 Jul 2007 17:18:00 -0000 1.12
--- urglaserdriver.cc 23 Aug 2007 19:58:44 -0000 1.13
***************
*** 128,132 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 128,132 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 282,286 ****
////////////////////////////////////////////////////////////////////////////////
int
! URGLaserDriver::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 282,286 ----
////////////////////////////////////////////////////////////////////////////////
int
! URGLaserDriver::ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 344,348 ****
Data.ranges[i] /= 1000;
}
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&Data, sizeof(player_laser_data_t), NULL);
--- 344,348 ----
Data.ranges[i] /= 1000;
}
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&Data, sizeof(player_laser_data_t), NULL);
Index: sicklms200.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/sicklms200.cc,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** sicklms200.cc 16 Jul 2007 02:46:04 -0000 1.62
--- sicklms200.cc 23 Aug 2007 19:58:44 -0000 1.63
***************
*** 181,185 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 181,185 ----
// MessageHandler
! int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 532,536 ****
int
! SickLMS200::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 532,536 ----
int
! SickLMS200::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 736,740 ****
// Make data available
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&data, sizeof(data), &time);
--- 736,740 ----
// Make data available
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&data, sizeof(data), &time);
Index: lasercutter.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/lasercutter.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lasercutter.cc 20 Aug 2007 06:37:27 -0000 1.2
--- lasercutter.cc 23 Aug 2007 19:58:44 -0000 1.3
***************
*** 184,188 ****
}
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&this->data, sizeof(this->data), NULL);
--- 184,188 ----
}
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&this->data, sizeof(this->data), NULL);
Index: laserposeinterpolator.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/laser/laserposeinterpolator.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** laserposeinterpolator.cc 9 Jul 2007 17:17:59 -0000 1.14
--- laserposeinterpolator.cc 23 Aug 2007 19:58:44 -0000 1.15
***************
*** 145,149 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 145,149 ----
// MessageHandler
! int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 282,286 ****
int
! LaserPoseInterp::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 282,286 ----
int
! LaserPoseInterp::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 303,307 ****
scanpose.scan = *((player_laser_data_t*)data);
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCANPOSE,
(void*)&scanpose, sizeof(scanpose), &hdr->timestamp);
--- 303,307 ----
scanpose.scan = *((player_laser_data_t*)data);
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCANPOSE,
(void*)&scanpose, sizeof(scanpose), &hdr->timestamp);
***************
*** 375,379 ****
this->update_interval)))
{
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCANPOSE,
(void*)&scanpose, sizeof(scanpose),
--- 375,379 ----
this->update_interval)))
{
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCANPOSE,
(void*)&scanpose, sizeof(scanpose),
Index: RS4LeuzeLaserDriver.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/laser/RS4LeuzeLaserDriver.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RS4LeuzeLaserDriver.cc 22 Aug 2007 00:19:56 -0000 1.1
--- RS4LeuzeLaserDriver.cc 23 Aug 2007 19:58:44 -0000 1.2
***************
*** 166,170 ****
//handling request and commands(4)
// This method will be invoked on each incoming message
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 166,170 ----
//handling request and commands(4)
// This method will be invoked on each incoming message
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 341,345 ****
! int RS4LeuzeLaserDriver::ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 341,345 ----
! int RS4LeuzeLaserDriver::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 416,420 ****
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
&Data, sizeof(player_laser_data_t), NULL);
//cout << endl << "Data RS4leuze passed ";
--- 416,420 ----
! Publish(device_addr, PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
&Data, sizeof(player_laser_data_t), NULL);
//cout << endl << "Data RS4leuze passed ";
Index: lasertransform.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/laser/lasertransform.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lasertransform.cc 20 Sep 2005 05:53:46 -0000 1.1
--- lasertransform.cc 23 Aug 2007 19:58:44 -0000 1.2
***************
*** 68,72 ****
return(-1);
}
-
return 0;
}
--- 68,71 ----
***************
*** 85,89 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserTransform::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 84,88 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int LaserTransform::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
Index: laserrescan.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/laserrescan.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** laserrescan.cc 20 Aug 2007 06:37:27 -0000 1.7
--- laserrescan.cc 23 Aug 2007 19:58:44 -0000 1.8
***************
*** 191,195 ****
}
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&this->data, sizeof(this->data), NULL);
--- 191,195 ----
}
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&this->data, sizeof(this->data), NULL);
Index: sicklms400.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/sicklms400.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sicklms400.cc 9 Jul 2007 17:18:00 -0000 1.2
--- sicklms400.cc 23 Aug 2007 19:58:44 -0000 1.3
***************
*** 197,201 ****
// MessageHandler
! int ProcessMessage (MessageQueue* resp_queue,
player_msghdr* hdr,
void* data);
--- 197,201 ----
// MessageHandler
! int ProcessMessage (QueuePointer &resp_queue,
player_msghdr* hdr,
void* data);
***************
*** 386,390 ****
// ProcessMessage
int
! SickLMS400::ProcessMessage (MessageQueue* resp_queue,
player_msghdr* hdr,
void* data)
--- 386,390 ----
// ProcessMessage
int
! SickLMS400::ProcessMessage (QueuePointer &resp_queue,
player_msghdr* hdr,
void* data)
***************
*** 670,674 ****
if (data.ranges_count != (unsigned int)-1)
// Make data available
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
&data, sizeof (data), NULL);
}
--- 670,674 ----
if (data.ranges_count != (unsigned int)-1)
// Make data available
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&data, sizeof (data), NULL);
}
Index: lasertransform.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/laser/lasertransform.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lasertransform.h 20 Sep 2005 05:53:46 -0000 1.1
--- lasertransform.h 23 Aug 2007 19:58:44 -0000 1.2
***************
*** 50,54 ****
// MessageHandler
! public: virtual int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 50,54 ----
// MessageHandler
! public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
Index: lasercspace.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/lasercspace.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** lasercspace.cc 16 Nov 2005 00:56:01 -0000 1.23
--- lasercspace.cc 23 Aug 2007 19:58:44 -0000 1.24
***************
*** 187,191 ****
this->data.ranges[i] = this->FreeRange(data,i);
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&this->data, sizeof(this->data), NULL);
--- 187,191 ----
this->data.ranges[i] = this->FreeRange(data,i);
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&this->data, sizeof(this->data), NULL);
Index: sickpls.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/laser/sickpls.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** sickpls.cc 20 Aug 2007 06:37:27 -0000 1.12
--- sickpls.cc 23 Aug 2007 19:58:44 -0000 1.13
***************
*** 178,182 ****
// MessageHandler
! int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 178,182 ----
// MessageHandler
! int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 538,542 ****
// Make data available
! this->Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&data, sizeof(data), NULL);
--- 538,542 ----
// Make data available
! this->Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
(void*)&data, sizeof(data), NULL);
***************
*** 550,554 ****
// Process an incoming message
int
! SickPLS::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 550,554 ----
// Process an incoming message
int
! SickPLS::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
-------------------------------------------------------------------------
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
