fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 07:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

tune_control: add max iteration count for the string and lib test calls

Browse Source
This commit is contained in:
Simone Guscetti
2018-01-29 09:45:59 -05:00
committed by Daniel Agar
parent f7aad844a3
commit dcfd2f1579
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tune_control/tune_control.cpp
+16 -1
View File
@@ -48,6 +48,8 @@
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#define MAX_NOTE_ITERATION 50
static void usage(void); static void usage(void);
static orb_advert_t tune_control_pub = nullptr; static orb_advert_t tune_control_pub = nullptr;
@@ -202,6 +204,7 @@ tune_control_main(int argc, char *argv[])
} }
unsigned frequency, duration, silence; unsigned frequency, duration, silence;
int exit_counter = 0;
if (!strcmp(argv[myoptind], "play")) { if (!strcmp(argv[myoptind], "play")) {
if (string_input) { if (string_input) {
@@ -213,9 +216,15 @@ tune_control_main(int argc, char *argv[])
tune_control.duration = (uint32_t)duration; tune_control.duration = (uint32_t)duration;
publish_tune_control(tune_control); publish_tune_control(tune_control);
usleep(duration + silence); usleep(duration + silence);
exit_counter++;
// exit if the loop is doing more thatn 50 iteration
if (exit_counter > MAX_NOTE_ITERATION) {
break;
}
} }
PX4_INFO("Playback finished.") PX4_INFO("Playback finished.");
} else { } else {
if (tune_control.tune_id == 0) { if (tune_control.tune_id == 0) {
@@ -230,6 +239,12 @@ tune_control_main(int argc, char *argv[])
while (tunes.parse_cmd(tune_control, frequency, duration, silence) > 0) { while (tunes.parse_cmd(tune_control, frequency, duration, silence) > 0) {
PX4_INFO("frequency: %d, duration %d, silence %d", frequency, duration, silence); PX4_INFO("frequency: %d, duration %d, silence %d", frequency, duration, silence);
usleep(500000); usleep(500000);
exit_counter++;
// exit if the loop is doing more thatn 50 iteration
if (exit_counter > MAX_NOTE_ITERATION) {
break;
}
} }
} else { } else {