diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-23 08:23:55 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-03-23 08:23:55 -0700 |
| commit | 8ca044047166a018d43a41969b885184c4442b8d (patch) | |
| tree | fddef395a205bdfe03ec69f5dc85351b7b451ebd /apps | |
| parent | bee896786a3236d7dac3f5460c56ff6e335f1e23 (diff) | |
| parent | 4ae4a29a17b152c87f59f06b8b50761b7a3610c7 (diff) | |
| download | px4-firmware-8ca044047166a018d43a41969b885184c4442b8d.tar.gz px4-firmware-8ca044047166a018d43a41969b885184c4442b8d.tar.bz2 px4-firmware-8ca044047166a018d43a41969b885184c4442b8d.zip | |
Merge pull request #240 from PX4/usb_hil
Added startup scripts useful when running USB consoles, made MAVLink awa...
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/mavlink/mavlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c index b958d5f96..644b779af 100644 --- a/apps/mavlink/mavlink.c +++ b/apps/mavlink/mavlink.c @@ -442,7 +442,8 @@ int mavlink_open_uart(int baud, const char *uart_name, struct termios *uart_conf int termios_state; *is_usb = false; - if (strcmp(uart_name, "/dev/ttyACM0") != OK) { + /* make some wild guesses including that USB serial is indicated by either /dev/ttyACM0 or /dev/console */ + if (strcmp(uart_name, "/dev/ttyACM0") != OK && strcmp(uart_name, "/dev/console") != OK) { /* Back up the original uart configuration to restore it after exit */ if ((termios_state = tcgetattr(uart, uart_config_original)) < 0) { fprintf(stderr, "[mavlink] ERROR getting baudrate / termios config for %s: %d\n", uart_name, termios_state); |