diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
| commit | c37ff71e625310cdc777719a04c3702d9afa1f7f (patch) | |
| tree | 714ecb7b510e7ff53080ce3f0caebe8b128a26f5 /src/drivers/hott/hott_telemetry/hott_telemetry.cpp | |
| parent | f36f54c621cb5b36d345c5a26f72e89fc948fa65 (diff) | |
| parent | 512779907e06f059a15d54c88d71b73aad9aced0 (diff) | |
| download | px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.gz px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.bz2 px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
makefiles/config_px4fmu-v2_test.mk
Diffstat (limited to 'src/drivers/hott/hott_telemetry/hott_telemetry.cpp')
| -rw-r--r-- | src/drivers/hott/hott_telemetry/hott_telemetry.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/hott/hott_telemetry/hott_telemetry.cpp b/src/drivers/hott/hott_telemetry/hott_telemetry.cpp index d293f9954..edbb14172 100644 --- a/src/drivers/hott/hott_telemetry/hott_telemetry.cpp +++ b/src/drivers/hott/hott_telemetry/hott_telemetry.cpp @@ -230,7 +230,7 @@ hott_telemetry_main(int argc, char *argv[]) if (!strcmp(argv[1], "start")) { if (thread_running) { - warnx("deamon already running"); + warnx("already running"); exit(0); } @@ -251,10 +251,10 @@ hott_telemetry_main(int argc, char *argv[]) if (!strcmp(argv[1], "status")) { if (thread_running) { - warnx("daemon is running"); + warnx("is running"); } else { - warnx("daemon not started"); + warnx("not started"); } exit(0); |