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_config.c | |
| parent | 75912f8af04cecc0bbffecb2072d465c3744d4e8 (diff) | |
| parent | c10f9a438ed5789479d21c78153ca7f14c05534c (diff) | |
Merge branch 'master' into aprs
Diffstat (limited to 'src/core/ao_config.c')
| -rw-r--r-- | src/core/ao_config.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/ao_config.c b/src/core/ao_config.c index df40ff90..63158158 100644 --- a/src/core/ao_config.c +++ b/src/core/ao_config.c @@ -529,15 +529,15 @@ __code struct ao_config_var ao_config_vars[] = { ao_config_callsign_set, ao_config_callsign_show }, { "e <0 disable, 1 enable>\0Enable telemetry and RDF", ao_config_radio_enable_set, ao_config_radio_enable_show }, + { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))", + ao_config_radio_cal_set, ao_config_radio_cal_show }, #endif /* HAS_RADIO */ #if HAS_ACCEL { "a <+g> <-g>\0Accel calib (0 for auto)", ao_config_accel_calibrate_set,ao_config_accel_calibrate_show }, + { "o <0 antenna up, 1 antenna down>\0Set pad orientation", + ao_config_pad_orientation_set,ao_config_pad_orientation_show }, #endif /* HAS_ACCEL */ -#if HAS_RADIO - { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))", - ao_config_radio_cal_set, ao_config_radio_cal_show }, -#endif /* HAS_RADIO */ #if HAS_LOG { "l <size>\0Flight log size (kB)", ao_config_log_set, ao_config_log_show }, @@ -546,10 +546,6 @@ __code struct ao_config_var ao_config_vars[] = { { "i <0 dual, 1 apogee, 2 main>\0Set igniter mode", ao_config_ignite_mode_set, ao_config_ignite_mode_show }, #endif -#if HAS_ACCEL - { "o <0 antenna up, 1 antenna down>\0Set pad orientation", - ao_config_pad_orientation_set,ao_config_pad_orientation_show }, -#endif #if HAS_AES { "k <32 hex digits>\0Set AES encryption key", ao_config_key_set, ao_config_key_show }, |