altos: Add configurable set of channels for TT

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

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 7f999feb10ea2612f1fcfd87953c3654481f22bd..86bbc473fd44f9bbfc8e08fa23aed61fb37c41ce 100644 (file)
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -34,11 +34,13 @@ __xdata uint8_t ao_config_mutex;
 #error Please define USE_INTERNAL_FLASH
 #endif
 #endif
+#ifndef AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX
 #if USE_INTERNAL_FLASH
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX       ao_storage_config
 #else
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX       ((uint32_t) 192 * (uint32_t) 1024)
 #endif
+#endif
 
 #if HAS_EEPROM
 static void
@@ -78,8 +80,8 @@ _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;
-               memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
-               memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
+               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;
        }
@@ -108,7 +110,16 @@ _ao_config_get(void)
                if (ao_config.minor < 8)
                        ao_config.radio_enable = TRUE;
                if (ao_config.minor < 9)
-                       memset(&ao_config.aes_key, '\0', AO_AES_LEN);
+                       memset(&ao_config.aes_key, 0, AO_AES_LEN);
+#if HAS_RADIO_CHANNELS
+               if (ao_config.minor < 10) {
+                       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;
+                       ao_config.radio_channels[0].radio_setting = ao_config.radio_cal;
+               }
+#endif                            
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
        }
@@ -148,7 +159,7 @@ ao_config_callsign_set(void) __reentrant
        uint8_t c;
        static __xdata char callsign[AO_MAX_CALLSIGN + 1];
 
-       memset(callsign, '\0', sizeof callsign);
+       ao_xmemset(callsign, '\0', sizeof callsign);
        ao_cmd_white();
        c = 0;
        while (ao_cmd_lex_c != '\n') {
@@ -161,7 +172,7 @@ ao_config_callsign_set(void) __reentrant
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       memcpy(&ao_config.callsign, &callsign,
+       ao_xmemcpy(&ao_config.callsign, &callsign,
               AO_MAX_CALLSIGN + 1);
        _ao_config_edit_finish();
 }
@@ -308,7 +319,7 @@ ao_config_radio_cal_set(void) __reentrant
        _ao_config_edit_finish();
 }
 
-#if HAS_EEPROM && HAS_FLIGHT
+#if HAS_LOG
 void
 ao_config_log_show(void) __reentrant
 {
@@ -336,7 +347,7 @@ ao_config_log_set(void) __reentrant
                _ao_config_edit_finish();
        }
 }
-#endif /* HAS_EEPROM && HAS_FLIGHT */
+#endif /* HAS_LOG */
 
 #if HAS_IGNITE
 void
@@ -446,6 +457,53 @@ ao_config_key_set(void) __reentrant
 }
 #endif
 
+#if HAS_RADIO_CHANNELS
+void
+ao_config_radio_config_show(void) __reentrant
+{
+       uint8_t i;
+       for (i = 0; i < AO_NUM_CHANNELS; i++)
+               if (ao_config.radio_channels[i].name[0]) {
+                       printf("%2d %-16.16s %ld %ld\n",
+                              i,
+                              ao_config.radio_channels[i].name,
+                              ao_config.radio_channels[i].kHz,
+                              ao_config.radio_channels[i].radio_setting);
+               }
+}
+
+void
+ao_config_radio_config_set(void) __reentrant
+{
+       __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_cmd_decimal();
+       ch->radio_setting = ao_cmd_lex_u32;
+       _ao_config_edit_finish();
+}
+#endif
+
 struct ao_config_var {
        __code char     *str;
        void            (*set)(void) __reentrant;
@@ -482,7 +540,7 @@ __code struct ao_config_var ao_config_vars[] = {
 #endif /* HAS_ACCEL */
        { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
          ao_config_radio_cal_set,      ao_config_radio_cal_show },
-#if HAS_EEPROM && HAS_FLIGHT
+#if HAS_LOG
        { "l <size>\0Flight log size in kB",
          ao_config_log_set,            ao_config_log_show },
 #endif
@@ -497,6 +555,10 @@ __code struct ao_config_var ao_config_vars[] = {
 #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 },
 #endif
        { "s\0Show",
          ao_config_show,               0 },
@@ -535,7 +597,8 @@ ao_config_help(void) __reentrant
        for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
                printf("%-20s %s\n",
                       ao_config_vars[cmd].str,
-                      ao_config_vars[cmd].str+1+strlen(ao_config_vars[cmd].str));
+                      ao_config_vars[cmd].str+1+
+                      strlen(ao_config_vars[cmd].str));
 }
 
 static void