X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_config.c;h=a3e0a64f3451e2d76bd01c1ef58767b2f2c8b29b;hb=bbddcae2a15b6d430e84956ddf26955aa9173cc0;hp=2673e472b066a23d556eb333582e88f3431e1401;hpb=e4ba9bf4291bf17c777c8c3ef7c71e4a30b9947a;p=fw%2Faltos

diff --git a/src/ao_config.c b/src/ao_config.c
index 2673e472..a3e0a64f 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -27,13 +27,16 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_CALLSIGN	"N0CALL"
 #define AO_CONFIG_DEFAULT_ACCEL_ZERO_G	16000
 #define AO_CONFIG_DEFAULT_APOGEE_DELAY	0
+#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	((uint32_t) 192 * (uint32_t) 1024)
 
 #if HAS_EEPROM
 static void
 _ao_config_put(void)
 {
 	ao_storage_setup();
+	ao_storage_erase(ao_storage_config);
 	ao_storage_write(ao_storage_config, &ao_config, sizeof (ao_config));
+	ao_log_write_erase(0);
 	ao_storage_flush();
 }
 
@@ -81,6 +84,9 @@ _ao_config_get(void)
 		/* Fixups for minor version 3 */
 		if (ao_config.minor < 3)
 			ao_config.radio_cal = ao_radio_cal;
+		/* Fixups for minor version 4 */
+		if (ao_config.minor < 4)
+			ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
 	}
@@ -289,6 +295,34 @@ ao_config_radio_cal_set(void) __reentrant
 	ao_config_radio_cal_show();
 }
 
+#if HAS_EEPROM
+void
+ao_config_log_show(void) __reentrant
+{
+	printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10));
+}
+
+void
+ao_config_log_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	if (ao_log_present())
+		printf("Storage must be empty before changing log size\n");
+	else if (ao_storage_block > 1024 && (ao_cmd_lex_u32 & ((ao_storage_block >> 10) - 1)))
+		printf("Flight log size must be multiple of %ld\n", ao_storage_block >> 10);
+	else {
+		ao_mutex_get(&ao_config_mutex);
+		_ao_config_get();
+		ao_config.flight_log_max = ao_cmd_lex_u32 << 10;
+		ao_config_dirty = 1;
+		ao_mutex_put(&ao_config_mutex);
+		ao_config_log_show();
+	}
+}
+#endif /* HAS_EEPROM */
+
 struct ao_config_var {
 	char		cmd;
 	void		(*set)(void) __reentrant;
@@ -322,6 +356,10 @@ __code struct ao_config_var ao_config_vars[] = {
 #endif /* HAS_ADC */
 	{ 'f',  ao_config_radio_cal_set,  	ao_config_radio_cal_show,
 		"f <cal>     Set radio calibration value (cal = rf/(xtal/2^16))" },
+#if HAS_EEPROM
+	{ 'l',  ao_config_log_set,		ao_config_log_show,
+		"l <size>    Set flight log size in kB" },
+#endif
 	{ 's',	ao_config_show,			ao_config_show,
 		"s           Show current config values" },
 #if HAS_EEPROM