X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_config.c;h=797fe7ec6aedfec9db3eae4fbda5b13b9ad2c936;hb=b26e837a6f18641aae9372aab22168849ff10812;hp=88fcc12dc00f9a1e8a053dfff25dc98c395e1601;hpb=d90587535676f9492f0fde6b974353158104ef88;p=fw%2Faltos

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 88fcc12d..797fe7ec 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -17,8 +17,11 @@
 
 #include "ao.h"
 #include "ao_log.h"
+#include <ao_storage.h>
+#if HAS_FLIGHT
 #include <ao_sample.h>
 #include <ao_data.h>
+#endif
 
 __xdata struct ao_config ao_config;
 __pdata uint8_t ao_config_loaded;
@@ -99,6 +102,7 @@ _ao_config_get(void)
 		ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
 		ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
 		       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
+		ao_config._legacy_radio_channel = 0;
 	}
 	minor = ao_config.minor;
 	if (minor != AO_CONFIG_MINOR) {
@@ -128,7 +132,7 @@ _ao_config_get(void)
 		if (minor < 9)
 			ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
 		if (minor < 10)
-			ao_config.frequency = 434550;
+			ao_config.frequency = 434550 + ao_config._legacy_radio_channel * 100;
 		if (minor < 11)
 			ao_config.apogee_lockout = 0;
 #if AO_PYRO_NUM
@@ -140,8 +144,12 @@ _ao_config_get(void)
 	}
 #if HAS_RADIO
 #if HAS_FORCE_FREQ
-	if (ao_force_freq)
+	if (ao_force_freq) {
 		ao_config.frequency = 434550;
+		ao_config.radio_cal = ao_radio_cal;
+		ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
+		       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
+	}
 #endif
 	ao_config_set_radio();
 #endif
@@ -460,6 +468,9 @@ ao_config_radio_enable_set(void) __reentrant
 #endif /* HAS_RADIO */
 	
 #if HAS_AES
+
+__xdata uint8_t	ao_config_aes_seq = 1;
+
 void
 ao_config_key_show(void) __reentrant
 {
@@ -482,6 +493,7 @@ ao_config_key_set(void) __reentrant
 			break;
 		ao_config.aes_key[i] = ao_cmd_lex_i;
 	}
+	++ao_config_aes_seq;
 	_ao_config_edit_finish();
 }
 #endif
@@ -517,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 },
@@ -534,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 },
@@ -562,12 +570,10 @@ ao_config_set(void)
 {
 	char	c;
 	uint8_t cmd;
-	void (*__xdata func)(void) __reentrant;
 
 	ao_cmd_white();
 	c = ao_cmd_lex_c;
 	ao_cmd_lex();
-	func = 0;
 	for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
 		if (ao_config_vars[cmd].str[0] == c) {
 			(*ao_config_vars[cmd].set)();