diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-11 08:21:48 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-11 08:21:48 -0700 |
| commit | 3ac760978f3cd4be1ede595e1802d38d28ce1d96 (patch) | |
| tree | 98bf248cbd9a17d0a51335c27a412328a0db479a /src/drivers | |
| parent | 7a6a8ea53a94a71138e3cedcb0e3733ca15e0f10 (diff) | |
| parent | 39b3fc8d32ebaa0a9a01e73399884b007e97b378 (diff) | |
| download | px4-firmware-3ac760978f3cd4be1ede595e1802d38d28ce1d96.tar.gz px4-firmware-3ac760978f3cd4be1ede595e1802d38d28ce1d96.tar.bz2 px4-firmware-3ac760978f3cd4be1ede595e1802d38d28ce1d96.zip | |
Merge pull request #331 from jean-m-cyr/master
Don't leave RX in bind mode if console open fails
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 08aef7069..ae56b70b3 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1696,8 +1696,6 @@ bind(int argc, char *argv[]) else errx(1, "unknown parameter %s, use dsm2 or dsmx", argv[2]); - g_dev->ioctl(nullptr, DSM_BIND_START, pulses); - /* Open console directly to grab CTRL-C signal */ int console = open("/dev/console", O_NONBLOCK | O_RDONLY | O_NOCTTY); if (!console) @@ -1706,6 +1704,8 @@ bind(int argc, char *argv[]) warnx("This command will only bind DSM if satellite VCC (red wire) is controlled by relay 1."); warnx("Press CTRL-C or 'c' when done."); + g_dev->ioctl(nullptr, DSM_BIND_START, pulses); + for (;;) { usleep(500000L); /* Check if user wants to quit */ |