dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

improve and fix multiplatform param by name macro

This commit is contained in:
Thomas Gubler 2014-12-17 16:31:40 +01:00
parent 0a1e94d504
commit 4402d7106b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/systemlib/circuit_breaker.cpp
View File

@ -48,8 +48,7 @@
bool circuit_breaker_enabled(const char* breaker, int32_t magic)
{
int32_t val;
/* (void)param_get(param_find(breaker), &val); */
(void)PX4_PARAM_GET_NAME(breaker, &val);
(void)PX4_PARAM_GET_BYNAME(breaker, &val);
return (val == magic);
}

4
src/platforms/px4_defines.h
View File

@ -97,7 +97,7 @@ static inline px4_param_t PX4_ROS_PARAM_SET(const char *name, float value)
#define PX4_PARAM_GET(_handle, _destpt) ros::param::get(_handle, *_destpt)
/* Get value of parameter by name, which is equal to the handle for ros */
#define PX4_PARAM_GET_NAME(_name, _destpt) PX4_PARAM_GET(_name, _destpt)
#define PX4_PARAM_GET_BYNAME(_name, _destpt) PX4_PARAM_GET(_name, _destpt)
#define OK 0
#define ERROR -1
@ -170,7 +170,7 @@ typedef param_t px4_param_t;
#define PX4_PARAM_GET(_handle, _destpt) param_get(_handle, _destpt)
/* Get value of parameter by name */
#define PX4_PARAM_GET_NAME(_name, _destpt) param_get(PX4_PARAM_INIT(_name), _destpt)
#define PX4_PARAM_GET_BYNAME(_name, _destpt) param_get(param_find(_name), _destpt)
/* XXX this is a hack to resolve conflicts with NuttX headers */
#define isspace(c) \