X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_config.c;h=38b72798bab00b346b82f498adaa660f9a9ee762;hb=408a3e04362d626778640dd0ce7d356d3863de53;hp=cbd639a5d026461571b9b979ceb79017327fd00a;hpb=52834517c0706b1f16fb81643a42dc1c1997e00a;p=fw%2Faltos

diff --git a/src/ao_config.c b/src/ao_config.c
index cbd639a5..38b72798 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -27,22 +27,24 @@ __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
-/*
- * For 434.550MHz, the frequency value is:
- *
- * 434.550e6 / (24e6 / 2**16) = 1186611.2
- *
- * This value is stored in a const variable so that
- * ao-load can change it during programming for
- * devices that have no eeprom for config data.
- */
-const uint32_t ao_radio_cal = 1186611;
 
 #if HAS_EEPROM
 static void
 _ao_config_put(void)
 {
-	ao_ee_write_config((uint8_t *) &ao_config, sizeof (ao_config));
+	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();
+}
+
+void
+ao_config_put(void)
+{
+	ao_mutex_get(&ao_config_mutex);
+	_ao_config_put();
+	ao_mutex_put(&ao_config_mutex);
 }
 #endif
 
@@ -52,7 +54,8 @@ _ao_config_get(void)
 	if (ao_config_loaded)
 		return;
 #if HAS_EEPROM
-	ao_ee_read_config((uint8_t *) &ao_config, sizeof (ao_config));
+	ao_storage_setup();
+	ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
 #endif
 	if (ao_config.major != AO_CONFIG_MAJOR) {
 		ao_config.major = AO_CONFIG_MAJOR;
@@ -151,7 +154,7 @@ ao_config_radio_channel_set(void) __reentrant
 	ao_config_dirty = 1;
 	ao_mutex_put(&ao_config_mutex);
 	ao_config_radio_channel_show();
-	ao_radio_abort();
+	ao_radio_recv_abort();
 }
 
 #if HAS_ADC
@@ -295,13 +298,13 @@ struct ao_config_var {
 	const char	*help;
 };
 
-void
+static void
 ao_config_help(void) __reentrant;
 
-void
+static void
 ao_config_show(void) __reentrant;
 
-void
+static void
 ao_config_write(void) __reentrant;
 
 __code struct ao_config_var ao_config_vars[] = {
@@ -355,7 +358,7 @@ ao_config_set(void)
 		ao_cmd_status = ao_cmd_syntax_error;
 }
 
-void
+static void
 ao_config_help(void) __reentrant
 {
 	uint8_t cmd;
@@ -363,7 +366,7 @@ ao_config_help(void) __reentrant
 		puts (ao_config_vars[cmd].help);
 }
 
-void
+static void
 ao_config_show(void) __reentrant
 {
 	uint8_t cmd;
@@ -375,7 +378,7 @@ ao_config_show(void) __reentrant
 }
 
 #if HAS_EEPROM
-void
+static void
 ao_config_write(void) __reentrant
 {
 	uint8_t saved = 0;