diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-07 10:14:11 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-07 10:14:11 -0800 |
| commit | 748e42ebf1dfb1efd5dec6ddd93f5c7aeedeb01d (patch) | |
| tree | 397e2e5b1086c8b34ca94a6c2a347d2df42ab173 /src/core/ao_cmd.c | |
| parent | 75912f8af04cecc0bbffecb2072d465c3744d4e8 (diff) | |
| parent | c10f9a438ed5789479d21c78153ca7f14c05534c (diff) | |
Merge branch 'master' into aprs
Diffstat (limited to 'src/core/ao_cmd.c')
| -rw-r--r-- | src/core/ao_cmd.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c index a3330974..3d086a57 100644 --- a/src/core/ao_cmd.c +++ b/src/core/ao_cmd.c @@ -265,12 +265,25 @@ ao_reboot(void) static void version(void) { - printf("manufacturer %s\n", ao_manufacturer); - printf("product %s\n", ao_product); - printf("serial-number %u\n", ao_serial_number); + printf("manufacturer %s\n" + "product %s\n" + "serial-number %u\n" +#if HAS_FLIGHT + "current-flight %u\n" +#endif +#if HAS_LOG + "log-format %u\n" +#endif + , ao_manufacturer + , ao_product + , ao_serial_number +#if HAS_FLIGHT + , ao_flight_number +#endif #if HAS_LOG - printf("log-format %u\n", ao_log_format); + , ao_log_format #endif + ); #if HAS_MS5607 ao_ms5607_info(); #endif |