Update of /cvsroot/playerstage/code/player/utils/pmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7173
Modified Files:
Makefile.am lodo_driver.cc
Log Message:
fixed build of lodo driver
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/player/utils/pmap/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 5 May 2007 11:53:08 -0000 1.4
--- Makefile.am 19 Jul 2007 23:32:13 -0000 1.5
***************
*** 6,10 ****
#if INCLUDE_GLUT
bin_PROGRAMS = pmaptest
! lib_LTLIBRARIES = libpmap.la liblodo.la
#endif
#endif
--- 6,10 ----
#if INCLUDE_GLUT
bin_PROGRAMS = pmaptest
! lib_LTLIBRARIES = libpmap.la liblodo.la liblododriver.la
#endif
#endif
***************
*** 24,27 ****
--- 24,29 ----
pmaptest_LDADD = @GSL_LIBS@ -lpmap -llodo
+ liblododriver_la_SOURCES = lodo_driver.cc
+
doc:
doxygen pmap.dox
Index: lodo_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/utils/pmap/lodo_driver.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lodo_driver.cc 1 May 2006 09:48:52 -0000 1.2
--- lodo_driver.cc 19 Jul 2007 23:32:13 -0000 1.3
***************
*** 182,186 ****
/// @brief Message handler
! public: int ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr,
void *data);
/// Laser offset in robot cs
--- 182,186 ----
/// @brief Message handler
! public: int ProcessMessage (MessageQueue *resp_queue, player_msghdr *hdr,
void *data);
/// Laser offset in robot cs
***************
*** 384,388 ****
! int LodoDriver::ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr,
void *data)
{
pose2_t pose;
--- 384,388 ----
! int LodoDriver::ProcessMessage (MessageQueue * resp_queue, player_msghdr
*hdr, void *data)
{
pose2_t pose;
***************
*** 397,401 ****
laser_data = *reinterpret_cast<player_laser_data_t*> (data);
this->laser_time = hdr->timestamp;
! Publish (out_laser_id, PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&laser_data, sizeof (player_laser_data_t), &laser_time);
// Auto-detect range count and create lodo object
--- 397,401 ----
laser_data = *reinterpret_cast<player_laser_data_t*> (data);
this->laser_time = hdr->timestamp;
! Publish (out_laser_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_LASER_DATA_SCAN,
&laser_data, sizeof (player_laser_data_t), &laser_time);
// Auto-detect range count and create lodo object
***************
*** 447,451 ****
this->out_position2d_data.pos.py = this->robot_pose.pos.y;
this->out_position2d_data.pos.pa = this->robot_pose.rot;
! Publish (out_position2d_id, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, &out_position2d_data, sizeof
(player_position2d_data_t), &laser_time);
return 0;
--- 447,451 ----
this->out_position2d_data.pos.py = this->robot_pose.pos.y;
this->out_position2d_data.pos.pa = this->robot_pose.rot;
! Publish (out_position2d_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE, &out_position2d_data, sizeof
(player_position2d_data_t), &laser_time);
return 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
