X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_config.c;h=0aac16a678ad1a6296bb1c4278bf5985bfbc0576;hp=350ebcbe66d5721a509e71ab48f6ff02ea788388;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hpb=b6c7ae2c1f8cba7351cd139c49322280d9d3af47

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 350ebcbe..0aac16a6 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -16,6 +16,12 @@
  */
 
 #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;
@@ -64,18 +70,26 @@ ao_config_put(void)
 }
 #endif
 
-static void
+#if HAS_RADIO
+void
 ao_config_set_radio(void)
 {
 	ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
 }
+#endif /* HAS_RADIO */
 
 static void
 _ao_config_get(void)
 {
+	uint8_t	minor;
+
 	if (ao_config_loaded)
 		return;
 #if HAS_EEPROM
+	/* Yes, I know ao_storage_read calls ao_storage_setup,
+	 * but ao_storage_setup *also* sets ao_storage_config, which we
+	 * need before calling ao_storage_read here
+	 */
 	ao_storage_setup();
 	ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
 #endif
@@ -85,60 +99,73 @@ _ao_config_get(void)
 
 		/* Version 0 stuff */
 		ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
-		ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
 		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_dirty = 1;
+		ao_config._legacy_radio_channel = 0;
 	}
-	if (ao_config.minor != AO_CONFIG_MINOR) {
+	minor = ao_config.minor;
+	if (minor != AO_CONFIG_MINOR) {
 		/* Fixups for minor version 1 */
-		if (ao_config.minor < 1)
+		if (minor < 1)
 			ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
 		/* Fixups for minor version 2 */
-		if (ao_config.minor < 2) {
+		if (minor < 2) {
 			ao_config.accel_plus_g = 0;
 			ao_config.accel_minus_g = 0;
 		}
 		/* Fixups for minor version 3 */
-		if (ao_config.minor < 3)
+#if HAS_RADIO
+		if (minor < 3)
 			ao_config.radio_cal = ao_radio_cal;
+#endif
 		/* Fixups for minor version 4 */
-		if (ao_config.minor < 4)
+		if (minor < 4)
 			ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
 		/* Fixupes for minor version 5 */
-		if (ao_config.minor < 5)
+		if (minor < 5)
 			ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
-		if (ao_config.minor < 6)
+		if (minor < 6)
 			ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
-		if (ao_config.minor < 8)
-			ao_config.radio_enable = TRUE;
-		if (ao_config.minor < 9)
-			memset(&ao_config.aes_key, 0, AO_AES_LEN);
-		if (ao_config.minor < 10) {
-			ao_config.frequency = 434550;
-#if HAS_RADIO_CHANNELS
-			ao_xmemset(&ao_config.radio_channels, '\0', sizeof (ao_config.radio_channels));
-			ao_xmemcpy(&ao_config.radio_channels[0].name[0],
-				   CODE_TO_XDATA("Channel 0"), sizeof("Channel 0"));
-			ao_config.radio_channels[0].kHz = 434550;
-#endif				   
-		}
+		if (minor < 8)
+			ao_config.radio_enable = AO_RADIO_ENABLE_CORE;
+		if (minor < 9)
+			ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
+		if (minor < 10)
+			ao_config.frequency = 434550 + ao_config._legacy_radio_channel * 100;
+		if (minor < 11)
+			ao_config.apogee_lockout = 0;
+#if AO_PYRO_NUM
+		if (minor < 12)
+			memset(&ao_config.pyro, '\0', sizeof (ao_config.pyro));
+#endif
+		if (minor < 13)
+			ao_config.aprs_interval = 0;
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
 	}
+#if HAS_RADIO
+#if HAS_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
 	ao_config_loaded = 1;
 }
 
-static void
+void
 _ao_config_edit_start(void)
 {
 	ao_mutex_get(&ao_config_mutex);
 	_ao_config_get();
 }
 
-static void
+void
 _ao_config_edit_finish(void)
 {
 	ao_config_dirty = 1;
@@ -182,25 +209,7 @@ ao_config_callsign_set(void) __reentrant
 	_ao_config_edit_finish();
 }
 
-void
-ao_config_radio_channel_show(void) __reentrant
-{
-	printf("Radio channel: %d\n",
-	       ao_config.radio_channel);
-}
-
-void
-ao_config_radio_channel_set(void) __reentrant
-{
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	_ao_config_edit_start();
-	ao_config.radio_channel = ao_cmd_lex_i;
-	_ao_config_edit_finish();
-	ao_radio_recv_abort();
-}
-
+#if HAS_RADIO
 void
 ao_config_frequency_show(void) __reentrant
 {
@@ -220,8 +229,9 @@ ao_config_frequency_set(void) __reentrant
 	_ao_config_edit_finish();
 	ao_radio_recv_abort();
 }
+#endif
 
-#if HAS_ADC
+#if HAS_FLIGHT
 
 void
 ao_config_main_deploy_show(void) __reentrant
@@ -257,7 +267,7 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
 {
 	uint16_t	i;
 	int32_t		accel_total;
-	uint8_t		cal_adc_ring;
+	uint8_t		cal_data_ring;
 
 	printf("Orient antenna %s and press a key...", orientation);
 	flush();
@@ -266,12 +276,12 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
 	puts("Calibrating..."); flush();
 	i = ACCEL_CALIBRATE_SAMPLES;
 	accel_total = 0;
-	cal_adc_ring = ao_sample_adc;
+	cal_data_ring = ao_sample_data;
 	while (i) {
-		ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
-		while (i && cal_adc_ring != ao_sample_adc) {
-			accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel;
-			cal_adc_ring = ao_adc_ring_next(cal_adc_ring);
+		ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+		while (i && cal_data_ring != ao_sample_data) {
+			accel_total += (int32_t) ao_data_accel(&ao_data_ring[cal_data_ring]);
+			cal_data_ring = ao_data_ring_next(cal_data_ring);
 			i--;
 		}
 	}
@@ -325,8 +335,27 @@ ao_config_apogee_delay_set(void) __reentrant
 	_ao_config_edit_finish();
 }
 
-#endif /* HAS_ADC */
+void
+ao_config_apogee_lockout_show(void) __reentrant
+{
+	printf ("Apogee lockout: %d seconds\n",
+		ao_config.apogee_lockout);
+}
+
+void
+ao_config_apogee_lockout_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.apogee_lockout = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+
+#endif /* HAS_FLIGHT */
 
+#if HAS_RADIO
 void
 ao_config_radio_cal_show(void) __reentrant
 {
@@ -344,6 +373,7 @@ ao_config_radio_cal_set(void) __reentrant
 	ao_config_set_radio();
 	_ao_config_edit_finish();
 }
+#endif
 
 #if HAS_LOG
 void
@@ -420,6 +450,7 @@ ao_config_pad_orientation_set(void) __reentrant
 }
 #endif
 
+#if HAS_RADIO
 void
 ao_config_radio_enable_show(void) __reentrant
 {
@@ -436,8 +467,12 @@ ao_config_radio_enable_set(void) __reentrant
 	ao_config.radio_enable = ao_cmd_lex_i;
 	_ao_config_edit_finish();
 }
+#endif /* HAS_RADIO */
 	
 #if HAS_AES
+
+__xdata uint8_t	ao_config_aes_seq = 1;
+
 void
 ao_config_key_show(void) __reentrant
 {
@@ -460,53 +495,31 @@ 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
 
-#if HAS_RADIO_CHANNELS
+#if HAS_APRS
+
 void
-ao_config_radio_config_show(void) __reentrant
+ao_config_aprs_show(void)
 {
-	uint8_t	i;
-	for (i = 0; i < AO_NUM_CHANNELS; i++)
-		if (ao_config.radio_channels[i].name[0]) {
-			printf("%2d %-16.16s %ld\n",
-			       i,
-			       ao_config.radio_channels[i].name,
-			       ao_config.radio_channels[i].kHz);
-		}
+	printf ("APRS interval: %d\n", ao_config.aprs_interval);
 }
 
 void
-ao_config_radio_config_set(void) __reentrant
+ao_config_aprs_set(void)
 {
-	__xdata struct ao_radio_channel * ch;
-	uint8_t i;
 	ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	if ((uint8_t) ao_cmd_lex_i >= AO_NUM_CHANNELS) {
-		ao_cmd_status = ao_cmd_syntax_error;
-		return;
-	}
-	ch = &ao_config.radio_channels[(uint8_t) ao_cmd_lex_i];
 	_ao_config_edit_start();
-	ao_cmd_white();
-	i = 0;
-	while (ao_cmd_lex_c != '/' && ao_cmd_lex_c != '\n' && i < AO_CHANNEL_NAME_LEN) {
-		ch->name[i++] = ao_cmd_lex_c;
-		ao_cmd_lex();
-	}
-	if (i < AO_CHANNEL_NAME_LEN) {
-		ch->name[i] = '\0';
-		ao_cmd_lex();
-	}
-	ao_cmd_decimal();
-	ch->kHz = ao_cmd_lex_u32;
+	ao_config.aprs_interval = ao_cmd_lex_i;
 	_ao_config_edit_finish();
 }
-#endif
+
+#endif /* HAS_APRS */
 
 struct ao_config_var {
 	__code char	*str;
@@ -524,45 +537,49 @@ static void
 ao_config_write(void) __reentrant;
 
 __code struct ao_config_var ao_config_vars[] = {
-#if HAS_ADC
-	{ "m <meters>\0Main deploy (in meters)",
+#if HAS_FLIGHT
+	{ "m <meters>\0Main deploy (m)",
 	  ao_config_main_deploy_set,	ao_config_main_deploy_show, },
-	{ "d <delay>\0Apogee delay (in seconds)",
+	{ "d <delay>\0Apogee delay (s)",
 	  ao_config_apogee_delay_set,	ao_config_apogee_delay_show },
-#endif /* HAS_ADC */
-	{ "r <channel>\0Radio channel (freq = 434.550 + chan * .1)",
-	  ao_config_radio_channel_set,	ao_config_radio_channel_show },
+	{ "L <seconds>\0Apogee detect lockout (s)",
+	  ao_config_apogee_lockout_set, ao_config_apogee_lockout_show, },
+#endif /* HAS_FLIGHT */
+#if HAS_RADIO
 	{ "F <freq>\0Frequency (kHz)",
 	  ao_config_frequency_set, ao_config_frequency_show },
 	{ "c <call>\0Callsign (8 char max)",
 	  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 */
-	{ "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
-	  ao_config_radio_cal_set,  	ao_config_radio_cal_show },
 #if HAS_LOG
-	{ "l <size>\0Flight log size in kB",
+	{ "l <size>\0Flight log size (kB)",
 	  ao_config_log_set,		ao_config_log_show },
 #endif
 #if HAS_IGNITE
 	{ "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 },
 #endif
-#if HAS_RADIO_CHANNELS
-	{ "C <n> <name>/<freq> <radio>\0Set radio chan config",
-	  ao_config_radio_config_set,ao_config_radio_config_show },
+#if AO_PYRO_NUM
+	{ "P <n,?>\0Configure pyro channels",
+	  ao_pyro_set, ao_pyro_show },
+#endif
+#if HAS_APRS
+	{ "A <secs>\0APRS packet interval (0 disable)",
+	  ao_config_aprs_set, ao_config_aprs_show },
 #endif
 	{ "s\0Show",
 	  ao_config_show,		0 },
@@ -580,12 +597,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)();
@@ -609,6 +624,7 @@ static void
 ao_config_show(void) __reentrant
 {
 	uint8_t cmd;
+	ao_config_get();
 	printf("Config version: %d.%d\n",
 	       ao_config.major, ao_config.minor);
 	for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
@@ -636,7 +652,7 @@ ao_config_write(void) __reentrant
 #endif
 
 __code struct ao_cmds ao_config_cmds[] = {
-	{ ao_config_set,	"c <var> <value>\0Set config variable (? for help, s to show)" },
+	{ ao_config_set,	"c <var> <value>\0Set config (? for help, s to show)" },
 	{ 0, NULL },
 };