X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=9a3b5829e87745449ae465ac03f9e1692865b2a0;hb=f952f9c285e2718a433c8c720c9b5d9c369e7036;hp=67efa437f843fbe91143041ae7623c8bc8b49da8;hpb=9b12bc445fe482306e4587ad60c6d2daf65a60f3;p=fw%2Faltos

diff --git a/src/core/ao.h b/src/core/ao.h
index 67efa437..9a3b5829 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -1457,26 +1457,16 @@ ao_igniter_init(void);
  */
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	10
-#define AO_AES_LEN 16
-
-#if HAS_RADIO_CHANNELS
-#define AO_CHANNEL_NAME_LEN	10
-
-#define AO_NUM_CHANNELS		10
+#define AO_CONFIG_MINOR	11
 
-struct ao_radio_channel {
-	char		name[AO_CHANNEL_NAME_LEN];
-	uint32_t	kHz;
-};
-#endif
+#define AO_AES_LEN 16
 
 struct ao_config {
 	uint8_t		major;
 	uint8_t		minor;
 	uint16_t	main_deploy;
 	int16_t		accel_plus_g;		/* changed for minor version 2 */
-	uint8_t		radio_channel;
+	uint8_t		_legacy_radio_channel;
 	char		callsign[AO_MAX_CALLSIGN + 1];
 	uint8_t		apogee_delay;		/* minor version 1 */
 	int16_t		accel_minus_g;		/* minor version 2 */
@@ -1488,9 +1478,7 @@ struct ao_config {
 	uint8_t		radio_enable;		/* minor version 8 */
 	uint8_t		aes_key[AO_AES_LEN];	/* minor version 9 */
 	uint32_t	frequency;		/* minor version 10 */
-#if HAS_RADIO_CHANNELS
-	struct ao_radio_channel	radio_channels[AO_NUM_CHANNELS];	/* minor version 10 */
-#endif
+	uint16_t	apogee_lockout;		/* minor version 11 */
 };
 
 #define AO_IGNITE_MODE_DUAL		0
@@ -1510,6 +1498,9 @@ ao_config_get(void);
 void
 ao_config_put(void);
 
+void
+ao_config_set_radio(void);
+
 void
 ao_config_init(void);
 
@@ -1892,7 +1883,7 @@ ao_sqrt(uint32_t op);
  * ao_freq.c
  */
 
-int32_t ao_freq_to_set(int32_t freq, int32_t cal);
+int32_t ao_freq_to_set(int32_t freq, int32_t cal) __reentrant;
 
 #include <ao_arch_funcs.h>