Menu
▾
▴
gearbox-commit — Commit messages to the Gearbox SVN repository.
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
(58) |
Mar
(15) |
Apr
(23) |
May
(8) |
Jun
(92) |
Jul
(66) |
Aug
(6) |
Sep
(9) |
Oct
(44) |
Nov
(8) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(10) |
Feb
(8) |
Mar
(2) |
Apr
(8) |
May
(19) |
Jun
(11) |
Jul
(8) |
Aug
(6) |
Sep
(5) |
Oct
(4) |
Nov
(26) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(3) |
Mar
(4) |
Apr
(3) |
May
(4) |
Jun
|
Jul
(1) |
Aug
(16) |
Sep
(7) |
Oct
(3) |
Nov
(7) |
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gb...@us...> - 2010-01-28 02:49:39
|
Revision: 483
http://gearbox.svn.sourceforge.net/gearbox/?rev=483&view=rev
Author: gbiggs
Date: 2010-01-28 02:49:29 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Re-licensed hokuyo_aist under the EPL as per AIST regulations.
Modified Paths:
--------------
gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
gearbox/trunk/src/hokuyo_aist/doc.dox
gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
gearbox/trunk/src/hokuyo_aist/test/example.cpp
Modified: gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2010-01-28 02:41:45 UTC (rev 482)
+++ gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2010-01-28 02:49:29 UTC (rev 483)
@@ -1,7 +1,7 @@
set (libName hokuyo_aist)
set (libDesc "Hokuyo laser scanner driver")
set (libVersion 1.0.0)
-GBX_ADD_LICENSE (LGPL3)
+GBX_ADD_LICENSE (EPL1.0)
set (build TRUE)
GBX_REQUIRE_OPTION (build LIB ${libName} ON)
Modified: gearbox/trunk/src/hokuyo_aist/doc.dox
===================================================================
--- gearbox/trunk/src/hokuyo_aist/doc.dox 2010-01-28 02:41:45 UTC (rev 482)
+++ gearbox/trunk/src/hokuyo_aist/doc.dox 2010-01-28 02:49:29 UTC (rev 483)
@@ -47,7 +47,7 @@
Geoffrey Biggs
@par License
- LGPL
+ EPL1.0 (http://www.opensource.org/licenses/eclipse-1.0.txt)
@par Dependencies
@ref Flexiport
Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2010-01-28 02:41:45 UTC (rev 482)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2010-01-28 02:49:29 UTC (rev 483)
@@ -13,16 +13,8 @@
*
* This file is part of hokuyo_aist.
*
- * hokuyo_aist is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * hokuyo_aist is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with hokuyo_aist.
- * If not, see <http://www.gnu.org/licenses/>.
+ * This software is licensed under the Eclipse Public License -v 1.0 (EPL). See
+ * http://www.opensource.org/licenses/eclipse-1.0.txt
*/
#include "hokuyo_aist.h"
Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h 2010-01-28 02:41:45 UTC (rev 482)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h 2010-01-28 02:49:29 UTC (rev 483)
@@ -13,16 +13,8 @@
*
* This file is part of hokuyo_aist.
*
- * hokuyo_aist is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * hokuyo_aist is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with hokuyo_aist.
- * If not, see <http://www.gnu.org/licenses/>.
+ * This software is licensed under the Eclipse Public License -v 1.0 (EPL). See
+ * http://www.opensource.org/licenses/eclipse-1.0.txt
*/
#ifndef __HOKUYO_AIST_H
Modified: gearbox/trunk/src/hokuyo_aist/test/example.cpp
===================================================================
--- gearbox/trunk/src/hokuyo_aist/test/example.cpp 2010-01-28 02:41:45 UTC (rev 482)
+++ gearbox/trunk/src/hokuyo_aist/test/example.cpp 2010-01-28 02:49:29 UTC (rev 483)
@@ -13,16 +13,8 @@
*
* This file is part of hokuyo_aist.
*
- * hokuyo_aist is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * hokuyo_aist is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with hokuyo_aist.
- * If not, see <http://www.gnu.org/licenses/>.
+ * This software is licensed under the Eclipse Public License -v 1.0 (EPL). See
+ * http://www.opensource.org/licenses/eclipse-1.0.txt
*/
#include <stdio.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gb...@us...> - 2010-01-28 02:31:22
|
Revision: 481
http://gearbox.svn.sourceforge.net/gearbox/?rev=481&view=rev
Author: gbiggs
Date: 2010-01-28 02:29:51 +0000 (Thu, 28 Jan 2010)
Log Message:
-----------
Updated AIST registration number
Modified Paths:
--------------
gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
gearbox/trunk/src/hokuyo_aist/test/example.cpp
Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2010-01-25 07:05:25 UTC (rev 480)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2010-01-28 02:29:51 UTC (rev 481)
@@ -9,7 +9,7 @@
* this distribution.
*
* This work is a product of the National Institute of Advanced Industrial Science and Technology,
- * Japan. Registration number: H20PRO-880
+ * Japan. Registration number: H22PRO-1086.
*
* This file is part of hokuyo_aist.
*
Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h 2010-01-25 07:05:25 UTC (rev 480)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.h 2010-01-28 02:29:51 UTC (rev 481)
@@ -9,7 +9,7 @@
* this distribution.
*
* This work is a product of the National Institute of Advanced Industrial Science and Technology,
- * Japan. Registration number: H20PRO-880
+ * Japan. Registration number: H22PRO-1086.
*
* This file is part of hokuyo_aist.
*
Modified: gearbox/trunk/src/hokuyo_aist/test/example.cpp
===================================================================
--- gearbox/trunk/src/hokuyo_aist/test/example.cpp 2010-01-25 07:05:25 UTC (rev 480)
+++ gearbox/trunk/src/hokuyo_aist/test/example.cpp 2010-01-28 02:29:51 UTC (rev 481)
@@ -9,7 +9,7 @@
* this distribution.
*
* This work is a product of the National Institute of Advanced Industrial Science and Technology,
- * Japan. Registration number: H20PRO-880
+ * Japan. Registration number: H22PRO-1086.
*
* This file is part of hokuyo_aist.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <war...@us...> - 2010-01-25 07:05:32
|
Revision: 480
http://gearbox.svn.sourceforge.net/gearbox/?rev=480&view=rev
Author: warren89
Date: 2010-01-25 07:05:25 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
Added additional tracer debugging and improved NMEA device handling to gbxgarminacfr driver
Modified Paths:
--------------
gearbox/trunk/src/gbxgarminacfr/driver.cpp
gearbox/trunk/src/gbxgarminacfr/driver.h
Modified: gearbox/trunk/src/gbxgarminacfr/driver.cpp
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/driver.cpp 2010-01-07 06:26:50 UTC (rev 479)
+++ gearbox/trunk/src/gbxgarminacfr/driver.cpp 2010-01-25 07:05:25 UTC (rev 480)
@@ -339,12 +339,18 @@
void
Driver::enableDevice()
{
- tracer_.info("Configure GPS device");
+ stringstream ss;
+ ss << "Configure GPS device. Protocol: " << config_.protocol;
+ tracer_.info(ss.str());
+ // Non-Garmin devices do not support message enabling and disabling
+ if (config_.protocol != "Garmin") return;
+
//Create the messages that we are going to send and add the checksums
//Note that the checksum field is filled with 'x's before we start
//First disables all output messages then enable selected ones only.
+ tracer_.debug( "Driver::enableDevice(): calling disableAllMsg", 10 );
gbxgpsutilacfr::NmeaMessage disableAllMsg( "$PGRMO,,2*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( disableAllMsg.sentence() );
@@ -352,20 +358,24 @@
sleep(1);
if ( config_.readGga ) {
+ tracer_.debug( "Driver::enableDevice(): calling enableGgaMsg", 10 );
gbxgpsutilacfr::NmeaMessage enableGgaMsg( "$PGRMO,GPGGA,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( enableGgaMsg.sentence() );
}
if ( config_.readVtg ) {
+ tracer_.debug( "Driver::enableDevice(): calling enableVtgMsg", 10 );
gbxgpsutilacfr::NmeaMessage enableVtgMsg( "$PGRMO,GPVTG,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( enableVtgMsg.sentence() );
}
if ( config_.readRme ) {
+ tracer_.debug( "Driver::enableDevice(): calling enableRmeMsg", 10 );
gbxgpsutilacfr::NmeaMessage enableRmeMsg( "$PGRMO,PGRME,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( enableRmeMsg.sentence() );
}
if ( config_.readRmc ) {
+ tracer_.debug( "Driver::enableDevice(): calling enableRmcMsg", 10 );
gbxgpsutilacfr::NmeaMessage enableRmcMsg( "$PGRMO,GPRMC,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( enableRmcMsg.sentence() );
}
@@ -524,7 +534,7 @@
if ( config_.readRmc )
tracer_.debug("got GPRMC message",4);
else
- throw gbxutilacfr::Exception( ERROR_INFO, "got unexpected PGRMC message" );
+ throw gbxutilacfr::Exception( ERROR_INFO, "got unexpected GPRMC message" );
genericData.reset( extractRmcData( nmeaMessage, now.tv_sec, now.tv_usec ) );
if ( genericData.get() )
break;
Modified: gearbox/trunk/src/gbxgarminacfr/driver.h
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/driver.h 2010-01-07 06:26:50 UTC (rev 479)
+++ gearbox/trunk/src/gbxgarminacfr/driver.h 2010-01-25 07:05:25 UTC (rev 480)
@@ -39,6 +39,9 @@
//! Serial device. e.g. "/dev/ttyS0"
std::string device;
+ //! Serial Protocol: Garmin or NMEA
+ std::string protocol;
+
//! Read GPGGA sentence
bool readGga;
//! Read GPVTG sentence
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gb...@us...> - 2010-01-07 06:27:00
|
Revision: 479
http://gearbox.svn.sourceforge.net/gearbox/?rev=479&view=rev
Author: gbiggs
Date: 2010-01-07 06:26:50 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
Updates to make the components compile again
Modified Paths:
--------------
openrtm/trunk/flexiport/flexiport.hh
openrtm/trunk/flexiport/flexiportDynSK.cc
openrtm/trunk/flexiport/flexiportSK.cc
openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp
openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp
openrtm/trunk/hokuyo_aist/hokuyo_aist.h
openrtm/trunk/hokuyo_aist/hokuyo_aist.hh
openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc
openrtm/trunk/hokuyo_aist/hokuyo_aistSK.cc
Modified: openrtm/trunk/flexiport/flexiport.hh
===================================================================
--- openrtm/trunk/flexiport/flexiport.hh 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiport.hh 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,15 +1,14 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#ifndef __flexiport_hh__
#define __flexiport_hh__
-#ifndef USE_omniORB_logStream
-#define USE_omniORB_logStream
-#endif
-
#ifndef __CORBA_H_EXTERNAL_GUARD__
#include <omniORB4/CORBA.h>
#endif
+#ifndef USE_stub_in_nt_dll
+# define USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+#endif
#ifndef USE_core_stub_in_nt_dll
# define USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
#endif
@@ -23,13 +22,13 @@
#ifdef USE_stub_in_nt_dll
-#ifndef USE_core_stub_in_nt_dll
-#define USE_core_stub_in_nt_dll
+# ifndef USE_core_stub_in_nt_dll
+# define USE_core_stub_in_nt_dll
+# endif
+# ifndef USE_dyn_stub_in_nt_dll
+# define USE_dyn_stub_in_nt_dll
+# endif
#endif
-#ifndef USE_dyn_stub_in_nt_dll
-#define USE_dyn_stub_in_nt_dll
-#endif
-#endif
#ifdef _core_attr
# error "A local CPP macro _core_attr has already been defined."
@@ -82,6 +81,7 @@
#endif
+// interface flexiport_intf
class flexiport_intf {
public:
// Declarations for this interface type.
@@ -89,8 +89,9 @@
typedef flexiport_intf_var _var_type;
static _ptr_type _duplicate(_ptr_type);
- static _ptr_type _narrow(CORBA::Object_ptr);
- static _ptr_type _unchecked_narrow(CORBA::Object_ptr);
+ static _ptr_type _narrow(::CORBA::Object_ptr);
+ static _ptr_type _unchecked_narrow(::CORBA::Object_ptr);
+
static _ptr_type _nil();
static inline void _marshalObjRef(_ptr_type, cdrStream&);
@@ -106,10 +107,10 @@
static _core_attr const char* _PD_repoId;
// Other IDL defined within this scope.
- class PortException : public CORBA::UserException {
+ class PortException : public ::CORBA::UserException {
public:
- CORBA::String_member errorStr;
+ ::CORBA::String_member errorStr;
@@ -122,9 +123,9 @@
PortException& operator=(const PortException&);
virtual ~PortException();
virtual void _raise() const;
- static PortException* _downcast(CORBA::Exception*);
- static const PortException* _downcast(const CORBA::Exception*);
- static inline PortException* _narrow(CORBA::Exception* _e) {
+ static PortException* _downcast(::CORBA::Exception*);
+ static const PortException* _downcast(const ::CORBA::Exception*);
+ static inline PortException* _narrow(::CORBA::Exception* _e) {
return _downcast(_e);
}
@@ -134,7 +135,7 @@
static _core_attr insertExceptionToAny insertToAnyFn;
static _core_attr insertExceptionToAnyNCP insertToAnyFnNCP;
- virtual CORBA::Exception* _NP_duplicate() const;
+ virtual ::CORBA::Exception* _NP_duplicate() const;
static _core_attr const char* _PD_repoId;
static _core_attr const char* _PD_typeId;
@@ -145,21 +146,22 @@
virtual void _NP_marshal(cdrStream&) const;
};
- static _dyn_attr const CORBA::TypeCode_ptr _tc_PortException;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_PortException;
};
class _objref_flexiport_intf :
- public virtual CORBA::Object, public virtual omniObjRef
+ public virtual ::CORBA::Object,
+ public virtual omniObjRef
{
public:
void Flush();
void Drain();
char* GetStatus();
char* GetPortType();
- CORBA::Boolean IsBlocking();
- CORBA::Boolean IsOpen();
+ ::CORBA::Boolean IsBlocking();
+ ::CORBA::Boolean IsOpen();
inline _objref_flexiport_intf() { _PR_setobj(0); } // nil
_objref_flexiport_intf(omniIOR*, omniIdentity*);
@@ -197,8 +199,8 @@
virtual void Drain() = 0;
virtual char* GetStatus() = 0;
virtual char* GetPortType() = 0;
- virtual CORBA::Boolean IsBlocking() = 0;
- virtual CORBA::Boolean IsOpen() = 0;
+ virtual ::CORBA::Boolean IsBlocking() = 0;
+ virtual ::CORBA::Boolean IsOpen() = 0;
public: // Really protected, workaround for xlC
virtual _CORBA_Boolean _dispatch(omniCallHandle&);
@@ -206,16 +208,17 @@
private:
virtual void* _ptrToInterface(const char*);
virtual const char* _mostDerivedRepoId();
+
};
-_CORBA_GLOBAL_VAR _dyn_attr const CORBA::TypeCode_ptr _tc_flexiport_intf;
+_CORBA_GLOBAL_VAR _dyn_attr const ::CORBA::TypeCode_ptr _tc_flexiport_intf;
class POA_flexiport_intf :
public virtual _impl_flexiport_intf,
- public virtual PortableServer::ServantBase
+ public virtual ::PortableServer::ServantBase
{
public:
virtual ~POA_flexiport_intf();
@@ -229,16 +232,18 @@
+
+
#undef _core_attr
#undef _dyn_attr
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException& _s);
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException* _sp);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, const flexiport_intf::PortException*& _sp);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException& _s);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException* _sp);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const flexiport_intf::PortException*& _sp);
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr _s);
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr* _s);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, flexiport_intf_ptr& _s);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr _s);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr* _s);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, flexiport_intf_ptr& _s);
@@ -250,6 +255,10 @@
+#ifdef USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+# undef USE_stub_in_nt_dll
+# undef USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+#endif
#ifdef USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
# undef USE_core_stub_in_nt_dll
# undef USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
Modified: openrtm/trunk/flexiport/flexiportDynSK.cc
===================================================================
--- openrtm/trunk/flexiport/flexiportDynSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiportDynSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,93 +1,78 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend) - omniORB_4_1. Do not edit.
#include "flexiport.hh"
-#include <omniORB4/tcDescriptor.h>
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_dyn_library_version = omniORB_4_0;
+static const char* _0RL_dyn_library_version = omniORB_4_1_dyn;
+static ::CORBA::TypeCode::_Tracker _0RL_tcTrack(__FILE__);
+
static CORBA::PR_structMember _0RL_structmember_flexiport__intf_mPortException[] = {
- {"errorStr", CORBA::TypeCode::PR_string_tc(0)}
+ {"errorStr", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)}
};
-static CORBA::TypeCode_ptr _0RL_tc_flexiport__intf_mPortException = CORBA::TypeCode::PR_exception_tc("IDL:flexiport_intf/PortException:1.0", "PortException", _0RL_structmember_flexiport__intf_mPortException, 1);
+static CORBA::TypeCode_ptr _0RL_tc_flexiport__intf_mPortException = CORBA::TypeCode::PR_exception_tc("IDL:flexiport_intf/PortException:1.0", "PortException", _0RL_structmember_flexiport__intf_mPortException, 1, &_0RL_tcTrack);
const CORBA::TypeCode_ptr flexiport_intf::_tc_PortException = _0RL_tc_flexiport__intf_mPortException;
-const CORBA::TypeCode_ptr _tc_flexiport_intf = CORBA::TypeCode::PR_interface_tc("IDL:flexiport_intf:1.0", "flexiport_intf");
+const CORBA::TypeCode_ptr _tc_flexiport_intf = CORBA::TypeCode::PR_interface_tc("IDL:flexiport_intf:1.0", "flexiport_intf", &_0RL_tcTrack);
- CORBA::Boolean
-_0RL_tcParser_getMemberDesc_flexiport__intf_mPortException(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cstring(_newdesc, ((flexiport_intf::PortException*)_desc->opq_struct)->errorStr);
- return 1;
- default:
- return 0;
- };
+static void _0RL_flexiport__intf_mPortException_marshal_fn(cdrStream& _s, void* _v)
+{
+ const flexiport_intf::PortException* _p = (const flexiport_intf::PortException*)_v;
+ *_p >>= _s;
}
- CORBA::ULong
-
-_0RL_tcParser_getMemberCount_flexiport__intf_mPortException(const tcStructDesc *_desc)
+static void _0RL_flexiport__intf_mPortException_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return 1;
+ flexiport_intf::PortException* _p = new flexiport_intf::PortException;
+ *_p <<= _s;
+ _v = _p;
}
-
-void _0RL_buildDesc_cflexiport__intf_mPortException(tcDescriptor &_desc, const flexiport_intf::PortException& _data)
+static void _0RL_flexiport__intf_mPortException_destructor_fn(void* _v)
{
- _desc.p_struct.getMemberDesc = _0RL_tcParser_getMemberDesc_flexiport__intf_mPortException;
- _desc.p_struct.getMemberCount = _0RL_tcParser_getMemberCount_flexiport__intf_mPortException;
- _desc.p_struct.opq_struct = (void *)&_data;
+ flexiport_intf::PortException* _p = (flexiport_intf::PortException*)_v;
+ delete _p;
}
-void _0RL_delete_flexiport__intf_mPortException(void* _data) {
- flexiport_intf::PortException* _0RL_t = (flexiport_intf::PortException*) _data;
- delete _0RL_t;
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException& _s)
+{
+ flexiport_intf::PortException* _p = new flexiport_intf::PortException(_s);
+ _a.PR_insert(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ _p);
}
-
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException& _s) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, _s);
- _a.PR_packFrom(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException* _sp)
+{
+ _a.PR_insert(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ (flexiport_intf::PortException*)_sp);
}
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException* _sp) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, *_sp);
- _a.PR_packFrom(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc);
- delete (flexiport_intf::PortException *)_sp;
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a,const flexiport_intf::PortException*& _sp) {
- _sp = (flexiport_intf::PortException *) _a.PR_getCachedData();
- if (_sp == 0) {
- tcDescriptor _0RL_tcdesc;
- _sp = new flexiport_intf::PortException;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, *_sp);
- if (_a.PR_unpackTo(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc)) {
- ((CORBA::Any *)&_a)->PR_setCachedData((void*)_sp, _0RL_delete_flexiport__intf_mPortException);
- return 1;
- } else {
- delete (flexiport_intf::PortException *)_sp;_sp = 0;
- return 0;
- }
- } else {
- CORBA::TypeCode_var _0RL_tctmp = _a.type();
- if (_0RL_tctmp->equivalent(_0RL_tc_flexiport__intf_mPortException)) return 1;
- delete (flexiport_intf::PortException *)_sp;_sp = 0;
- return 0;
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, const flexiport_intf::PortException*& _sp)
+{
+ void* _v;
+ if (_a.PR_extract(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_unmarshal_fn,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ _v)) {
+ _sp = (const flexiport_intf::PortException*)_v;
+ return 1;
}
+ return 0;
}
-static void _0RL_insertToAny__cflexiport__intf_mPortException(CORBA::Any& _a,const CORBA::Exception& _e) {
+static void _0RL_insertToAny__cflexiport__intf_mPortException(::CORBA::Any& _a, const ::CORBA::Exception& _e) {
const flexiport_intf::PortException & _ex = (const flexiport_intf::PortException &) _e;
operator<<=(_a,_ex);
}
-static void _0RL_insertToAnyNCP__cflexiport__intf_mPortException (CORBA::Any& _a,const CORBA::Exception* _e) {
- const flexiport_intf::PortException * _ex = (const flexiport_intf::PortException *) _e;
+static void _0RL_insertToAnyNCP__cflexiport__intf_mPortException (::CORBA::Any& _a, const ::CORBA::Exception* _e) {
+ const flexiport_intf::PortException* _ex = (const flexiport_intf::PortException*) _e;
operator<<=(_a,_ex);
}
@@ -100,71 +85,55 @@
};
static _0RL_insertToAny_Singleton__cflexiport__intf_mPortException _0RL_insertToAny_Singleton__cflexiport__intf_mPortException_;
-static void
-_0RL_tcParser_setObjectPtr_flexiport__intf(const tcObjrefDesc *_desc, CORBA::Object_ptr _ptr)
+static void _0RL_flexiport__intf_marshal_fn(cdrStream& _s, void* _v)
{
- flexiport_intf_ptr _p = flexiport_intf::_narrow(_ptr);
- flexiport_intf_ptr* pp = (flexiport_intf_ptr*)_desc->opq_objref;
- if (_desc->opq_release && !CORBA::is_nil(*pp)) CORBA::release(*pp);
- *pp = _p;
- CORBA::release(_ptr);
+ omniObjRef* _o = (omniObjRef*)_v;
+ omniObjRef::_marshal(_o, _s);
}
-
-static CORBA::Object_ptr
-_0RL_tcParser_getObjectPtr_flexiport__intf(const tcObjrefDesc *_desc)
+static void _0RL_flexiport__intf_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return (CORBA::Object_ptr) *((flexiport_intf_ptr*)_desc->opq_objref);
+ omniObjRef* _o = omniObjRef::_unMarshal(flexiport_intf::_PD_repoId, _s);
+ _v = _o;
}
-
-void _0RL_buildDesc_cflexiport__intf(tcDescriptor& _desc, const _CORBA_ObjRef_tcDesc_arg< _objref_flexiport_intf, flexiport_intf_Helper> & _d)
+static void _0RL_flexiport__intf_destructor_fn(void* _v)
{
- _desc.p_objref.opq_objref = (void*) &_d._data;
- _desc.p_objref.opq_release = _d._rel;
- _desc.p_objref.setObjectPtr = _0RL_tcParser_setObjectPtr_flexiport__intf;
- _desc.p_objref.getObjectPtr = _0RL_tcParser_getObjectPtr_flexiport__intf;
+ omniObjRef* _o = (omniObjRef*)_v;
+ if (_o)
+ omni::releaseObjRef(_o);
}
-void _0RL_delete_flexiport__intf(void* _data) {
- CORBA::release((flexiport_intf_ptr) _data);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr _o)
+{
+ flexiport_intf_ptr _no = flexiport_intf::_duplicate(_o);
+ _a.PR_insert(_tc_flexiport_intf,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ _no->_PR_getobj());
}
-
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr _s) {
- tcDescriptor tcd;
- _CORBA_ObjRef_tcDesc_arg< _objref_flexiport_intf, flexiport_intf_Helper> tmp(_s,0);
- _0RL_buildDesc_cflexiport__intf(tcd, tmp);
- _a.PR_packFrom(_tc_flexiport_intf, &tcd);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr* _op)
+{
+ _a.PR_insert(_tc_flexiport_intf,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ (*_op)->_PR_getobj());
+ *_op = flexiport_intf::_nil();
}
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr* _sp) {
- _a <<= *_sp;
- CORBA::release(*_sp);
- *_sp = flexiport_intf::_nil();
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a, flexiport_intf_ptr& _s) {
- flexiport_intf_ptr sp = (flexiport_intf_ptr) _a.PR_getCachedData();
- if (sp == 0) {
- tcDescriptor tcd;
- flexiport_intf_var tmp;
- _0RL_buildDesc_cflexiport__intf(tcd, tmp);
- if( _a.PR_unpackTo(_tc_flexiport_intf, &tcd) ) {
- if (!omniORB::omniORB_27_CompatibleAnyExtraction) {
- ((CORBA::Any*)&_a)->PR_setCachedData((void*)(flexiport_intf_ptr)tmp,_0RL_delete_flexiport__intf);
- }
- _s = tmp._retn();
- return 1;
- } else {
- _s = flexiport_intf::_nil(); return 0;
- }
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, flexiport_intf_ptr& _o)
+{
+ void* _v;
+ if (_a.PR_extract(_tc_flexiport_intf,
+ _0RL_flexiport__intf_unmarshal_fn,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ _v)) {
+ omniObjRef* _r = (omniObjRef*)_v;
+ if (_r)
+ _o = (flexiport_intf_ptr)_r->_ptrToObjRef(flexiport_intf::_PD_repoId);
+ else
+ _o = flexiport_intf::_nil();
+ return 1;
}
- else {
- CORBA::TypeCode_var tc = _a.type();
- if (tc->equivalent(_tc_flexiport_intf)) {
- _s = sp; return 1;
- }
- else {
- _s = flexiport_intf::_nil(); return 0;
- }
- }
+ return 0;
}
Modified: openrtm/trunk/flexiport/flexiportSK.cc
===================================================================
--- openrtm/trunk/flexiport/flexiportSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiportSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,4 +1,4 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#include "flexiport.hh"
#include <omniORB4/IOP_S.h>
@@ -10,14 +10,14 @@
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_library_version = omniORB_4_0;
+static const char* _0RL_library_version = omniORB_4_1;
-CORBA::Exception::insertExceptionToAny flexiport_intf::PortException::insertToAnyFn = 0;
-CORBA::Exception::insertExceptionToAnyNCP flexiport_intf::PortException::insertToAnyFnNCP = 0;
+::CORBA::Exception::insertExceptionToAny flexiport_intf::PortException::insertToAnyFn = 0;
+::CORBA::Exception::insertExceptionToAnyNCP flexiport_intf::PortException::insertToAnyFnNCP = 0;
-flexiport_intf::PortException::PortException(const flexiport_intf::PortException& _s) : CORBA::UserException(_s)
+flexiport_intf::PortException::PortException(const flexiport_intf::PortException& _s) : ::CORBA::UserException(_s)
{
errorStr = _s.errorStr;
@@ -35,7 +35,7 @@
flexiport_intf::PortException& flexiport_intf::PortException::operator=(const flexiport_intf::PortException& _s)
{
- ((CORBA::UserException*) this)->operator=(_s);
+ ((::CORBA::UserException*) this)->operator=(_s);
errorStr = _s.errorStr;
return *this;
@@ -48,15 +48,15 @@
const char* flexiport_intf::PortException::_PD_repoId = "IDL:flexiport_intf/PortException:1.0";
const char* flexiport_intf::PortException::_PD_typeId = "Exception/UserException/flexiport_intf::PortException";
-flexiport_intf::PortException* flexiport_intf::PortException::_downcast(CORBA::Exception* _e) {
+flexiport_intf::PortException* flexiport_intf::PortException::_downcast(::CORBA::Exception* _e) {
return (PortException*) _NP_is_a(_e, _PD_typeId);
}
-const flexiport_intf::PortException* flexiport_intf::PortException::_downcast(const CORBA::Exception* _e) {
+const flexiport_intf::PortException* flexiport_intf::PortException::_downcast(const ::CORBA::Exception* _e) {
return (const PortException*) _NP_is_a(_e, _PD_typeId);
}
-CORBA::Exception* flexiport_intf::PortException::_NP_duplicate() const {
+::CORBA::Exception* flexiport_intf::PortException::_NP_duplicate() const {
return new PortException(*this);
}
@@ -91,19 +91,15 @@
return ::flexiport_intf::_nil();
}
-CORBA::Boolean flexiport_intf_Helper::is_nil(::flexiport_intf_ptr p) {
- return CORBA::is_nil(p);
+::CORBA::Boolean flexiport_intf_Helper::is_nil(::flexiport_intf_ptr p) {
+ return ::CORBA::is_nil(p);
}
void flexiport_intf_Helper::release(::flexiport_intf_ptr p) {
- CORBA::release(p);
+ ::CORBA::release(p);
}
-void flexiport_intf_Helper::duplicate(::flexiport_intf_ptr p) {
- if( p && !p->_NP_is_nil() ) omni::duplicateObjRef(p);
-}
-
void flexiport_intf_Helper::marshalObjRef(::flexiport_intf_ptr obj, cdrStream& s) {
::flexiport_intf::_marshalObjRef(obj, s);
}
@@ -112,17 +108,19 @@
return ::flexiport_intf::_unmarshalObjRef(s);
}
+void flexiport_intf_Helper::duplicate(::flexiport_intf_ptr obj) {
+ if( obj && !obj->_NP_is_nil() ) omni::duplicateObjRef(obj);
+}
+
flexiport_intf_ptr
flexiport_intf::_duplicate(::flexiport_intf_ptr obj)
{
if( obj && !obj->_NP_is_nil() ) omni::duplicateObjRef(obj);
-
return obj;
}
-
flexiport_intf_ptr
-flexiport_intf::_narrow(CORBA::Object_ptr obj)
+flexiport_intf::_narrow(::CORBA::Object_ptr obj)
{
if( !obj || obj->_NP_is_nil() || obj->_NP_is_pseudo() ) return _nil();
_ptr_type e = (_ptr_type) obj->_PR_getobj()->_realNarrow(_PD_repoId);
@@ -131,14 +129,13 @@
flexiport_intf_ptr
-flexiport_intf::_unchecked_narrow(CORBA::Object_ptr obj)
+flexiport_intf::_unchecked_narrow(::CORBA::Object_ptr obj)
{
if( !obj || obj->_NP_is_nil() || obj->_NP_is_pseudo() ) return _nil();
_ptr_type e = (_ptr_type) obj->_PR_getobj()->_uncheckedNarrow(_PD_repoId);
return e ? e : _nil();
}
-
flexiport_intf_ptr
flexiport_intf::_nil()
{
@@ -162,7 +159,9 @@
const char* flexiport_intf::_PD_repoId = "IDL:flexiport_intf:1.0";
-_objref_flexiport_intf::~_objref_flexiport_intf() {}
+_objref_flexiport_intf::~_objref_flexiport_intf() {
+
+}
_objref_flexiport_intf::_objref_flexiport_intf(omniIOR* ior, omniIdentity* id) :
@@ -198,7 +197,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_00000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
@@ -225,13 +227,13 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
// Local call call-back function.
static void
-_0RL_lcfn_7a0ad30412f405bc_10000000(omniCallDescriptor*, omniServant* svnt)
+_0RL_lcfn_7a0ad30412f405bc_10000000(omniCallDescriptor* cd, omniServant* svnt)
{
_impl_flexiport_intf* impl = (_impl_flexiport_intf*) svnt->_ptrToInterface(flexiport_intf::_PD_repoId);
@@ -267,7 +269,7 @@
}
// Local call call-back function.
static void
-_0RL_lcfn_7a0ad30412f405bc_20000000(omniCallDescriptor*, omniServant* svnt)
+_0RL_lcfn_7a0ad30412f405bc_20000000(omniCallDescriptor* cd, omniServant* svnt)
{
_impl_flexiport_intf* impl = (_impl_flexiport_intf*) svnt->_ptrToInterface(flexiport_intf::_PD_repoId);
@@ -308,7 +310,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_30000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
@@ -317,7 +322,7 @@
void userException(cdrStream&,_OMNI_NS(IOP_C)*,const char*);
static const char* const _user_exns[];
- CORBA::String_var result;
+ ::CORBA::String_var result;
};
void _0RL_cd_7a0ad30412f405bc_30000000::marshalReturnedValues(cdrStream& _n)
@@ -349,7 +354,7 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
@@ -396,14 +401,19 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_50000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, 0, 0, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 0, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
void marshalReturnedValues(cdrStream&);
- CORBA::String_var result;
+ static const char* const _user_exns[];
+
+ ::CORBA::String_var result;
};
void _0RL_cd_7a0ad30412f405bc_50000000::marshalReturnedValues(cdrStream& _n)
@@ -418,6 +428,10 @@
}
+const char* const _0RL_cd_7a0ad30412f405bc_50000000::_user_exns[] = {
+ 0
+};
+
// Local call call-back function.
static void
_0RL_lcfn_7a0ad30412f405bc_60000000(omniCallDescriptor* cd, omniServant* svnt)
@@ -446,14 +460,19 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_70000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, 0, 0, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 0, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
void marshalReturnedValues(cdrStream&);
- CORBA::Boolean result;
+ static const char* const _user_exns[];
+
+ ::CORBA::Boolean result;
};
void _0RL_cd_7a0ad30412f405bc_70000000::marshalReturnedValues(cdrStream& _n)
@@ -468,6 +487,10 @@
}
+const char* const _0RL_cd_7a0ad30412f405bc_70000000::_user_exns[] = {
+ 0
+};
+
// Local call call-back function.
static void
_0RL_lcfn_7a0ad30412f405bc_80000000(omniCallDescriptor* cd, omniServant* svnt)
@@ -479,7 +502,7 @@
}
-CORBA::Boolean _objref_flexiport_intf::IsBlocking()
+::CORBA::Boolean _objref_flexiport_intf::IsBlocking()
{
_0RL_cd_7a0ad30412f405bc_70000000 _call_desc(_0RL_lcfn_7a0ad30412f405bc_80000000, "IsBlocking", 11);
@@ -496,7 +519,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_90000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
@@ -505,7 +531,7 @@
void userException(cdrStream&,_OMNI_NS(IOP_C)*,const char*);
static const char* const _user_exns[];
- CORBA::Boolean result;
+ ::CORBA::Boolean result;
};
void _0RL_cd_7a0ad30412f405bc_90000000::marshalReturnedValues(cdrStream& _n)
@@ -537,7 +563,7 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
@@ -567,7 +593,7 @@
}
-CORBA::Boolean _objref_flexiport_intf::IsOpen()
+::CORBA::Boolean _objref_flexiport_intf::IsOpen()
{
_0RL_cd_7a0ad30412f405bc_90000000 _call_desc(_0RL_lcfn_7a0ad30412f405bc_a0000000, "IsOpen", 7);
@@ -587,7 +613,7 @@
}
-CORBA::Boolean
+::CORBA::Boolean
_pof_flexiport_intf::is_a(const char* id) const
{
if( omni::ptrStrMatch(id, ::flexiport_intf::_PD_repoId) )
@@ -601,7 +627,7 @@
_impl_flexiport_intf::~_impl_flexiport_intf() {}
-CORBA::Boolean
+::CORBA::Boolean
_impl_flexiport_intf::_dispatch(omniCallHandle& _handle)
{
const char* op = _handle.operation_name();
Modified: openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp
===================================================================
--- openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp 2010-01-07 06:26:50 UTC (rev 479)
@@ -38,21 +38,21 @@
return 10;
case gbxnovatelacfr::NegativeVar:
return 11;
+ case gbxnovatelacfr::ReservedGpsSolutionStatusType12:
+ return 12;
case gbxnovatelacfr::IntegrityWarning:
- return 12;
+ return 13;
case gbxnovatelacfr::InsInactive:
- return 13;
+ return 14;
case gbxnovatelacfr::InsAligning:
- return 14;
+ return 15;
case gbxnovatelacfr::InsBad:
- return 15;
+ return 16;
case gbxnovatelacfr::ImuUnplugged:
- return 16;
+ return 17;
case gbxnovatelacfr::Pending:
- return 17;
+ return 18;
case gbxnovatelacfr::InvalidFix:
- return 18;
- case gbxnovatelacfr::ReservedGpsSolutionStatusType:
return 19;
case gbxnovatelacfr::UnknownGpsSolutionStatusType:
return 20;
@@ -70,58 +70,96 @@
return 1;
case gbxnovatelacfr::FixedHeight:
return 2;
+ case gbxnovatelacfr::ReservedGpsPosVelType3:
+ return 3;
case gbxnovatelacfr::FloatConv:
- return 3;
+ return 4;
case gbxnovatelacfr::WideLane:
- return 4;
+ return 5;
case gbxnovatelacfr::NarrowLane:
- return 5;
- case gbxnovatelacfr::DopplerVelocity:
return 6;
- case gbxnovatelacfr::Single:
+ case gbxnovatelacfr::ReservedGpsPosVelType7:
return 7;
- case gbxnovatelacfr::PsrDiff:
+ case gbxnovatelacfr::DopplerVelocity:
return 8;
- case gbxnovatelacfr::Waas:
+ case gbxnovatelacfr::ReservedGpsPosVelType9:
return 9;
- case gbxnovatelacfr::Propagated:
+ case gbxnovatelacfr::ReservedGpsPosVelType10:
+ return 10;
+ case gbxnovatelacfr::ReservedGpsPosVelType11:
return 11;
- case gbxnovatelacfr::Omnistar:
+ case gbxnovatelacfr::ReservedGpsPosVelType12:
return 12;
- case gbxnovatelacfr::L1Float:
+ case gbxnovatelacfr::ReservedGpsPosVelType13:
return 13;
- case gbxnovatelacfr::IonoFreeFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType14:
return 14;
- case gbxnovatelacfr::NarrowFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType15:
return 15;
- case gbxnovatelacfr::L1Int:
+ case gbxnovatelacfr::Single:
return 16;
- case gbxnovatelacfr::WideInt:
+ case gbxnovatelacfr::PsrDiff:
return 17;
- case gbxnovatelacfr::NarrowInt:
+ case gbxnovatelacfr::Waas:
return 18;
- case gbxnovatelacfr::RtkDirectIns:
+ case gbxnovatelacfr::Propagated:
return 19;
- case gbxnovatelacfr::Ins:
+ case gbxnovatelacfr::Omnistar:
return 20;
- case gbxnovatelacfr::InsPsrSp:
+ case gbxnovatelacfr::ReservedGpsPosVelType21:
return 21;
- case gbxnovatelacfr::InsPsrDiff:
+ case gbxnovatelacfr::ReservedGpsPosVelType22:
return 22;
- case gbxnovatelacfr::InsRtkFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType23:
return 23;
- case gbxnovatelacfr::InsRtkFixed:
+ case gbxnovatelacfr::ReservedGpsPosVelType24:
return 24;
- case gbxnovatelacfr::OmniStarHp:
+ case gbxnovatelacfr::ReservedGpsPosVelType25:
return 25;
- case gbxnovatelacfr::OmniStarXp:
+ case gbxnovatelacfr::ReservedGpsPosVelType26:
return 26;
- case gbxnovatelacfr::CdGps:
+ case gbxnovatelacfr::ReservedGpsPosVelType27:
return 27;
- case gbxnovatelacfr::ReservedGpsPosVelType:
+ case gbxnovatelacfr::ReservedGpsPosVelType28:
return 28;
+ case gbxnovatelacfr::ReservedGpsPosVelType29:
+ return 29;
+ case gbxnovatelacfr::ReservedGpsPosVelType30:
+ return 30;
+ case gbxnovatelacfr::ReservedGpsPosVelType31:
+ return 31;
+ case gbxnovatelacfr::L1Float:
+ return 32;
+ case gbxnovatelacfr::IonoFreeFloat:
+ return 33;
+ case gbxnovatelacfr::NarrowFloat:
+ return 34;
+ case gbxnovatelacfr::L1Int:
+ return 48;
+ case gbxnovatelacfr::WideInt:
+ return 49;
+ case gbxnovatelacfr::NarrowInt:
+ return 50;
+ case gbxnovatelacfr::RtkDirectIns:
+ return 51;
+ case gbxnovatelacfr::Ins:
+ return 52;
+ case gbxnovatelacfr::InsPsrSp:
+ return 53;
+ case gbxnovatelacfr::InsPsrDiff:
+ return 54;
+ case gbxnovatelacfr::InsRtkFloat:
+ return 55;
+ case gbxnovatelacfr::InsRtkFixed:
+ return 56;
+ case gbxnovatelacfr::OmniStarHp:
+ return 64;
+ case gbxnovatelacfr::OmniStarXp:
+ return 65;
+ case gbxnovatelacfr::CdGps:
+ return 66;
case gbxnovatelacfr::UnknownGpsPosVelType:
- return 29;
+ return 67;
}
return -1;
}
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp 2010-01-07 06:26:50 UTC (rev 479)
@@ -9,8 +9,6 @@
#include "hokuyo_aist.h"
-#include <ace/Guard_T.h>
-
// Module specification
// <rtc-template block="module_spec">
static const char* hokuyo_aist_spec[] =
@@ -136,7 +134,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onActivated(RTC::UniqueId ec_id)
{
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
m_laser.Open (m_portOptions);
@@ -190,7 +188,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onDeactivated(RTC::UniqueId ec_id)
{
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
m_laser.SetPower (false);
@@ -209,8 +207,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onExecute(RTC::UniqueId ec_id)
{
- std::cerr << "onExecute start" << std::endl;
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
if (m_power != m_oldPower)
@@ -282,7 +279,6 @@
std::cerr << "Error in onExecute: (" << e.Code () << ") " << e.what () << std::endl;
return RTC::RTC_ERROR;
}
- std::cerr << "onExecute done" << std::endl;
return RTC::RTC_OK;
}
@@ -356,8 +352,8 @@
if (m_laserData.Intensities () != NULL)
{
m_intensities.data.length (m_laserData.Length () + 2);
- m_intensities.data[0] = m_angResolution;
- m_intensities.data[1] = actualStartAngle;
+ m_intensities.data[0] = static_cast<int>(m_angResolution);
+ m_intensities.data[1] = static_cast<int>(actualStartAngle);
for (unsigned int ii = 0; ii < m_laserData.Length (); ii++)
m_intensities.data[ii + 2] = m_laserData.Intensities ()[ii];
m_intensitiesOut.write ();
@@ -403,55 +399,55 @@
void Hokuyo_AIST::SetPower (bool enable)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetPower (enable);
}
void Hokuyo_AIST::SetBaudRate (unsigned long baudRate)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetBaud (baudRate);
}
void Hokuyo_AIST::ResetLaser ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.Reset ();
}
void Hokuyo_AIST::SetMotorSpeed (unsigned long speed)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetMotorSpeed (speed);
}
void Hokuyo_AIST::SetHighSensitivity (bool enable)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetHighSensitivity (enable);
}
void Hokuyo_AIST::GetSensorInfo (hokuyo_aist::HokuyoSensorInfo *dest)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.GetSensorInfo (dest);
}
unsigned long Hokuyo_AIST::GetLaserTime ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
return m_laser.GetTime ();
}
void Hokuyo_AIST::SetPullMode (bool mode)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_pullMode = mode;
}
void Hokuyo_AIST::EnableIntensityData (bool mode)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_getIntensities = mode;
}
@@ -462,7 +458,7 @@
void Hokuyo_AIST::SetStartAngle (double angle)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_startAngle = angle;
}
@@ -473,7 +469,7 @@
void Hokuyo_AIST::SetEndAngle (double angle)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_endAngle = angle;
}
@@ -484,7 +480,7 @@
void Hokuyo_AIST::SetStartStep (long step)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_startStep = step;
}
@@ -495,24 +491,24 @@
void Hokuyo_AIST::SetEndStep (long step)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_endStep = step;
}
void Hokuyo_AIST::RequestScan ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
getAndSendScan ();
}
void Hokuyo_AIST::GetLock ()
{
- m_mutex.acquire ();
+ m_mutex.lock ();
}
void Hokuyo_AIST::ReleaseLock ()
{
- m_mutex.release ();
+ m_mutex.unlock ();
}
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.h
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.h 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.h 2010-01-07 06:26:50 UTC (rev 479)
@@ -30,7 +30,7 @@
#include "hokuyo_aist/hokuyo_aist.h"
#include <string>
-#include <ace/Mutex.h>
+#include <coil/Guard.h>
using namespace RTC;
@@ -416,7 +416,7 @@
bool m_oldGetIntensities;
bool m_oldGetNewData;
- ACE_Mutex m_mutex;
+ coil::Mutex m_mutex;
void GetLock ();
void ReleaseLock ();
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.hh
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.hh 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.hh 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,15 +1,14 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#ifndef __hokuyo__aist_hh__
#define __hokuyo__aist_hh__
-#ifndef USE_omniORB_logStream
-#define USE_omniORB_logStream
-#endif
-
#ifndef __CORBA_H_EXTERNAL_GUARD__
#include <omniORB4/CORBA.h>
#endif
+#ifndef USE_stub_in_nt_dll
+# define USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+#endif
#ifndef USE_core_stub_in_nt_dll
# define USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
#endif
@@ -23,13 +22,13 @@
#ifdef USE_stub_in_nt_dll
-#ifndef USE_core_stub_in_nt_dll
-#define USE_core_stub_in_nt_dll
+# ifndef USE_core_stub_in_nt_dll
+# define USE_core_stub_in_nt_dll
+# endif
+# ifndef USE_dyn_stub_in_nt_dll
+# define USE_dyn_stub_in_nt_dll
+# endif
#endif
-#ifndef USE_dyn_stub_in_nt_dll
-#define USE_dyn_stub_in_nt_dll
-#endif
-#endif
#ifdef _core_attr
# error "A local CPP macro _core_attr has already been defined."
@@ -82,6 +81,7 @@
#endif
+// interface hokuyo_aist_control
class hokuyo_aist_control {
public:
// Declarations for this interface type.
@@ -89,8 +89,9 @@
typedef hokuyo_aist_control_var _var_type;
static _ptr_type _duplicate(_ptr_type);
- static _ptr_type _narrow(CORBA::Object_ptr);
- static _ptr_type _unchecked_narrow(CORBA::Object_ptr);
+ static _ptr_type _narrow(::CORBA::Object_ptr);
+ static _ptr_type _unchecked_narrow(::CORBA::Object_ptr);
+
static _ptr_type _nil();
static inline void _marshalObjRef(_ptr_type, cdrStream&);
@@ -106,12 +107,12 @@
static _core_attr const char* _PD_repoId;
// Other IDL defined within this scope.
- class HokuyoError : public CORBA::UserException {
+ class HokuyoError : public ::CORBA::UserException {
public:
- CORBA::Short errorCode;
+ ::CORBA::Short errorCode;
- CORBA::String_member errorStr;
+ ::CORBA::String_member errorStr;
@@ -120,13 +121,13 @@
pd_insertToAnyFnNCP = insertToAnyFnNCP;
}
HokuyoError(const HokuyoError&);
- HokuyoError(CORBA::Short i_errorCode, const char* i_errorStr);
+ HokuyoError(::CORBA::Short i_errorCode, const char* i_errorStr);
HokuyoError& operator=(const HokuyoError&);
virtual ~HokuyoError();
virtual void _raise() const;
- static HokuyoError* _downcast(CORBA::Exception*);
- static const HokuyoError* _downcast(const CORBA::Exception*);
- static inline HokuyoError* _narrow(CORBA::Exception* _e) {
+ static HokuyoError* _downcast(::CORBA::Exception*);
+ static const HokuyoError* _downcast(const ::CORBA::Exception*);
+ static inline HokuyoError* _narrow(::CORBA::Exception* _e) {
return _downcast(_e);
}
@@ -136,7 +137,7 @@
static _core_attr insertExceptionToAny insertToAnyFn;
static _core_attr insertExceptionToAnyNCP insertToAnyFnNCP;
- virtual CORBA::Exception* _NP_duplicate() const;
+ virtual ::CORBA::Exception* _NP_duplicate() const;
static _core_attr const char* _PD_repoId;
static _core_attr const char* _PD_typeId;
@@ -147,59 +148,59 @@
virtual void _NP_marshal(cdrStream&) const;
};
- static _dyn_attr const CORBA::TypeCode_ptr _tc_HokuyoError;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_HokuyoError;
struct HokuyoSensorInfo {
typedef _CORBA_ConstrType_Variable_Var<HokuyoSensorInfo> _var_type;
- CORBA::String_member vendor;
+ ::CORBA::String_member vendor;
- CORBA::String_member product;
+ ::CORBA::String_member product;
- CORBA::String_member firmware;
+ ::CORBA::String_member firmware;
- CORBA::String_member protocol;
+ ::CORBA::String_member protocol;
- CORBA::String_member serial;
+ ::CORBA::String_member serial;
- CORBA::String_member model;
+ ::CORBA::String_member model;
- CORBA::Long minRange;
+ ::CORBA::Long minRange;
- CORBA::Long maxRange;
+ ::CORBA::Long maxRange;
- CORBA::Long steps;
+ ::CORBA::Long steps;
- CORBA::Long firstStep;
+ ::CORBA::Long firstStep;
- CORBA::Long lastStep;
+ ::CORBA::Long lastStep;
- CORBA::Long frontStep;
+ ::CORBA::Long frontStep;
- CORBA::Long standardSpeed;
+ ::CORBA::Long standardSpeed;
- CORBA::Boolean power;
+ ::CORBA::Boolean power;
- CORBA::Long speed;
+ ::CORBA::Long speed;
- CORBA::Short speedLevel;
+ ::CORBA::Short speedLevel;
- CORBA::String_member measureState;
+ ::CORBA::String_member measureState;
- CORBA::Long baud;
+ ::CORBA::Long baud;
- CORBA::Long time;
+ ::CORBA::Long time;
- CORBA::String_member diagnostic;
+ ::CORBA::String_member diagnostic;
- CORBA::Double minAngle;
+ ::CORBA::Double minAngle;
- CORBA::Double maxAngle;
+ ::CORBA::Double maxAngle;
- CORBA::Double resolution;
+ ::CORBA::Double resolution;
- CORBA::Long scanableSteps;
+ ::CORBA::Long scanableSteps;
@@ -211,35 +212,36 @@
typedef _CORBA_ConstrType_Variable_OUT_arg< HokuyoSensorInfo,HokuyoSensorInfo_var > HokuyoSensorInfo_out;
- static _dyn_attr const CORBA::TypeCode_ptr _tc_HokuyoSensorInfo;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_HokuyoSensorInfo;
};
class _objref_hokuyo_aist_control :
- public virtual CORBA::Object, public virtual omniObjRef
+ public virtual ::CORBA::Object,
+ public virtual omniObjRef
{
public:
- CORBA::Boolean GetPower();
- void SetPower(CORBA::Boolean power);
- CORBA::ULong GetBaudRate();
- void SetBaudRate(CORBA::ULong baudRate);
+ ::CORBA::Boolean GetPower();
+ void SetPower(::CORBA::Boolean power);
+ ::CORBA::ULong GetBaudRate();
+ void SetBaudRate(::CORBA::ULong baudRate);
void Reset();
- CORBA::ULong GetSpeed();
- void SetSpeed(CORBA::ULong speed);
- void SetHighSensitivity(CORBA::Boolean sensitivity);
+ ::CORBA::ULong GetSpeed();
+ void SetSpeed(::CORBA::ULong speed);
+ void SetHighSensitivity(::CORBA::Boolean sensitivity);
hokuyo_aist_control::HokuyoSensorInfo* GetSensorInfo();
- CORBA::ULong GetTime();
- void SetPullMode(CORBA::Boolean mode);
- void EnableIntensityData(CORBA::Boolean enable);
- CORBA::Double GetStartAngle();
- void SetStartAngle(CORBA::Double angle);
- CORBA::Double GetEndAngle();
- void SetEndAngle(CORBA::Double angle);
- CORBA::Long GetStartStep();
- void SetStartStep(CORBA::Long step);
- CORBA::Long GetEndStep();
- void SetEndStep(CORBA::Long step);
+ ::CORBA::ULong GetTime();
+ void SetPullMode(::CORBA::Boolean mode);
+ void EnableIntensityData(::CORBA::Boolean enable);
+ ::CORBA::Double GetStartAngle();
+ void SetStartAngle(::CORBA::Double angle);
+ ::CORBA::Double GetEndAngle();
+ void SetEndAngle(::CORBA::Double angle);
+ ::CORBA::Long GetStartStep();
+ void SetStartStep(::CORBA::Long step);
+ ::CORBA::Long GetEndStep();
+ void SetEndStep(::CORBA::Long step);
void RequestScan();
inline _objref_hokuyo_aist_control() { _PR_setobj(0); } // nil
@@ -274,26 +276,26 @@
public:
virtual ~_impl_hokuyo_aist_control();
- virtual CORBA::Boolean GetPower() = 0;
- virtual void SetPower(CORBA::Boolean power) = 0;
- virtual CORBA::ULong GetBaudRate() = 0;
- virtual void SetBaudRate(CORBA::ULong baudRate) = 0;
+ virtual ::CORBA::Boolean GetPower() = 0;
+ virtual void SetPower(::CORBA::Boolean power) = 0;
+ virtual ::CORBA::ULong GetBaudRate() = 0;
+ virtual void SetBaudRate(::CORBA::ULong baudRate) = 0;
virtual void Reset() = 0;
- virtual CORBA::ULong GetSpeed() = 0;
- virtual void SetSpeed(CORBA::ULong speed) = 0;
- virtual void SetHighSensitivity(CORBA::Boolean sensitivity) = 0;
+ virtual ::CORBA::ULong GetSpeed() = 0;
+ virtual void SetSpeed(::CORBA::ULong speed) = 0;
+ virtual void SetHighSensitivity(::CORBA::Boolean sensitivity) = 0;
virtual hokuyo_aist_control::HokuyoSensorInfo* GetSensorInfo() = 0;
- virtual CORBA::ULong GetTime() = 0;
- virtual void SetPullMode(CORBA::Boolean mode) = 0;
- virtual void EnableIntensityData(CORBA::Boolean enable) = 0;
- virtual CORBA::Double GetStartAngle() = 0;
- virtual void SetStartAngle(CORBA::Double angle) = 0;
- virtual CORBA::Double GetEndAngle() = 0;
- virtual void SetEndAngle(CORBA::Double angle) = 0;
- virtual CORBA::Long GetStartStep() = 0;
- virtual void SetStartStep(CORBA::Long step) = 0;
- virtual CORBA::Long GetEndStep() = 0;
- virtual void SetEndStep(CORBA::Long step) = 0;
+ virtual ::CORBA::ULong GetTime() = 0;
+ virtual void SetPullMode(::CORBA::Boolean mode) = 0;
+ virtual void EnableIntensityData(::CORBA::Boolean enable) = 0;
+ virtual ::CORBA::Double GetStartAngle() = 0;
+ virtual void SetStartAngle(::CORBA::Double angle) = 0;
+ virtual ::CORBA::Double GetEndAngle() = 0;
+ virtual void SetEndAngle(::CORBA::Double angle) = 0;
+ virtual ::CORBA::Long GetStartStep() = 0;
+ virtual void SetStartStep(::CORBA::Long step) = 0;
+ virtual ::CORBA::Long GetEndStep() = 0;
+ virtual void SetEndStep(::CORBA::Long step) = 0;
virtual void RequestScan() = 0;
public: // Really protected, workaround for xlC
@@ -302,16 +304,17 @@
private:
virtual void* _ptrToInterface(const char*);
virtual const char* _mostDerivedRepoId();
+
};
-_CORBA_GLOBAL_VAR _dyn_attr const CORBA::TypeCode_ptr _tc_hokuyo_aist_control;
+_CORBA_GLOBAL_VAR _dyn_attr const ::CORBA::TypeCode_ptr _tc_hokuyo_aist_control;
class POA_hokuyo_aist_control :
public virtual _impl_hokuyo_aist_control,
- public virtual PortableServer::ServantBase
+ public virtual ::PortableServer::ServantBase
{
public:
virtual ~POA_hokuyo_aist_control();
@@ -325,21 +328,23 @@
+
+
#undef _core_attr
#undef _dyn_attr
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s);
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp);
-extern void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo& _s);
-extern void operator<<=(CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo* _sp);
-extern CORBA::Boolean operator>>=(const CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo*& _sp);
-extern CORBA::Boolean operator>>=(const CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo*& _sp);
+extern void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo& _s);
+extern void operator<<=(::CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo* _sp);
+extern _CORBA_Boolean operator>>=(const ::CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo*& _sp);
+extern _CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo*& _sp);
-void operator<<=(CORBA::Any& _a, hokuyo_aist_control_ptr _s);
-void operator<<=(CORBA::Any& _a, hokuyo_aist_control_ptr* _s);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, hokuyo_aist_control_ptr& _s);
+void operator<<=(::CORBA::Any& _a, hokuyo_aist_control_ptr _s);
+void operator<<=(::CORBA::Any& _a, hokuyo_aist_control_ptr* _s);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, hokuyo_aist_control_ptr& _s);
@@ -351,6 +356,10 @@
+#ifdef USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+# undef USE_stub_in_nt_dll
+# undef USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+#endif
#ifdef USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
# undef USE_core_stub_in_nt_dll
# undef USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,28 +1,29 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend) - omniORB_4_1. Do not edit.
#include "hokuyo_aist.hh"
-#include <omniORB4/tcDescriptor.h>
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_dyn_library_version = omniORB_4_0;
+static const char* _0RL_dyn_library_version = omniORB_4_1_dyn;
+static ::CORBA::TypeCode::_Tracker _0RL_tcTrack(__FILE__);
+
static CORBA::PR_structMember _0RL_structmember_hokuyo__aist__control_mHokuyoError[] = {
{"errorCode", CORBA::TypeCode::PR_short_tc()},
- {"errorStr", CORBA::TypeCode::PR_string_tc(0)}
+ {"errorStr", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)}
};
-static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoError = CORBA::TypeCode::PR_exception_tc("IDL:hokuyo_aist_control/HokuyoError:1.0", "HokuyoError", _0RL_structmember_hokuyo__aist__control_mHokuyoError, 2);
+static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoError = CORBA::TypeCode::PR_exception_tc("IDL:hokuyo_aist_control/HokuyoError:1.0", "HokuyoError", _0RL_structmember_hokuyo__aist__control_mHokuyoError, 2, &_0RL_tcTrack);
const CORBA::TypeCode_ptr hokuyo_aist_control::_tc_HokuyoError = _0RL_tc_hokuyo__aist__control_mHokuyoError;
static CORBA::PR_structMember _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo[] = {
- {"vendor", CORBA::TypeCode::PR_string_tc(0)},
- {"product", CORBA::TypeCode::PR_string_tc(0)},
- {"firmware", CORBA::TypeCode::PR_string_tc(0)},
- {"protocol", CORBA::TypeCode::PR_string_tc(0)},
- {"serial", CORBA::TypeCode::PR_string_tc(0)},
- {"model", CORBA::TypeCode::PR_string_tc(0)},
+ {"vendor", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"product", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"firmware", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"protocol", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"serial", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"model", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"minRange", CORBA::TypeCode::PR_long_tc()},
{"maxRange", CORBA::TypeCode::PR_long_tc()},
{"steps", CORBA::TypeCode::PR_long_tc()},
@@ -33,96 +34,81 @@
{"power", CORBA::TypeCode::PR_boolean_tc()},
{"speed", CORBA::TypeCode::PR_long_tc()},
{"speedLevel", CORBA::TypeCode::PR_short_tc()},
- {"measureState", CORBA::TypeCode::PR_string_tc(0)},
+ {"measureState", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"baud", CORBA::TypeCode::PR_long_tc()},
{"time", CORBA::TypeCode::PR_long_tc()},
- {"diagnostic", CORBA::TypeCode::PR_string_tc(0)},
+ {"diagnostic", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"minAngle", CORBA::TypeCode::PR_double_tc()},
{"maxAngle", CORBA::TypeCode::PR_double_tc()},
{"resolution", CORBA::TypeCode::PR_double_tc()},
{"scanableSteps", CORBA::TypeCode::PR_long_tc()}
};
-static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo = CORBA::TypeCode::PR_struct_tc("IDL:hokuyo_aist_control/HokuyoSensorInfo:1.0", "HokuyoSensorInfo", _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo, 24);
+#ifdef _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo
+# undef _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo
+#endif
+static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo = CORBA::TypeCode::PR_struct_tc("IDL:hokuyo_aist_control/HokuyoSensorInfo:1.0", "HokuyoSensorInfo", _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo, 24, &_0RL_tcTrack);
+
const CORBA::TypeCode_ptr hokuyo_aist_control::_tc_HokuyoSensorInfo = _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo;
-const CORBA::TypeCode_ptr _tc_hokuyo_aist_control = CORBA::TypeCode::PR_interface_tc("IDL:hokuyo_aist_control:1.0", "hokuyo_aist_control");
+const CORBA::TypeCode_ptr _tc_hokuyo_aist_control = CORBA::TypeCode::PR_interface_tc("IDL:hokuyo_aist_control:1.0", "hokuyo_aist_control", &_0RL_tcTrack);
- CORBA::Boolean
-_0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoError(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cshort(_newdesc, ((hokuyo_aist_control::HokuyoError*)_desc->opq_struct)->errorCode);
- return 1;
- case 1:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoError*)_desc->opq_struct)->errorStr);
- return 1;
- default:
- return 0;
- };
+static void _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn(cdrStream& _s, void* _v)
+{
+ const hokuyo_aist_control::HokuyoError* _p = (const hokuyo_aist_control::HokuyoError*)_v;
+ *_p >>= _s;
}
- CORBA::ULong
-
-_0RL_tcParser_getMemberCount_hokuyo__aist__control_mHokuyoError(const tcStructDesc *_desc)
+static void _0RL_hokuyo__aist__control_mHokuyoError_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return 2;
+ hokuyo_aist_control::HokuyoError* _p = new hokuyo_aist_control::HokuyoError;
+ *_p <<= _s;
+ _v = _p;
}
-
-void _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(tcDescriptor &_desc, const hokuyo_aist_control::HokuyoError& _data)
+static void _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn(void* _v)
{
- _desc.p_struct.getMemberDesc = _0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoError;
- _desc.p_struct.getMemberCount = _0RL_tcParser_getMemberCount_hokuyo__aist__control_mHokuyoError;
- _desc.p_struct.opq_struct = (void *)&_data;
+ hokuyo_aist_control::HokuyoError* _p = (hokuyo_aist_control::HokuyoError*)_v;
+ delete _p;
}
-void _0RL_delete_hokuyo__aist__control_mHokuyoError(void* _data) {
- hokuyo_aist_control::HokuyoError* _0RL_t = (hokuyo_aist_control::HokuyoError*) _data;
- delete _0RL_t;
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s)
+{
+ hokuyo_aist_control::HokuyoError* _p = new hokuyo_aist_control::HokuyoError(_s);
+ _a.PR_insert(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ _p);
}
-
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, _s);
- _a.PR_packFrom(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp)
+{
+ _a.PR_insert(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ (hokuyo_aist_control::HokuyoError*)_sp);
}
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, *_sp);
- _a.PR_packFrom(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc);
- delete (hokuyo_aist_control::HokuyoError *)_sp;
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a,const hokuyo_aist_control::HokuyoError*& _sp) {
- _sp = (hokuyo_aist_control::HokuyoError *) _a.PR_getCachedData();
- if (_sp == 0) {
- tcDescriptor _0RL_tcdesc;
- _sp = new hokuyo_aist_control::HokuyoError;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, *_sp);
- if (_a.PR_unpackTo(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc)) {
- ((CORBA::Any *)&_a)->PR_setCachedData((void*)_sp, _0RL_delete_hokuyo__aist__control_mHokuyoError);
- return 1;
- } else {
- delete (hokuyo_aist_control::HokuyoError *)_sp;_sp = 0;
- return 0;
- }
- } else {
- CORBA::TypeCode_var _0RL_tctmp = _a.type();
- if (_0RL_tctmp->equivalent(_0RL_tc_hokuyo__aist__control_mHokuyoError)) return 1;
- delete (hokuyo_aist_control::HokuyoError *)_sp;_sp = 0;
- return 0;
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp)
+{
+ void* _v;
+ if (_a.PR_extract(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_unmarshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ _v)) {
+ _sp = (const hokuyo_aist_control::HokuyoError*)_v;
+ return 1;
}
+ return 0;
}
-static void _0RL_insertToAny__chokuyo__aist__control_mHokuyoError(CORBA::Any& _a,const CORBA::Exception& _e) {
+static void _0RL_insertToAny__chokuyo__aist__control_mHokuyoError(::CORBA::Any& _a, const ::CORBA::Exception& _e) {
const hokuyo_aist_control::HokuyoError & _ex = (const hokuyo_aist_control::HokuyoError &) _e;
operator<<=(_a,_ex);
}
-static void _0RL_insertToAnyNCP__chokuyo__aist__control_mHokuyoError (CORBA::Any& _a,const CORBA::Exception* _e) {
- const hokuyo_aist_control::HokuyoError * _ex = (const hokuyo_aist_control::HokuyoError *) _e;
+static void _0RL_insertToAnyNCP__chokuyo__aist__control_mHokuyoError (::CORBA::Any& _a, const ::CORBA::Exception* _e) {
+ const hokuyo_aist_control::HokuyoError* _ex = (const hokuyo_aist_control::HokuyoError*) _e;
operator<<=(_a,_ex);
}
@@ -135,209 +121,106 @@
};
static _0RL_insertToAny_Singleton__chokuyo__aist__control_mHokuyoError _0RL_insertToAny_Singleton__chokuyo__aist__control_mHokuyoError_;
-void _0RL_delete_hokuyo__aist__control_mHokuyoSensorInfo(void* _data) {
- hokuyo_aist_control::HokuyoSensorInfo* _0RL_t = (hokuyo_aist_control::HokuyoSensorInfo*) _data;
- delete _0RL_t;
+static void _0RL_hokuyo__aist__control_mHokuyoSensorInfo_marshal_fn(cdrStream& _s, void* _v)
+{
+ hokuyo_aist_control::HokuyoSensorInfo* _p = (hokuyo_aist_control::HokuyoSensorInfo*)_v;
+ *_p >>= _s;
}
-
-static CORBA::Boolean
-_0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoSensorInfo(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->vendor);
- return 1;
- case 1:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->product);
- return 1;
- case 2:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->firmware);
- return 1;
- case 3:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->protocol);
- return 1;
- case 4:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->serial);
- return 1;
- case 5:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->model);
- return 1;
- case 6:
- _0RL_buildDesc_clong(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->minRange);
- return 1;
- case 7:
- _0RL_buildDesc_clong(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->maxRange);
- return 1;
- case 8:
- _0RL_...
[truncated message content] |
|
From: <gb...@us...> - 2009-12-15 02:04:12
|
Revision: 478
http://gearbox.svn.sourceforge.net/gearbox/?rev=478&view=rev
Author: gbiggs
Date: 2009-12-15 02:03:56 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Fixed pkg-config file generation, added missing .pc files.
Modified Paths:
--------------
gearbox/trunk/cmake/TargetUtils.cmake
gearbox/trunk/cmake/pkgconfig.in
gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt
gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/cmake/TargetUtils.cmake 2009-12-15 02:03:56 UTC (rev 478)
@@ -186,7 +186,7 @@
set( PKG_DESC ${desc} )
set( PKG_CFLAGS ${cflags} )
set( PKG_LIBFLAGS ${libflags} )
- set( PKG_EXTERNAL_DEPS ${${ext_deps}} )
+ LIST_TO_STRING( PKG_EXTERNAL_DEPS "${${ext_deps}}" )
set( PKG_INTERNAL_DEPS "" )
set( PKG_VERSION ${version} )
if( ${int_deps} )
@@ -412,3 +412,13 @@
set( LICENSE_LIST "" CACHE INTERNAL "Global list of directories and their licenses" FORCE )
endmacro( GBX_RESET_ALL_TARGET_LISTS )
+
+#
+# Macro to turn a list into a string (why doesn't CMake have this built-in?)
+#
+MACRO (LIST_TO_STRING _string _list)
+ SET (${_string})
+ FOREACH (_item ${_list})
+ SET (${_string} "${${_string}} ${_item}")
+ ENDFOREACH (_item)
+ENDMACRO (LIST_TO_STRING)
Modified: gearbox/trunk/cmake/pkgconfig.in
===================================================================
--- gearbox/trunk/cmake/pkgconfig.in 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/cmake/pkgconfig.in 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,8 +1,13 @@
# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@GBX_LIB_INSTALL_SUFFIX@
+includedir=${prefix}/@GBX_INCLUDE_INSTALL_SUFFIX@
Name: @PKG_NAME@
Description: @PKG_DESC@
Version: @PKG_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
-Libs: -L@GBX_LIB_INSTALL_DIR@ @PKG_LIBFLAGS@ -l@PKG_NAME@ @PKG_INTERNAL_DEPS@
-Cflags: -I@GBX_INCLUDE_INSTALL_DIR@ @PKG_CFLAGS@
+Libs: -L${libdir} @PKG_LIBFLAGS@ -l@PKG_NAME@ @PKG_INTERNAL_DEPS@
+Cflags: -I${includedir} @PKG_CFLAGS@
+
Modified: gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/src/gbxnovatelacfr/gbxnovatelutilacfr/CMakeLists.txt 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,5 +1,6 @@
set( lib_name GbxNovatelUtilAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Utilities for GbxNovatelAcfr" )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -28,6 +29,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxnovatelacfr/gbxnovatelutilacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/CMakeLists.txt 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,5 +1,6 @@
set( lib_name GbxLockFileAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Create lock files in /var/lock to control resource access. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -17,6 +18,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxserialacfr/lockfile ${hdrs} )
Modified: gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/src/gbxsickacfr/gbxiceutilacfr/CMakeLists.txt 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,5 +1,6 @@
set( lib_name GbxIceUtilAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Ice utilities for GbxSickAcfr" )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -26,6 +27,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsickacfr/gbxiceutilacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/src/gbxsickacfr/gbxserialdeviceacfr/CMakeLists.txt 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,5 +1,6 @@
set( lib_name GbxSerialDeviceAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Serial port handler for GbxSickAcfr." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -20,6 +21,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsickacfr/gbxserialdeviceacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxutilacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxutilacfr/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
+++ gearbox/trunk/src/gbxutilacfr/CMakeLists.txt 2009-12-15 02:03:56 UTC (rev 478)
@@ -1,5 +1,6 @@
set( lib_name GbxUtilAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Utilities including status tracing and exceptions. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -23,6 +24,7 @@
include_directories( ${PROJECT_BINARY_DIR} )
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} "" "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxutilacfr ${hdrs} )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gb...@us...> - 2009-12-15 01:17:42
|
Revision: 477
http://gearbox.svn.sourceforge.net/gearbox/?rev=477&view=rev
Author: gbiggs
Date: 2009-12-15 01:17:34 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Bumping so version of GbxSmartBatteryAcfr (this should have been done when the
API changed).
Modified Paths:
--------------
gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
Modified: gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt 2009-12-13 17:37:04 UTC (rev 476)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt 2009-12-15 01:17:34 UTC (rev 477)
@@ -1,5 +1,5 @@
set( lib_name GbxSmartBatteryAcfr )
-set( lib_version 1.0.0 )
+set( lib_version 1.1.0 )
set( lib_desc "Interface library for Ocean Server battery systems. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bo...@us...> - 2009-12-13 17:37:14
|
Revision: 476
http://gearbox.svn.sourceforge.net/gearbox/?rev=476&view=rev
Author: borax00
Date: 2009-12-13 17:37:04 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
Applied patch from Michael Warren.
Modified Paths:
--------------
gearbox/trunk/src/gbxgarminacfr/doc.dox
gearbox/trunk/src/gbxgarminacfr/driver.cpp
gearbox/trunk/src/gbxgarminacfr/driver.h
Modified: gearbox/trunk/src/gbxgarminacfr/doc.dox
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/doc.dox 2009-12-06 04:25:41 UTC (rev 475)
+++ gearbox/trunk/src/gbxgarminacfr/doc.dox 2009-12-13 17:37:04 UTC (rev 476)
@@ -16,7 +16,14 @@
@defgroup gbx_library_gbxgarminacfr GbxGarminAcfr
@brief Garmin GPS receiver.
-Uses Garmin serial implementation. Written for Garmin-GPS15L.
+Talks to a GPS unit over serial.
+
+Capable of talking to Garmin GPS units (which use special Garmin-only
+messages) or NMEA-only GPS units.
+
+Tested on:
+ - Garmin-GPS15L.
+
Tries to establish communication at 4800 baud (non-configurable).
For a full list of classes and functions, see @ref gbxgarminacfr.
Modified: gearbox/trunk/src/gbxgarminacfr/driver.cpp
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/driver.cpp 2009-12-06 04:25:41 UTC (rev 475)
+++ gearbox/trunk/src/gbxgarminacfr/driver.cpp 2009-12-13 17:37:04 UTC (rev 476)
@@ -1,7 +1,7 @@
/*
* GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
* http://gearbox.sf.net/
- * Copyright (c) 2004-2008 Duncan Mercer, Alex Brooks, Alexei Makarenko, Tobias Kaupp
+ * Copyright (c) 2004-2009 Duncan Mercer, Alex Brooks, Alexei Makarenko, Tobias Kaupp, Michael Warren
*
* This distribution is licensed to you under the terms described in
* the LICENSE file included in this distribution.
@@ -178,8 +178,82 @@
return data.release();
}
+// RMC provides a combination of GGA and VTG data
+GenericData* extractRmcData( const gbxgpsutilacfr::NmeaMessage& msg, int timeSec, int timeUsec )
+{
+ std::auto_ptr<RmcData> data( new RmcData );
+
+ data->timeStampSec = timeSec;
+ data->timeStampUsec = timeUsec;
+
+ //Names for the RMC message items
+ enum RmcTokens{MsgType=0,UTC,Status,Lat,LatDir,Lon,LonDir,SpeedKnots,
+ HeadingTrue,DiffAge,MagneticVar,MagneticDir,ModeInd};
+
+ //Check for an empty string. Means that we can't tell anything useful.
+ if ( msg.isDataTokenEmpty(HeadingTrue) )
+ {
+ data->isValid = false;
+ data->headingTrue = 0.0;
+ data->headingMagnetic = 0.0;
+ data->speed = 0.0;
+ return data.release();
+ }
+ data->isValid = true;
+
+ //UTC time
+ sscanf(msg.getDataToken(UTC).c_str(),"%02d%02d%lf",
+ &data->utcTimeHrs, &data->utcTimeMin, &data->utcTimeSec );
+
+ //position
+ int deg;
+ double min;
+ double dir;
+
+ //latitude
+ sscanf(msg.getDataToken(Lat).c_str(),"%02d%lf",°,&min);
+ dir = (*msg.getDataToken(LatDir).c_str()=='N') ? 1.0 : -1.0;
+ data->latitude=dir*(deg+(min/60.0));
+ //longitude
+ sscanf(msg.getDataToken(Lon).c_str(),"%03d%lf",°,&min);
+ dir = (*msg.getDataToken(LonDir).c_str()=='E') ? 1.0 : -1.0;
+ data->longitude=dir*(deg+(min/60.0));
+
+ // true heading
+ double headingRad = DEG2RAD(atof(msg.getDataToken(HeadingTrue).c_str()));
+ NORMALISE_ANGLE( headingRad );
+ data->headingTrue=headingRad;
+
+ // magnetic heading
+ double headingVar;
+ try {
+ // Magnetic deviation from true
+ headingVar = DEG2RAD(atof(msg.getDataToken(MagneticVar).c_str()));
+ // Direction of magnetic deviation
+ if (*msg.getDataToken(MagneticDir).c_str() == 'E')
+ headingRad -= headingVar;
+ else
+ headingRad += headingVar;
+ }
+ catch ( const gbxgpsutilacfr::NmeaException& e ) {
+ // If this occurs, cannot get magnetic heading. Set it to 0.
+ headingRad = 0.0;
+ }
+ NORMALISE_ANGLE( headingRad );
+ data->headingMagnetic=headingRad;
+
+ //speed - converted from knots to m/s
+ data->speed=atof(msg.getDataToken(SpeedKnots).c_str());
+ // knots to kph
+ data->speed*=1.852;
+ // kph to m/s
+ data->speed*=(1000/3600.0);
+
+ return data.release();
}
+}
+
///////////////////////////////////////
bool
@@ -200,7 +274,7 @@
std::stringstream ss;
ss << "Garmin driver config: " << endl
<< "\tdevice="<<device << endl
- << "\twill read sentences: GPGGA="<<readGga<<" GPVTG="<<readVtg<<" PGRME="<<readRme;
+ << "\twill read sentences: GPGGA="<<readGga<<" GPVTG="<<readVtg<<" PGRME="<<readRme<<" GPRMC="<<readRmc;
return ss.str();
}
@@ -265,7 +339,7 @@
void
Driver::enableDevice()
{
- tracer_.info("Configure Garmin GPS device");
+ tracer_.info("Configure GPS device");
//Create the messages that we are going to send and add the checksums
//Note that the checksum field is filled with 'x's before we start
@@ -291,6 +365,10 @@
gbxgpsutilacfr::NmeaMessage enableRmeMsg( "$PGRMO,PGRME,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
serial_->writeString( enableRmeMsg.sentence() );
}
+ if ( config_.readRmc ) {
+ gbxgpsutilacfr::NmeaMessage enableRmcMsg( "$PGRMO,GPRMC,1*xx\r\n",gbxgpsutilacfr::AddChecksum );
+ serial_->writeString( enableRmcMsg.sentence() );
+ }
// alexb: what is this sleep for?
sleep(1);
@@ -327,7 +405,7 @@
timeval now;
if ( gettimeofday( &now, 0 ) != 0 ) {
stringstream ss;
- ss << "Pproblem getting timeofday: " << strerror(errno) << endl;
+ ss << "Problem getting timeofday: " << strerror(errno) << endl;
throw gbxutilacfr::Exception( ERROR_INFO,ss.str() );
}
@@ -442,6 +520,17 @@
else
continue;
}
+ else if ( MsgType == "$GPRMC" ) {
+ if ( config_.readRmc )
+ tracer_.debug("got GPRMC message",4);
+ else
+ throw gbxutilacfr::Exception( ERROR_INFO, "got unexpected PGRMC message" );
+ genericData.reset( extractRmcData( nmeaMessage, now.tv_sec, now.tv_usec ) );
+ if ( genericData.get() )
+ break;
+ else
+ continue;
+ }
else if ( MsgType == "$PGRMO" ) {
//This message is sent by us to control msg transmission and then echoed by GPS
//So we can just ignore it and wait for the next one.
@@ -515,4 +604,22 @@
return ss.str();
}
+std::string toString( const RmcData &d )
+{
+ stringstream ss;
+ ss << endl;
+ ss << " timeStampSec : " << d.timeStampSec << endl
+ << " timeStampUsec : " << d.timeStampUsec << endl
+ << " utcTimeHrs : " << d.utcTimeHrs << endl
+ << " utcTimeMin : " << d.utcTimeMin << endl
+ << " utcTimeSec : " << d.utcTimeSec << endl
+ << " latitude : " << d.latitude << endl
+ << " longitude : " << d.longitude << endl
+ << " isValid : " << d.isValid << endl
+ << " headingTrue : " << d.headingTrue << endl
+ << " headingMagnetic : " << d.headingMagnetic << endl
+ << " speed : " << d.speed;
+ return ss.str();
}
+
+}
Modified: gearbox/trunk/src/gbxgarminacfr/driver.h
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/driver.h 2009-12-06 04:25:41 UTC (rev 475)
+++ gearbox/trunk/src/gbxgarminacfr/driver.h 2009-12-13 17:37:04 UTC (rev 476)
@@ -44,7 +44,9 @@
//! Read GPVTG sentence
bool readVtg;
//! Read PGRME sentence
- bool readRme;
+ bool readRme;
+ //! Read GPRMC sentence
+ bool readRmc;
//! Ignore unknown messages. This driver tries to turn off all messages and then explicitely enables
//! the ones it understands. But with some devices this does not work and many messages types are received.
@@ -60,7 +62,9 @@
//! Contents of PGVTG message.
GpVtg,
//! Contents of PGRME message.
- PgRme
+ PgRme,
+ //! Contents of GPRMC message.
+ GpRmc
};
//! Generic data type returned by a read
@@ -166,6 +170,7 @@
{ return s << toString(d); }
//! Gps data structure
+//! (This one is Garmin-specific)
class RmeData : public GenericData
{
public:
@@ -198,6 +203,51 @@
inline std::ostream &operator<<( std::ostream &s, const RmeData &d )
{ return s << toString(d); }
+//! Gps data structure
+class RmcData : public GenericData
+{
+public:
+ DataType type() const { return GpRmc; }
+
+ //! Time (according to the computer clock) when data was measured.
+ //! Number of seconds
+ int timeStampSec;
+ //! Time (according to the computer clock) when data was measured.
+ //! Number of microseconds
+ int timeStampUsec;
+
+ //! UTC time (according to the GPS device), reference is Greenwich.
+ //! Hour [0..23]
+ int utcTimeHrs;
+ //! UTC time (according to the GPS device), reference is Greenwich.
+ //! Minutes [0..59]
+ int utcTimeMin;
+ //! UTC time (according to the GPS device), reference is Greenwich.
+ //! Seconds [0.0..59.9999(9)]
+ double utcTimeSec;
+
+ //! Latitude [degrees]
+ double latitude;
+ //! Longitude [degrees]
+ double longitude;
+
+ //! When false, means that the GPS unit can't make a valid measurement
+ //! (so all data other than the timestamp is meaningless).
+ bool isValid;
+
+ //! Heading/track/course with respect to true North [rad]
+ double headingTrue;
+ //! Heading/track/course with respect to magnetic North [rad]
+ double headingMagnetic;
+ //! Horizontal velocity [metres/second]
+ double speed;
+};
+std::string toString( const RmcData &d );
+inline std::ostream &operator<<( std::ostream &s, const RmcData &d )
+{ return s << toString(d); }
+
+
+
/*!
Garmin GPS driver.
@@ -207,8 +257,9 @@
This driver can read only the following messages (sentences):
- GPGGA fix data
-- PGRME (estimated error) - not sent if set to 0183 1.5
+- PGRME (estimated error) - not sent if set to 0183 1.5 (garmin-specific)
- GPVTG vector track and speed over ground
+- GPRMC
Processing of individual messages can be disabled in the Config structure.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gb...@us...> - 2009-12-06 04:25:49
|
Revision: 475
http://gearbox.svn.sourceforge.net/gearbox/?rev=475&view=rev
Author: gbiggs
Date: 2009-12-06 04:25:41 +0000 (Sun, 06 Dec 2009)
Log Message:
-----------
Quietened down MSVC
Modified Paths:
--------------
gearbox/trunk/src/gbxutilacfr/status.cpp
Modified: gearbox/trunk/src/gbxutilacfr/status.cpp
===================================================================
--- gearbox/trunk/src/gbxutilacfr/status.cpp 2009-11-18 04:10:43 UTC (rev 474)
+++ gearbox/trunk/src/gbxutilacfr/status.cpp 2009-12-06 04:25:41 UTC (rev 475)
@@ -31,6 +31,7 @@
default:
assert( !"gbxutilacfr::toString(SubsystemState) should never get to default" );
}
+ return ""; // Shuts up MSVC
}
std::string toString( SubsystemHealth health )
@@ -46,6 +47,7 @@
default:
assert( !"gbxutilacfr::toString(SubsystemHealth) should never get to default" );
}
+ return ""; // Shuts up MSVC
}
std::string toString( const SubsystemStatus& status )
@@ -56,6 +58,7 @@
<< " msg='"<<status.message<<"'"
<< " since hearbeat="<<status.sinceHeartbeat;
return ss.str();
+ return ""; // Shuts up MSVC
}
std::string toString( SubsystemType type )
@@ -69,6 +72,7 @@
default:
assert( !"gbxutilacfr::toString(SubsystemType) should never get to default" );
}
+ return ""; // Shuts up MSVC
}
} // namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 04:10:51
|
Revision: 474
http://gearbox.svn.sourceforge.net/gearbox/?rev=474&view=rev
Author: russo2503v
Date: 2009-11-18 04:10:43 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
changed last updated
Modified Paths:
--------------
gearbox/trunk/doc/release_instructions.dox
Modified: gearbox/trunk/doc/release_instructions.dox
===================================================================
--- gearbox/trunk/doc/release_instructions.dox 2009-11-18 04:00:17 UTC (rev 473)
+++ gearbox/trunk/doc/release_instructions.dox 2009-11-18 04:10:43 UTC (rev 474)
@@ -12,7 +12,7 @@
@page gbx_doc_release Release Instructions
-@note Reviewed for release 1.0.0.
+@note Reviewed for release 9.11.
@section gbx_doc_release_release Release
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 04:00:32
|
Revision: 473
http://gearbox.svn.sourceforge.net/gearbox/?rev=473&view=rev
Author: russo2503v
Date: 2009-11-18 04:00:17 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
gearbox/trunk/doc/history.dox
gearbox/trunk/doc/release_instructions.dox
Modified: gearbox/trunk/doc/history.dox
===================================================================
--- gearbox/trunk/doc/history.dox 2009-11-18 03:57:55 UTC (rev 472)
+++ gearbox/trunk/doc/history.dox 2009-11-18 04:00:17 UTC (rev 473)
@@ -25,6 +25,16 @@
None.
+@section gbx_doc_history_head Changes in SVN since Last Release
+
+@par Project wide
+
+@par New libraries
+
+@par Updated libraries
+
+@par Retired libraries
+
@section gbx_doc_history_911 Changes in Release 9.11
@par Project wide
Modified: gearbox/trunk/doc/release_instructions.dox
===================================================================
--- gearbox/trunk/doc/release_instructions.dox 2009-11-18 03:57:55 UTC (rev 472)
+++ gearbox/trunk/doc/release_instructions.dox 2009-11-18 04:00:17 UTC (rev 473)
@@ -48,6 +48,8 @@
-# Update the web page
- change temporatily the last line of the script to say [USERNAME],ge...@sh...
- Use the script: <distro>/doc/rebuild_docco.sh
--# Increment the version numbers (eg '9.02' -> '9.02+') in the top-level CMakeLists.txt files.
+-# Move on to the next development cycle
+ - Increment the version numbers (eg '9.02.0' -> '9.02.+') in the top-level CMakeLists.txt files.
+ - Copy template headings into doc/history.dox
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 03:58:06
|
Revision: 472
http://gearbox.svn.sourceforge.net/gearbox/?rev=472&view=rev
Author: russo2503v
Date: 2009-11-18 03:57:55 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
version++
Modified Paths:
--------------
gearbox/trunk/CMakeLists.txt
Modified: gearbox/trunk/CMakeLists.txt
===================================================================
--- gearbox/trunk/CMakeLists.txt 2009-11-18 03:57:05 UTC (rev 471)
+++ gearbox/trunk/CMakeLists.txt 2009-11-18 03:57:55 UTC (rev 472)
@@ -13,7 +13,7 @@
#
set( GBX_PROJECT_VERSION_MAJOR "9" )
set( GBX_PROJECT_VERSION_MINOR "11" )
-set( GBX_PROJECT_VERSION_PATCH "0" )
+set( GBX_PROJECT_VERSION_PATCH "+" )
set( GBX_PROJECT_VERSION
${GBX_PROJECT_VERSION_MAJOR}.${GBX_PROJECT_VERSION_MINOR}.${GBX_PROJECT_VERSION_PATCH} )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 03:57:19
|
Revision: 471
http://gearbox.svn.sourceforge.net/gearbox/?rev=471&view=rev
Author: russo2503v
Date: 2009-11-18 03:57:05 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
updated sf instructions, once again.
Modified Paths:
--------------
gearbox/trunk/doc/release_instructions.dox
Modified: gearbox/trunk/doc/release_instructions.dox
===================================================================
--- gearbox/trunk/doc/release_instructions.dox 2009-11-18 03:19:48 UTC (rev 470)
+++ gearbox/trunk/doc/release_instructions.dox 2009-11-18 03:57:05 UTC (rev 471)
@@ -1,5 +1,5 @@
/*
- * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
+ * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
* http://gearbox.sf.net/
* Copyright (c) 2008 GearBox Team
*
@@ -37,13 +37,14 @@
-# Create tar-ball, named eg. 'gearbox-9.02.tar.gz'
-# Now the tar-ball is ready to roll. But first test that the original untars and builds cleanly.
-# Copy the tar-ball to a machine with external access.
--# On a machine with external access:
- -# sftp [USERNAME]\@frs.sf.net
- -# cd uploads
- -# 'put' the tarball
-# Create a new distro through the sourceforge web interface
- Login a project administrator
- - (Go through "'Admin' -> 'File Releases'" from the GearBox project page)
+ - Click on the 'Edit' link
+ - Click on "'Project Admin' -> 'File Manager'"
+ - Click on the gear icon next to 'gearbox' directory -> New Folder
+ - Name it with the new version name, e.g. 9.02
+ - Click on the gear icon next to the new folder -> Uploads Here
+ - Click on the 'Upload File' link above the directory listing, select the tar archive, wait for upload.
-# Update the web page
- change temporatily the last line of the script to say [USERNAME],ge...@sh...
- Use the script: <distro>/doc/rebuild_docco.sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 03:19:54
|
Revision: 470
http://gearbox.svn.sourceforge.net/gearbox/?rev=470&view=rev
Author: russo2503v
Date: 2009-11-18 03:19:48 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Tagging release 9.11
Added Paths:
-----------
gearbox/tags/RELEASE_9.11/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-18 03:17:59
|
Revision: 469
http://gearbox.svn.sourceforge.net/gearbox/?rev=469&view=rev
Author: russo2503v
Date: 2009-11-18 03:17:43 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
version++
Modified Paths:
--------------
gearbox/trunk/doc/history.dox
gearbox/trunk/doc/index.dox
Modified: gearbox/trunk/doc/history.dox
===================================================================
--- gearbox/trunk/doc/history.dox 2009-11-17 12:58:51 UTC (rev 468)
+++ gearbox/trunk/doc/history.dox 2009-11-18 03:17:43 UTC (rev 469)
@@ -1,5 +1,5 @@
/*
- * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
+ * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
* http://gearbox.sf.net/
* Copyright (c) 2008 GearBox Team
*
@@ -23,16 +23,17 @@
@section gbx_doc_history_todo To-Do List for Next Release
-@section gbx_doc_history_head Changes in SVN since Last Release
+None.
+@section gbx_doc_history_911 Changes in Release 9.11
+
@par Project wide
- build system
- added new variable GBX_DISABLE_ALL for the cases where only a few targets need to be built.
- cleaned up install directory definitions, all done in one place now.
+ - clean up to be packaged for Fedora.
-@par New libraries
-
@par Updated libraries
- libGbxNovatelAcfr:
@@ -108,7 +109,7 @@
@par New libraries
- libGbxNovatelAcfr
- - ACFR driver for a Novatel(SPAN) system. This is the implementation used by Sydney-Berkeley DGC'07 team.
+ - ACFR driver for a Novatel(SPAN) system. This is the implementation used by Sydney-Berkeley DGC'07 team.
(Michael M)
@par Updated libraries
@@ -117,15 +118,15 @@
- A bit more careful when dealing with chunks of buffer that can't be parsed, should be a bit more robust (AlexB).
- libGbxUtilAcfr
- - Changed interface for Tracer:
+ - Changed interface for Tracer:
- when querying verbosity, default destination argument is 'ToAny' (AlexB).
- moved trace type and destination enums out of the class into the namespace (alexm)
- added optional 'localOnly' parameter to all Tracer output function, i.e. info(), warn(), error(), debug().
This is to allow the use of Tracer for tracing network problems (otherwise a trace of a network problem will
lead to another trace, etc) (alexm)
- Changed implementation of TrivialTracer to allow multiple levels of tracing verbosity (AlexB).
- - Changed interface for Status:
- - status of subsystems is described in two orthogonal dimensions: state and health. (alexm)
+ - Changed interface for Status:
+ - status of subsystems is described in two orthogonal dimensions: state and health. (alexm)
- added infrastructure state to the component status and functions to set it. (alexm)
- added message() which only changes the human-readable message (alexm)
Modified: gearbox/trunk/doc/index.dox
===================================================================
--- gearbox/trunk/doc/index.dox 2009-11-17 12:58:51 UTC (rev 468)
+++ gearbox/trunk/doc/index.dox 2009-11-18 03:17:43 UTC (rev 469)
@@ -1,5 +1,5 @@
/*
- * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
+ * GearBox Project: Peer-Reviewed Open-Source Libraries for Robotics
* http://gearbox.sf.net/
* Copyright (c) 2008 GearBox Team
*
@@ -27,7 +27,7 @@
@defgroup gbx_win Windows
*/
-// without this gap between two doxygen definitions, the last group does not get
+// without this gap between two doxygen definitions, the last group does not get
// populated properly for some reason.
/*!
@@ -45,6 +45,7 @@
@section gbx_doc_index_news News
+- 18-Nov-09 Release 9.11. Several bug fixes in the libraries, build system cleanup to be packaged for Fedora. (@ref gbx_doc_history_911)
- 10-Jul-09 Release 9.07. Several bug fixes in the libraries, and the new ability for the flexiport library's UDP port type to handle broadcast data. (@ref gbx_doc_history_907)
- 18-Feb-09 Release 9.02. One new driver and a few updates in other libraries. (@ref gbx_doc_history_902)
- 25-Jul-08 Release 8.07. Includes 5 new libraries and a re-write of the Hokuyo driver. (@ref gbx_doc_history_807)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-17 12:58:58
|
Revision: 468
http://gearbox.svn.sourceforge.net/gearbox/?rev=468&view=rev
Author: russo2503v
Date: 2009-11-17 12:58:51 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
disable problematic nothing-to-export check. unlikely problem remains.
Modified Paths:
--------------
gearbox/trunk/cmake/WritePackageConfig.cmake
Modified: gearbox/trunk/cmake/WritePackageConfig.cmake
===================================================================
--- gearbox/trunk/cmake/WritePackageConfig.cmake 2009-11-17 12:56:23 UTC (rev 467)
+++ gearbox/trunk/cmake/WritePackageConfig.cmake 2009-11-17 12:58:51 UTC (rev 468)
@@ -28,12 +28,15 @@
DESTINATION ${_destination} )
# export targets (make sure there's something to export)
-if( DEFINED ${PROJECT_NAME}-targets )
+# TODO: it's not clear how to check if ${PROJECT_NAME}-targets is non-empty
+# what is this thing? a list? does not seem to a variable?
+# As it is now it will barf when all targets are disabled, e.g. with GBX_DISABLE_ALL=ON
+# if( DEFINED ${PROJECT_NAME}-targets )
install(
EXPORT ${PROJECT_NAME}-targets
# NAMESPACE import_
DESTINATION ${_destination} )
-endif()
+# endif()
set( _input_dir )
set( _output_dir )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-17 12:56:32
|
Revision: 467
http://gearbox.svn.sourceforge.net/gearbox/?rev=467&view=rev
Author: russo2503v
Date: 2009-11-17 12:56:23 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
comment only
Modified Paths:
--------------
gearbox/trunk/cmake/DependencyUtils.cmake
Modified: gearbox/trunk/cmake/DependencyUtils.cmake
===================================================================
--- gearbox/trunk/cmake/DependencyUtils.cmake 2009-11-13 07:28:40 UTC (rev 466)
+++ gearbox/trunk/cmake/DependencyUtils.cmake 2009-11-17 12:56:23 UTC (rev 467)
@@ -156,6 +156,7 @@
set( reason "${target_name} is not being built" )
endif( ${ARGC} GREATER 5 )
+ # TODO: should simply use this signature: if(NOT TARGET target_name)
GET_TARGET_PROPERTY( target_location ${target_name} LOCATION )
# must dereference both var and option names once (!) and IF will evaluate their values
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gb...@us...> - 2009-11-13 07:28:51
|
Revision: 466
http://gearbox.svn.sourceforge.net/gearbox/?rev=466&view=rev
Author: gbiggs
Date: 2009-11-13 07:28:40 +0000 (Fri, 13 Nov 2009)
Log Message:
-----------
Some UTM-30LX's use a different string to indicate USB in the baudrate line.
Modified Paths:
--------------
gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
Modified: gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp
===================================================================
--- gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2009-11-12 04:21:28 UTC (rev 465)
+++ gearbox/trunk/src/hokuyo_aist/hokuyo_aist.cpp 2009-11-13 07:28:40 UTC (rev 466)
@@ -2309,7 +2309,8 @@
info->measureState = &buffer[5];
else if (strncmp (buffer, "SBPS", 4) == 0)
{
- if (strncmp (&buffer[5], "USB only", 8) == 0)
+ if (strncmp (&buffer[5], "USB only", 8) == 0 ||
+ strncmp (&buffer[5], "USB Full Speed", 14) == 0)
{
// No baud rate for USB-only devices such as the UHG-08LX
info->baud = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-12 04:21:38
|
Revision: 465
http://gearbox.svn.sourceforge.net/gearbox/?rev=465&view=rev
Author: russo2503v
Date: 2009-11-12 04:21:28 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
added new variable GBX_DISABLE_ALL to override default build option for all targets
Modified Paths:
--------------
gearbox/trunk/cmake/DependencyUtils.cmake
gearbox/trunk/doc/buildsys.dox
Modified: gearbox/trunk/cmake/DependencyUtils.cmake
===================================================================
--- gearbox/trunk/cmake/DependencyUtils.cmake 2009-11-12 04:19:59 UTC (rev 464)
+++ gearbox/trunk/cmake/DependencyUtils.cmake 2009-11-12 04:21:28 UTC (rev 465)
@@ -37,7 +37,7 @@
endmacro( GBX_UTIL_MAKE_OPTION_NAME option_name module_name )
#
-# GBX_REQUIRE_OPTION( cumulative_var [EXE | LIB] module_name default_option_value [option_name] [OPTION DESCRIPTION] )
+# GBX_REQUIRE_OPTION( cumulative_var [EXE | LIB] module_name devel_option_value [option_name] [OPTION DESCRIPTION] )
#
# E.g.
# Initialize a variable first
@@ -47,25 +47,34 @@
# This does the same thing
# GBX_REQUIRE_OPTION ( build EXE localiser ON BUILD_LOCALISER )
#
-macro( GBX_REQUIRE_OPTION cumulative_var module_type module_name default_option_value )
+macro( GBX_REQUIRE_OPTION cumulative_var module_type module_name devel_option_value )
GBX_UTIL_CHECK_MODULE_TYPE( ${module_type} is_exe is_lib )
if( ${ARGC} GREATER 5 )
set( option_name ${ARGV6} )
- else( ${ARGC} GREATER 5 )
+ else()
GBX_UTIL_MAKE_OPTION_NAME( option_name ${module_type} ${module_name} )
- endif( ${ARGC} GREATER 5 )
+ endif()
if( ${ARGC} GREATER 6 )
set( option_descr ${ARGV7} )
- else( ${ARGC} GREATER 6 )
+ else()
set( option_descr "disabled by user, use ccmake to enable" )
- endif( ${ARGC} GREATER 6 )
+ endif()
+ # only affects the default option for this target
+ # individual targets can still be enabled
+ if( GBX_DISABLE_ALL )
+ set( default_option_value OFF )
+ set( option_descr "disabled by GBX_DISABLE_ALL, use ccmake to enable" )
+ else()
+ set( default_option_value ${devel_option_value} )
+ endif()
+
# debug
# message( STATUS
-# "GBX_REQUIRE_OPTION (CUM_VAR=${cumulative_var}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, default_option_value=${default_option_value}, OPT_NAME=${option_name}, OPT_DESC=${option_descr})" )
+# "GBX_REQUIRE_OPTION (CUM_VAR=${cumulative_var}, MOD_TYPE=${module_type}, MOD_NAME=${module_name}, devel_option_value=${devel_option_value}, OPT_NAME=${option_name}, OPT_DESC=${option_descr})" )
# set up the option
if( is_exe )
@@ -140,15 +149,15 @@
if( ${cumulative_var} )
GBX_UTIL_CHECK_MODULE_TYPE( ${module_type} is_exe is_lib )
-
+
if( ${ARGC} GREATER 5 )
set( reason ${ARGV6} )
else( ${ARGC} GREATER 5 )
set( reason "${target_name} is not being built" )
endif( ${ARGC} GREATER 5 )
-
+
GET_TARGET_PROPERTY( target_location ${target_name} LOCATION )
-
+
# must dereference both var and option names once (!) and IF will evaluate their values
if( NOT target_location )
set( ${cumulative_var} FALSE )
Modified: gearbox/trunk/doc/buildsys.dox
===================================================================
--- gearbox/trunk/doc/buildsys.dox 2009-11-12 04:19:59 UTC (rev 464)
+++ gearbox/trunk/doc/buildsys.dox 2009-11-12 04:21:28 UTC (rev 465)
@@ -97,9 +97,9 @@
Any text following "#" is a comment. Use them to explain uncommon usage.
This GearBox macro checks for user input into the build process. It is actually a shortcut which does several things:
-- Defines a CMake cache variable called @c BUILD_LIB_GBXADVANCED which can be used a user-controlled switch for turning compilation of this library ON and OFF. You will see this option when you run the @c ccmake tool. The option variable is defined the very first time CMake is run, and it is assigned the specified default value (ON).
-- Every time CMake runs, it checks the current value of the @c BUILD_LIB_GBXADVANCED variable. If the user configured it FALSE, then the value of @c build variable will also become FALSE.
-- If it is decided that the library will not be built due to user input a corresponding entry will be added to a global list and the name of the library will be printed out at the end of the CMake process under the "Will NOT build..." heading.
+- Defines a CMake cache variable called @c ENABLE_LIB_GBXADVANCED which can be used a user-controlled switch for turning compilation of this library ON and OFF. You will see this option when you run the @c ccmake tool. The option variable is defined the very first time CMake is run, and it is assigned the specified default value (ON in this case).
+- Every time CMake runs, it checks the current value of the @c ENABLE_LIB_GBXADVANCED variable. If the user has configured it to OFF, then the value of @c build variable will become OFF (aka FALSE).
+- If it is decided that the library will not be built due to user input, a corresponding entry will be added to a global list and the name of the library will be printed out at the end of the CMake process under the "Will NOT build..." heading.
Notice that to evaluate the variable you have to inclose it in braces and add a dollar sign, i.e. @c ${lib_name}. Without this, CMake would just treat it as text. (Similar to the UNIX shells).
@@ -110,6 +110,8 @@
@endverbatim
The last two parameters are optional and have sensible defaults. Nothing else in the build depends on these variables so it's safe to specify them.
+It is sometimes useful to disable compilation of all targets and then selectively enable a few. To do this set GBX_DISABLE_ALL to ON. In this case, all default compilation settings for all targets are set to OFF. It is still possible to individually enable targets with e.g. ENABLE_LIB_GBXADVANCED=ON. For GBX_DISABLE_ALL to take effect, make sure you clear CMake cache first, by deleting CMakeCache.txt file.
+
@verbatim
GBX_REQUIRE_VAR( build LIB ${lib_name} GBX_OS_LINUX "only Linux OS is supported" )
@endverbatim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-12 04:20:05
|
Revision: 464
http://gearbox.svn.sourceforge.net/gearbox/?rev=464&view=rev
Author: russo2503v
Date: 2009-11-12 04:19:59 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
gearbox/trunk/doc/history.dox
Modified: gearbox/trunk/doc/history.dox
===================================================================
--- gearbox/trunk/doc/history.dox 2009-11-12 04:19:13 UTC (rev 463)
+++ gearbox/trunk/doc/history.dox 2009-11-12 04:19:59 UTC (rev 464)
@@ -27,6 +27,10 @@
@par Project wide
+- build system
+ - added new variable GBX_DISABLE_ALL for the cases where only a few targets need to be built.
+ - cleaned up install directory definitions, all done in one place now.
+
@par New libraries
@par Updated libraries
@@ -42,6 +46,10 @@
- libflexiport
- Bugfix: Don't redeclare timespec if it already has been on Windows. (gbiggs)
+- libGbxUtilAcfr
+ - class History: API simplified and is rewritten for periodic storage of history (more suitable for
+ computers which can be powered off abruptly.
+
@section gbx_doc_history_907 Changes in Release 9.07
@par Updated libraries
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-12 04:19:20
|
Revision: 463
http://gearbox.svn.sourceforge.net/gearbox/?rev=463&view=rev
Author: russo2503v
Date: 2009-11-12 04:19:13 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
checks that export targets exist before installing
Modified Paths:
--------------
gearbox/trunk/cmake/WritePackageConfig.cmake
Modified: gearbox/trunk/cmake/WritePackageConfig.cmake
===================================================================
--- gearbox/trunk/cmake/WritePackageConfig.cmake 2009-11-10 07:07:12 UTC (rev 462)
+++ gearbox/trunk/cmake/WritePackageConfig.cmake 2009-11-12 04:19:13 UTC (rev 463)
@@ -27,11 +27,13 @@
FILES ${_output_dir}/${_output_file}
DESTINATION ${_destination} )
-# export targets
-install(
- EXPORT ${PROJECT_NAME}-targets
-# NAMESPACE import_
- DESTINATION ${_destination} )
+# export targets (make sure there's something to export)
+if( DEFINED ${PROJECT_NAME}-targets )
+ install(
+ EXPORT ${PROJECT_NAME}-targets
+ # NAMESPACE import_
+ DESTINATION ${_destination} )
+endif()
set( _input_dir )
set( _output_dir )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-10 07:07:27
|
Revision: 462
http://gearbox.svn.sourceforge.net/gearbox/?rev=462&view=rev
Author: russo2503v
Date: 2009-11-10 07:07:12 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
standard way of supplying pkgconfig description
Modified Paths:
--------------
gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt
gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt
gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
gearbox/trunk/src/gbxsickacfr/CMakeLists.txt
gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
Modified: gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
+++ gearbox/trunk/src/gbxgarminacfr/CMakeLists.txt 2009-11-10 07:07:12 UTC (rev 462)
@@ -1,5 +1,6 @@
set( lib_name GbxGarminAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Garmin GPS driver. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -18,7 +19,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Garmin GPS driver" "" dep_libs "" "" ${lib_version} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxgarminacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
+++ gearbox/trunk/src/gbxnovatelacfr/CMakeLists.txt 2009-11-10 07:07:12 UTC (rev 462)
@@ -1,5 +1,6 @@
set( lib_name GbxNovatelAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "NOVATEL INS/GPS driver. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -22,7 +23,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Drives NOVATEL hardware, directly connected to the computer." proj_libs dep_libs "" "" ${lib_version} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxnovatelacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxserialacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
+++ gearbox/trunk/src/gbxserialacfr/CMakeLists.txt 2009-11-10 07:07:12 UTC (rev 462)
@@ -1,5 +1,6 @@
set( lib_name GbxSerialAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "C++ class wrapping a serial port. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -24,7 +25,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "C++ class wrapping a serial port." "" dep_libs "" "" ${lib_version})
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version})
GBX_ADD_HEADERS( gbxserialacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxsickacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsickacfr/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
+++ gearbox/trunk/src/gbxsickacfr/CMakeLists.txt 2009-11-10 07:07:12 UTC (rev 462)
@@ -1,5 +1,6 @@
set( lib_name GbxSickAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "SICK laser scanner driver. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -11,7 +12,7 @@
set( dep_libs GbxUtilAcfr GbxIceUtilAcfr GbxSerialAcfr )
GBX_REQUIRE_LIBS( build LIB ${lib_name} ${dep_libs} )
-# these are built internally
+# these are built internally, so we don't have to check for them
set( dep_libs ${dep_libs} GbxSerialDeviceAcfr )
if( build )
@@ -26,7 +27,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Drives SICK hardware, directly connected to the computer." proj_libs dep_libs "" "" ${lib_version} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsickacfr ${hdrs} )
Modified: gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
+++ gearbox/trunk/src/gbxsmartbatteryacfr/CMakeLists.txt 2009-11-10 07:07:12 UTC (rev 462)
@@ -1,5 +1,6 @@
set( lib_name GbxSmartBatteryAcfr )
set( lib_version 1.0.0 )
+set( lib_desc "Interface library for Ocean Server battery systems. Part of GearBox." )
GBX_ADD_LICENSE( LGPL2+ )
set( build TRUE )
@@ -18,7 +19,7 @@
GBX_ADD_LIBRARY( ${lib_name} DEFAULT ${lib_version} ${srcs} )
target_link_libraries( ${lib_name} ${dep_libs} )
- GBX_ADD_PKGCONFIG( ${lib_name} "Interface library for Ocean Server battery systems" proj_libs dep_libs "" "" ${lib_version} )
+ GBX_ADD_PKGCONFIG( ${lib_name} ${lib_desc} dep_libs "" "" "" ${lib_version} )
GBX_ADD_HEADERS( gbxsmartbatteryacfr ${hdrs} )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-10 07:06:12
|
Revision: 461
http://gearbox.svn.sourceforge.net/gearbox/?rev=461&view=rev
Author: russo2503v
Date: 2009-11-10 07:05:53 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
GBX_ADD_PKGCONFIG expects the dependent libs to passed by ref
Modified Paths:
--------------
gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
Modified: gearbox/trunk/src/hokuyo_aist/CMakeLists.txt
===================================================================
--- gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2009-11-10 07:03:10 UTC (rev 460)
+++ gearbox/trunk/src/hokuyo_aist/CMakeLists.txt 2009-11-10 07:05:53 UTC (rev 461)
@@ -24,7 +24,7 @@
endif (WIN32)
GBX_ADD_LIBRARY (${libName} DEFAULT ${libVersion} ${srcs})
target_link_libraries (${libName} ${reqLibs})
- GBX_ADD_PKGCONFIG (${libName} ${libDesc} ${reqLibs} "" "" "" ${libVersion})
+ GBX_ADD_PKGCONFIG (${libName} ${libDesc} reqLibs "" "" "" ${libVersion})
GBX_ADD_HEADERS (${libName} ${hdrs})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-10 07:03:21
|
Revision: 460
http://gearbox.svn.sourceforge.net/gearbox/?rev=460&view=rev
Author: russo2503v
Date: 2009-11-10 07:03:10 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
now using proper variables for the install paths
Modified Paths:
--------------
gearbox/trunk/cmake/pkgconfig.in
Modified: gearbox/trunk/cmake/pkgconfig.in
===================================================================
--- gearbox/trunk/cmake/pkgconfig.in 2009-11-10 06:24:55 UTC (rev 459)
+++ gearbox/trunk/cmake/pkgconfig.in 2009-11-10 07:03:10 UTC (rev 460)
@@ -4,5 +4,5 @@
Description: @PKG_DESC@
Version: @PKG_VERSION@
Requires: @PKG_EXTERNAL_DEPS@
-Libs: -L@CMAKE_INSTALL_PREFIX@/lib/gearbox @PKG_LIBFLAGS@ -l@PKG_NAME@ @PKG_INTERNAL_DEPS@
-Cflags: -I@CMAKE_INSTALL_PREFIX@/include/gearbox @PKG_CFLAGS@
+Libs: -L@GBX_LIB_INSTALL_DIR@ @PKG_LIBFLAGS@ -l@PKG_NAME@ @PKG_INTERNAL_DEPS@
+Cflags: -I@GBX_INCLUDE_INSTALL_DIR@ @PKG_CFLAGS@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rus...@us...> - 2009-11-10 06:25:08
|
Revision: 459
http://gearbox.svn.sourceforge.net/gearbox/?rev=459&view=rev
Author: russo2503v
Date: 2009-11-10 06:24:55 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
patch from Rich for PPC systems
Modified Paths:
--------------
gearbox/trunk/src/gbxserialacfr/serial.cpp
Modified: gearbox/trunk/src/gbxserialacfr/serial.cpp
===================================================================
--- gearbox/trunk/src/gbxserialacfr/serial.cpp 2009-11-09 06:11:37 UTC (rev 458)
+++ gearbox/trunk/src/gbxserialacfr/serial.cpp 2009-11-10 06:24:55 UTC (rev 459)
@@ -25,7 +25,7 @@
#if __linux
# include <linux/serial.h>
#endif
-
+
#include <config.h>
#if HAVE_FILIO_H
// FIONREAD
@@ -34,7 +34,7 @@
//////////////////////////////
-// Ensure we have strnlen
+// Ensure we have strnlen
// eg. Solaris doesn't define strnlen in string.h, so define it here.
#if !HAVE_STRNLEN
@@ -42,7 +42,7 @@
// inline the fucker to guard against multiple inclusion, without the
// hassle of a special lib.
-inline size_t strnlen(const char *s, size_t maxlen)
+inline size_t strnlen(const char *s, size_t maxlen)
{
char *p;
if (s == NULL) {
@@ -137,7 +137,7 @@
stringstream ss;
ss << "Serial::"<<__func__<<"() Invalid baud rate: " << baudRate;
throw SerialException( ss.str() );
- }
+ }
}
int iBaudrate( int baudRate )
@@ -210,7 +210,7 @@
stringstream ss;
ss << "Serial::"<<__func__<<"() Invalid baud rate: " << baudRate;
throw SerialException( ss.str() );
- }
+ }
}
//Allow streaming of the term status structure type
@@ -225,13 +225,13 @@
s << "c_lflag -> 0x" << setw(4) << stat.c_lflag << endl;
s << "c_cc_array ->" << endl;
- s << "VINTR 0x" << setw(2) << static_cast<int>(stat.c_cc[VINTR])
- << ", VQUIT 0x" << setw(2) << static_cast<int>(stat.c_cc[VQUIT])
- << ", VERASE 0x" << setw(2) << static_cast<int>(stat.c_cc[VERASE])
+ s << "VINTR 0x" << setw(2) << static_cast<int>(stat.c_cc[VINTR])
+ << ", VQUIT 0x" << setw(2) << static_cast<int>(stat.c_cc[VQUIT])
+ << ", VERASE 0x" << setw(2) << static_cast<int>(stat.c_cc[VERASE])
<< ", VKILL 0x" << setw(2) << static_cast<int>(stat.c_cc[VKILL]) << endl ;
s << "VEOF 0x" << setw(2) << static_cast<int>(stat.c_cc[VEOF])
<< ", VEOL 0x" << setw(2) << static_cast<int>(stat.c_cc[VEOL])
- << ", VEOL2 0x" << setw(2) << static_cast<int>(stat.c_cc[VEOL2])
+ << ", VEOL2 0x" << setw(2) << static_cast<int>(stat.c_cc[VEOL2])
<< ", VSTART 0x" << setw(2) << static_cast<int>(stat.c_cc[VSTART]) << endl ;
s << "VSTOP 0x" << setw(2) << static_cast<int>(stat.c_cc[VSTOP])
<< ", VSUSP 0x" << setw(2) << static_cast<int>(stat.c_cc[VSUSP])
@@ -239,8 +239,8 @@
<< ", VLNEXT 0x" << setw(2) << static_cast<int>(stat.c_cc[VLNEXT]) << endl;
s << "VMIN 0x" << setw(2) << static_cast<int>(stat.c_cc[VMIN])
<< ", VTIME 0x" << setw(2) << static_cast<int>(stat.c_cc[VTIME]) << endl;
-
+
s << "c_iflag, Bits set" << endl;
if (stat.c_iflag & IGNBRK) { s << "IGNBRK,";}
if (stat.c_iflag & BRKINT) { s << "BRKINT,";}
@@ -282,7 +282,9 @@
if (stat.c_cflag & PARODD){ s << "PARODD,";}
if (stat.c_cflag & HUPCL){ s << "HUPCL,";}
if (stat.c_cflag & CLOCAL){ s << "CLOCAL,";}
+#if defined(CIBAUD)
if (stat.c_cflag & CIBAUD){ s << "CIBAUD,";}
+#endif
s << endl;
@@ -333,7 +335,7 @@
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
-
+
Serial::Serial( const std::string &dev,
int baudRate,
const Timeout &timeout,
@@ -346,7 +348,7 @@
{
if ( useLockFile )
{
- try {
+ try {
lockFile_ = new lockfile::LockFile( dev );
}
catch ( const lockfile::LockedByOtherProcessException &e )
@@ -366,7 +368,7 @@
try {
open();
setBaudRate( baudRate );
-
+
if(debugLevel_ > 2){
cout << "At end of Serial::Serial(): " << getStatusString();
}
@@ -377,21 +379,21 @@
throw;
}
}
-
+
Serial::~Serial()
{
close();
if ( lockFile_ ) delete lockFile_;
}
-void
+void
Serial::setTimeout( const Timeout &timeout )
{
bool newTimeoutsEnabled = !( timeout.sec == 0 && timeout.usec == 0 );
if ( timeoutsEnabled() != newTimeoutsEnabled )
{
stringstream ss;
- ss << "setTimeout() for port " << dev_
+ ss << "setTimeout() for port " << dev_
<<" tried to change enabled state of timeouts! Timeouts previously enabled: " << timeoutsEnabled();
throw SerialException( ss.str() );
}
@@ -429,7 +431,7 @@
portFd_ = -1;
}
-void
+void
Serial::setBaudRate(int baud)
{
struct termios localOptions;
@@ -466,17 +468,17 @@
//
struct serial_struct serinfo;
serinfo.reserved_char[0] = 0;
- if (ioctl(portFd_, TIOCGSERIAL, &serinfo) < 0)
+ if (ioctl(portFd_, TIOCGSERIAL, &serinfo) < 0)
{
stringstream ss;
ss << "Serial::"<<__func__<<"("<<baud<<"): error calling 'ioctl(portFd_, TIOCGSERIAL, &serinfo)': "<<strerror(errno);
throw SerialException( ss.str() );
}
-
+
serinfo.flags &= ~ASYNC_SPD_CUST;
serinfo.custom_divisor = 0;
-
- if (ioctl(portFd_, TIOCSSERIAL, &serinfo) < 0)
+
+ if (ioctl(portFd_, TIOCSSERIAL, &serinfo) < 0)
{
stringstream ss;
ss << "Serial::"<<__func__<<"("<<baud<<"): error calling 'ioctl(portFd_, TIOCSSERIAL, &serinfo)': "<<strerror(errno);
@@ -492,11 +494,11 @@
}
}
-void
+void
Serial::open(int flags)
{
struct termios localOptions;
-
+
if ( timeoutsEnabled() )
flags |= O_NONBLOCK;
@@ -572,7 +574,7 @@
ss << "Serial::"<<__func__<<"(): " << strerror(errno);
throw SerialException( ss.str() );
}
-
+
if ( debugLevel_ > 1 )
{
cout<<"TRACE(serial.cpp): just read: '";
@@ -595,7 +597,7 @@
char* bufPtr = static_cast<char*>(buf);
int got=0;
- while ( got < count )
+ while ( got < count )
{
char *offset = bufPtr + got;
int ret = ::read(portFd_, offset, count-got);
@@ -611,14 +613,14 @@
return -1;
}
}
-
+
else
{
stringstream ss;
ss << "Serial::"<<__func__<<": read(): "<<strerror(errno);
throw SerialException( ss.str() );
}
-
+
}
return got; //The number of bytes that we read.
@@ -629,8 +631,8 @@
{
if ( debugLevel_ > 0 ){
cout<<"TRACE(serial.cpp): "<<__func__<<"(): ";
- if(timeoutsEnabled()){
- cout << "timeouts enabled"<<endl;
+ if(timeoutsEnabled()){
+ cout << "timeouts enabled"<<endl;
}else{
cout << "timeouts not enabled"<<endl;
}
@@ -726,12 +728,12 @@
ss << "Serial::"<<__func__<<": select(): "<<strerror(errno);
throw SerialException( ss.str() );
}
-
+
return DATA_AVAILABLE;
}
-int
+int
Serial::writeString(const char *str)
{
if ( debugLevel_ > 0 )
@@ -782,12 +784,12 @@
stringstream ss;
ss << endl << " Device " << dev_ << " Status:-" << endl;
- ss << "In baud_rate: " << iBaudrate(cfgetispeed(&status))
+ ss << "In baud_rate: " << iBaudrate(cfgetispeed(&status))
<< " Out baud_rate: " << iBaudrate(cfgetospeed(&status)) << endl;
ss << status;
-
+
struct serial_struct serinfo;
- if (ioctl(portFd_, TIOCGSERIAL, &serinfo) < 0)
+ if (ioctl(portFd_, TIOCGSERIAL, &serinfo) < 0)
{
stringstream ss;
ss << "Serial::"<<__func__<<"(): error calling 'ioctl(portFd_, TIOCGSERIAL, &serinfo)': "<<strerror(errno);
@@ -799,7 +801,7 @@
}
-void
+void
Serial::flush()
{
int ret = tcflush(portFd_,TCIOFLUSH);
@@ -811,7 +813,7 @@
}
}
-void
+void
Serial::drain()
{
// wait till all output sent
@@ -823,7 +825,7 @@
}
}
-int
+int
Serial::write(const void *buf, int count)
{
if ( debugLevel_ > 0 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bo...@us...> - 2009-11-09 06:11:44
|
Revision: 458
http://gearbox.svn.sourceforge.net/gearbox/?rev=458&view=rev
Author: borax00
Date: 2009-11-09 06:11:37 +0000 (Mon, 09 Nov 2009)
Log Message:
-----------
MR Changes
Modified Paths:
--------------
gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.cpp
gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.h
gearbox/trunk/src/gbxserialacfr/serial.cpp
Modified: gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.cpp
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.cpp 2009-11-08 11:51:23 UTC (rev 457)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.cpp 2009-11-09 06:11:37 UTC (rev 458)
@@ -109,7 +109,8 @@
{
unlink(pbuf);
stringstream ss; ss << "device " << dev << " is already locked by process PID " << pidOfLocker;
- throw LockFileException( ss.str() );
+ // Throw a special exception which indicates this case
+ throw LockedByOtherProcessException( ss.str() );
}
else if ( errno == ESRCH )
{
Modified: gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.h
===================================================================
--- gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.h 2009-11-08 11:51:23 UTC (rev 457)
+++ gearbox/trunk/src/gbxserialacfr/lockfile/lockfile.h 2009-11-09 06:11:37 UTC (rev 458)
@@ -23,15 +23,24 @@
{
std::string message_;
public:
- LockFileException(const char *message)
+ LockFileException( const std::string &message )
: message_(message) {}
- LockFileException(const std::string &message)
- : message_(message) {}
~LockFileException()throw(){}
virtual const char* what() const throw() { return message_.c_str(); }
};
//!
+//! @brief Thrown when we try to lock a resource which has been locked by another process.
+//!
+class LockedByOtherProcessException : public LockFileException
+{
+public:
+ LockedByOtherProcessException( const std::string &message )
+ : LockFileException(message) {}
+ ~LockedByOtherProcessException()throw(){}
+};
+
+//!
//! Creates a lock-file (in /var/lock) which can be used to prevent multiple access to
//! a unique resource (eg "/dev/xxx").
//! Stores the PID of the locking process (lockPid), so it can check for stale lock-files.
Modified: gearbox/trunk/src/gbxserialacfr/serial.cpp
===================================================================
--- gearbox/trunk/src/gbxserialacfr/serial.cpp 2009-11-08 11:51:23 UTC (rev 457)
+++ gearbox/trunk/src/gbxserialacfr/serial.cpp 2009-11-09 06:11:37 UTC (rev 458)
@@ -349,11 +349,17 @@
try {
lockFile_ = new lockfile::LockFile( dev );
}
+ catch ( const lockfile::LockedByOtherProcessException &e )
+ {
+ stringstream ss;
+ ss << "Couldn't get lock for device " << dev << ": " << e.what();
+ throw lockfile::LockedByOtherProcessException( ss.str() );
+ }
catch ( const lockfile::LockFileException &e )
{
stringstream ss;
ss << "Couldn't get lock for device " << dev << ": " << e.what();
- throw SerialException( ss.str() );
+ throw lockfile::LockFileException( ss.str() );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|