From: Keith Packard <keithp@keithp.com>
Date: Fri, 7 Dec 2012 18:14:11 +0000 (-0800)
Subject: Merge branch 'master' into aprs
X-Git-Tag: 1.1.9.3~10^2~19
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=748e42ebf1dfb1efd5dec6ddd93f5c7aeedeb01d;hp=-c

Merge branch 'master' into aprs
---

748e42ebf1dfb1efd5dec6ddd93f5c7aeedeb01d
diff --combined src/core/ao_config.c
index df40ff90,797fe7ec..63158158
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@@ -128,7 -128,7 +128,7 @@@ _ao_config_get(void
  		if (minor < 6)
  			ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
  		if (minor < 8)
 -			ao_config.radio_enable = TRUE;
 +			ao_config.radio_enable = AO_RADIO_ENABLE_CORE;
  		if (minor < 9)
  			ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
  		if (minor < 10)
@@@ -529,15 -529,15 +529,15 @@@ __code struct ao_config_var ao_config_v
  	  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 +546,6 @@@
  	{ "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 },