diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 13:53:22 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 13:53:22 +0200 |
commit | f02de30c32acd313dcb4d9e5561634d5a3ab758c (patch) | |
tree | 954e3dc54aa4900add3abd35c11f6d9360e8a305 /src/modules/mavlink/mavlink_main.cpp | |
parent | 90a40dda866b8c8db7f183f7f184d5d4edaa7620 (diff) | |
parent | bf5061aa21872c98576d46aee894e670ce0c52a0 (diff) | |
download | px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.tar.gz px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.tar.bz2 px4-firmware-f02de30c32acd313dcb4d9e5561634d5a3ab758c.zip |
Merge branch 'master' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
-rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index a182d940d..ee5e7aa3a 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1576,32 +1576,36 @@ Mavlink::configure_stream(const char *stream_name, const float rate) /* delete stream */ LL_DELETE(_streams, stream); delete stream; + warnx("deleted stream %s", stream->get_name()); } return OK; } } - if (interval > 0) { - /* search for stream with specified name in supported streams list */ - for (unsigned int i = 0; streams_list[i] != nullptr; i++) { + if (interval == 0) { + /* stream was not active and is requested to be disabled, do nothing */ + return OK; + } - if (strcmp(stream_name, streams_list[i]->get_name()) == 0) { - /* create new instance */ - stream = streams_list[i]->new_instance(); - stream->set_channel(get_channel()); - stream->set_interval(interval); - stream->subscribe(this); - LL_APPEND(_streams, stream); - return OK; - } - } + /* search for stream with specified name in supported streams list */ + for (unsigned int i = 0; streams_list[i] != nullptr; i++) { - } else { - /* stream not found, nothing to disable */ - return OK; + if (strcmp(stream_name, streams_list[i]->get_name()) == 0) { + /* create new instance */ + stream = streams_list[i]->new_instance(); + stream->set_channel(get_channel()); + stream->set_interval(interval); + stream->subscribe(this); + LL_APPEND(_streams, stream); + + return OK; + } } + /* if we reach here, the stream list does not contain the stream */ + warnx("stream %s not found", stream_name); + return ERROR; } |