diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-04 18:53:34 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-04 18:53:34 +0100 |
commit | 552ff809693d340ba6f5fed6837b99effe8bf2c3 (patch) | |
tree | 608611b5ef05185de198202fb097e6b222481c68 /src/systemcmds | |
parent | d805d6aaf8334c7f8ceaac6cc6898f2e1d58cfb9 (diff) | |
download | px4-firmware-552ff809693d340ba6f5fed6837b99effe8bf2c3.tar.gz px4-firmware-552ff809693d340ba6f5fed6837b99effe8bf2c3.tar.bz2 px4-firmware-552ff809693d340ba6f5fed6837b99effe8bf2c3.zip |
Fix NSH timeout logic
Diffstat (limited to 'src/systemcmds')
-rw-r--r-- | src/systemcmds/nshterm/nshterm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/systemcmds/nshterm/nshterm.c b/src/systemcmds/nshterm/nshterm.c index edeb5c624..c2ea2a1cc 100644 --- a/src/systemcmds/nshterm/nshterm.c +++ b/src/systemcmds/nshterm/nshterm.c @@ -66,20 +66,18 @@ nshterm_main(int argc, char *argv[]) int fd = -1; int armed_fd = orb_subscribe(ORB_ID(actuator_armed)); struct actuator_armed_s armed; - /* we assume the system does not provide arming status feedback */ - bool armed_updated = false; - /* try the first 30 seconds or if arming system is ready */ - while ((retries < 300) || armed_updated) { + /* try to bring up the console - stop doing so if the system gets armed */ + while (true) { /* abort if an arming topic is published and system is armed */ bool updated = false; - if (orb_check(armed_fd, &updated)) { + orb_check(armed_fd, &updated) + if (updated) { /* the system is now providing arming status feedback. * instead of timing out, we resort to abort bringing * up the terminal. */ - armed_updated = true; orb_copy(ORB_ID(actuator_armed), armed_fd, &armed); if (armed.armed) { |