Merge remote-tracking branch 'mjb/master'

[fw/altos] / src / core / ao_config.c

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 88fcc12dc00f9a1e8a053dfff25dc98c395e1601..ce855ad1b51e1dcfdd6afb8d2d455fe45528e2d9 100644 (file)
--- 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;
@@ -460,6 +463,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 +488,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
@@ -562,12 +569,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)();