diff options
| author | Lorenz Meier <lm@qgroundcontrol.org> | 2014-09-17 16:01:32 -0500 |
|---|---|---|
| committer | Lorenz Meier <lm@qgroundcontrol.org> | 2014-09-17 16:01:32 -0500 |
| commit | 9432fe559e7b89e316aca3d09f2e72ba9fe64aeb (patch) | |
| tree | de2858838ab2e16981fd6dac5494270b927f8404 | |
| parent | d8e0a22cbc59ed435519ad66a44b14b05ef9bbf9 (diff) | |
| parent | 50f7e27d13e3dfc4b94f17a06f29d775e47627f9 (diff) | |
| download | px4-firmware-9432fe559e7b89e316aca3d09f2e72ba9fe64aeb.tar.gz px4-firmware-9432fe559e7b89e316aca3d09f2e72ba9fe64aeb.tar.bz2 px4-firmware-9432fe559e7b89e316aca3d09f2e72ba9fe64aeb.zip | |
Merge pull request #1361 from muharred/master
Fixed parameter storage to support struct parameters.
| -rw-r--r-- | src/modules/systemlib/param/param.c | 3 | ||||
| -rw-r--r-- | src/modules/systemlib/param/param.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/systemlib/param/param.c b/src/modules/systemlib/param/param.c index e44e6cdb0..6b8d0e634 100644 --- a/src/modules/systemlib/param/param.c +++ b/src/modules/systemlib/param/param.c @@ -322,7 +322,8 @@ param_get_value_ptr(param_t param) v = ¶m_info_base[param].val; } - if (param_type(param) == PARAM_TYPE_STRUCT) { + if (param_type(param) >= PARAM_TYPE_STRUCT + && param_type(param) <= PARAM_TYPE_STRUCT_MAX) { result = v->p; } else { diff --git a/src/modules/systemlib/param/param.h b/src/modules/systemlib/param/param.h index 084cd931a..dc73b37e9 100644 --- a/src/modules/systemlib/param/param.h +++ b/src/modules/systemlib/param/param.h @@ -307,7 +307,7 @@ __EXPORT int param_load_default(void); struct param_info_s __param__##_name = { \ #_name, \ PARAM_TYPE_STRUCT + sizeof(_default), \ - .val.p = &_default; \ + .val.p = &_default \ } /** |