diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-28 22:52:58 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-28 22:52:58 -0600 |
| commit | dcc51bb18985c24fa35bce0dd42ea3d847b960bf (patch) | |
| tree | 652c06c900b01b3c43f674e0f121109cc54b1120 /ao-tools/ao-dbg/ao-dbg-parse.c | |
| parent | 7c82acc1c1c5b7b4da7c7ecb3b2fd90140e4c703 (diff) | |
| parent | a73b02518fcbc9fc0807ed8e141d3a06e8ad8214 (diff) | |
Merge remote-tracking branch 'origin/telemini'
Signed-off-by: Keith Packard <keithp@keithp.com>
Conflicts:
src/core/ao_telemetry.c
src/core/ao_telemetry.h
Added both Mini and Metrum telemetry defines
Diffstat (limited to 'ao-tools/ao-dbg/ao-dbg-parse.c')
| -rw-r--r-- | ao-tools/ao-dbg/ao-dbg-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ao-tools/ao-dbg/ao-dbg-parse.c b/ao-tools/ao-dbg/ao-dbg-parse.c index dcb9099d..ba691834 100644 --- a/ao-tools/ao-dbg/ao-dbg-parse.c +++ b/ao-tools/ao-dbg/ao-dbg-parse.c @@ -198,7 +198,7 @@ command_read (void) if (!s51_tty) { if (!s51_device) s51_device = getenv("AO_DBG_DEVICE"); - s51_tty = cc_usbdevs_find_by_arg(s51_device, "TIDongle"); + s51_tty = cc_usbdevs_find_by_arg(s51_device, "TeleDongle"); } s51_dbg = ccdbg_open (s51_tty); if (!s51_dbg) |