diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-06-29 00:03:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-06-29 00:03:52 +0000 |
| commit | 1b38f28dcbf2f51b17e8ec8f647db40f4b919258 (patch) | |
| tree | c4b11ed74432593f118465b0477cf879b2c5cb67 | |
| parent | c68bc1899070aefd9e84096fa627bee18e3c0dcb (diff) | |
| parent | ffab6de9c0e87fa8019d6a090d847b9017d2e015 (diff) | |
Merge "Remove useless code and declare iio_infos in C code"
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | binding/config_iiodevices.h | 9 | ||||
| -rw-r--r-- | binding/iiodevices-binding.c | 9 |
3 files changed, 14 insertions, 14 deletions
@@ -16,16 +16,16 @@ subscription. | Name | Description | JSON Parameters | |:-------------------|:--------------------------------------------|:--------------------------------------------------------------- | -| subscribe | subscribe to 9 axis events | *Request:* {"event": "accel", "args":"xy", "frequency": "10" }| -| unsubscribe | unsubscribe to accelero events | *Request:* {"event": "accel" } | +| subscribe | subscribe to 9 axis events | *Request:* {"event": "acceleration", "args":"xy", "frequency": "10" }| +| unsubscribe | unsubscribe to accelero events | *Request:* {"event": "acceleration" } | ## Events For now, there are 3 different events matching with the different available sensors. -* "accel": is for acceleration data -* "magn": is for gyroscope data -* "anglvel": is for electronic compass data +* "acceleration": is for acceleration data +* "gyroscope": is for gyroscope data +* "compass": is for electronic compass data ## Frequency diff --git a/binding/config_iiodevices.h b/binding/config_iiodevices.h index 9e99045..85189bc 100644 --- a/binding/config_iiodevices.h +++ b/binding/config_iiodevices.h @@ -9,20 +9,13 @@ struct iio_info { const char *dev_name; const char *id; -}; - -#define IIO_INFOS_SIZE 3 -static struct iio_info iio_infos[IIO_INFOS_SIZE] = { - { "16-001d", "accel"}, - { "16-001d", "magn"}, - { "16-006b", "anglvel"} + const char *middlename; }; enum iio_elements { X = 1, Y = 2, Z = 4 }; void set_channel_name(char *name, enum iio_elements iioelts); enum iio_elements treat_iio_elts(const char *iioelts_string); -enum iio_infos treat_iio_infos(const char *infos); int get_iio_nb(enum iio_elements iioelts); #endif //_CONFIG_IIODEVICES_ diff --git a/binding/iiodevices-binding.c b/binding/iiodevices-binding.c index 8e18fd0..affd4b9 100644 --- a/binding/iiodevices-binding.c +++ b/binding/iiodevices-binding.c @@ -58,6 +58,13 @@ static struct client_sub * clients = NULL; /*save last registered client*/ static struct client_sub * last_client = NULL; +/* Static definition of supported iiodevices */ +static struct iio_info iio_infos[] = { + { "16-001d", "acceleration", "accel"}, + { "16-001d", "gyroscope", "magn"}, + { "16-006b", "compass", "anglvel"} +}; + /*get event by afb_event*/ static struct event *event_get_event(const struct afb_event *event) { @@ -397,7 +404,7 @@ static struct channels* set_channel( chn->iioelts = i; /*set channel name with iio_elements*/ - strncpy(chn->name, client->infos->id, PATH_MAX); + strncpy(chn->name, client->infos->middlename, PATH_MAX); set_channel_name(chn->name, i); if(!(chn->chn = iio_device_find_channel(client->dev, chn->name, false))) { |