fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 20:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve param wrapper for ros, prepare for px4

Browse Source
This commit is contained in:
Thomas Gubler
2014-12-03 14:43:03 +01:00
parent 6a99b04fb7
commit 1c79f0cef1
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/px4_defines.h
+15 -2
View File
@@ -51,8 +51,18 @@
#define PX4_TOPIC_T(_name) _name
#define PX4_SUBSCRIBE_CBMETH(_nodehandle, _name, _cbf, _obj, _interval) _nodehandle.subscribe(PX4_TOPIC(_name), &_cbf, &_obj);
#define PX4_SUBSCRIBE_CBFUNC(_nodehandle, _name, _cbf, _interval) _nodehandle.subscribe(PX4_TOPIC(_name), _cbf);
#define PX4_PARAM_INIT(_name, _default) ros::param::set(_name, _default);
#define PX4_PARAM_GET(_name, _destpt) ros::param::get(_name, *_destpt)
typedef const std::string px4_param_t;
static inline px4_param_t ROS_PARAM_SET(const std::string &name, int32_t value) {
ros::param::set(name, value);
return (px4_param_t)name;
};
static inline px4_param_t ROS_PARAM_SET(const std::string &name, float value) {
ros::param::set(name, value);
return (px4_param_t)name;
};
#define PX4_PARAM_INIT(_name, _default) ROS_PARAM_SET(_name, _default)
// #define PX4_PARAM_INIT(_name, _default) ros::param::set(_name, _default)
#define PX4_PARAM_GET(_handle, _destpt) ros::param::get(_handle, *_destpt)
#else
/*
* Building for NuttX
@@ -65,6 +75,9 @@
#define PX4_TOPIC_T(_name) _name##_s
#define PX4_SUBSCRIBE_CBMETH(_nodehandle, _name, _cbf, _obj, _interval) _nodehandle.subscribe<PX4_TOPIC_T(_name)>(PX4_TOPIC(_name), std::bind(&_cbf, _obj, std::placeholders::_1), _interval)
#define PX4_SUBSCRIBE_CBFUNC(_nodehandle, _name, _cbf, _interval) _nodehandle.subscribe<PX4_TOPIC_T(_name)>(PX4_TOPIC(_name), std::bind(&_cbf, std::placeholders::_1), _interval)
typedef param_t px4_param_t
#define PX4_PARAM_INIT(_name, _default) param_find(_name)
#define PX4_PARAM_GET(_handle, _destpt) param_get(_handle, _destpt)
#endif
/* Overload the PX4_SUBSCRIBE macro to suppport methods and pure functions as callback */
src/platforms/px4_nodehandle.h
+1
View File
@@ -99,6 +99,7 @@ public:
void spin() { ros::spin(); }
void spinOnce() { ros::spinOnce(); }
private:
static const uint32_t kQueueSizeDefault = 1000;
std::list<Subscriber*> _subs;