diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-07 08:40:14 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-07 08:40:14 -0600 |
| commit | f6f54d70b768dca1715ddddea64a4df00d82b09e (patch) | |
| tree | 7d38769a1ffe092bc7ac062fb0355f5532e4c016 /src/product | |
| parent | 1c344b760776cd5d8c0297d8db9bf02687381b4e (diff) | |
| parent | 0d10e25766b96f5660e213115cf27b71ff164405 (diff) | |
Merge remote-tracking branch 'uniarch/master' into multiarch
Conflicts:
src/core/ao_cmd.c
Use ao_arch_reboot after waiting for a second
Diffstat (limited to 'src/product')
| -rw-r--r-- | src/product/ao_telemetrum.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/product/ao_telemetrum.c b/src/product/ao_telemetrum.c index f560740a..ea77f5af 100644 --- a/src/product/ao_telemetrum.c +++ b/src/product/ao_telemetrum.c @@ -57,7 +57,7 @@ main(void) ao_gps_report_init(); ao_telemetry_init(); ao_radio_init(); - ao_packet_slave_init(TRUE); + ao_packet_slave_init(FALSE); ao_igniter_init(); #if HAS_DBG ao_dbg_init(); |