diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 09:59:45 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 09:59:45 +0200 |
| commit | 857b843d445f59f2dc393e4d5f879fc56f77a0e0 (patch) | |
| tree | a5167e5c336b4f8fcb1550317c7e26da7bfedbfe /src/modules/mavlink/mavlink_main.cpp | |
| parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
| parent | 92adbe9216c96c53d1baa4eb1e14b4ede272c080 (diff) | |
| download | px4-firmware-857b843d445f59f2dc393e4d5f879fc56f77a0e0.tar.gz px4-firmware-857b843d445f59f2dc393e4d5f879fc56f77a0e0.tar.bz2 px4-firmware-857b843d445f59f2dc393e4d5f879fc56f77a0e0.zip | |
Merge pull request #1095 from DonLakeFlyer/CompilerWarnings
Fix compiler warnings
Diffstat (limited to 'src/modules/mavlink/mavlink_main.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 9a5e31ef4..43acee96f 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -2266,13 +2266,13 @@ Mavlink::start(int argc, char *argv[]) } void -Mavlink::status() +Mavlink::display_status() { warnx("running"); } int -Mavlink::stream(int argc, char *argv[]) +Mavlink::stream_command(int argc, char *argv[]) { const char *device_name = DEFAULT_DEVICE_NAME; float rate = -1.0f; @@ -2360,7 +2360,7 @@ int mavlink_main(int argc, char *argv[]) // mavlink::g_mavlink->status(); } else if (!strcmp(argv[1], "stream")) { - return Mavlink::stream(argc, argv); + return Mavlink::stream_command(argc, argv); } else { usage(); |