altos: Start adding apogee lockout support

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

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 921a248065a25d130e27c10799e2dc3dc9c3c41e..55fb8590eb74669eb2bf9fee6b2f62f7351cc91b 100644 (file)
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -64,6 +64,12 @@ ao_config_put(void)
 }
 #endif
 
+void
+ao_config_set_radio(void)
+{
+       ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
+}
+
 static void
 _ao_config_get(void)
 {
@@ -79,13 +85,12 @@ _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;
        }
-       if (ao_config.minor < AO_CONFIG_MINOR) {
+       if (ao_config.minor != AO_CONFIG_MINOR) {
                /* Fixups for minor version 1 */
                if (ao_config.minor < 1)
                        ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
@@ -105,15 +110,18 @@ _ao_config_get(void)
                        ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
                if (ao_config.minor < 6)
                        ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
-               if (ao_config.minor < 7)
-                       ao_config.radio_setting = ao_config.radio_cal;
                if (ao_config.minor < 8)
                        ao_config.radio_enable = TRUE;
                if (ao_config.minor < 9)
-                       memset(&ao_config.aes_key, 0, AO_AES_LEN);
+                       ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
+               if (ao_config.minor < 10)
+                       ao_config.frequency = 434550;
+               if (ao_config.minor < 11)
+                       ao_config.apogee_lockout = 0;
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
        }
+       ao_config_set_radio();
        ao_config_loaded = 1;
 }
 
@@ -169,25 +177,26 @@ ao_config_callsign_set(void) __reentrant
 }
 
 void
-ao_config_radio_channel_show(void) __reentrant
+ao_config_frequency_show(void) __reentrant
 {
-       printf("Radio channel: %d\n",
-              ao_config.radio_channel);
+       printf("Frequency: %ld\n",
+              ao_config.frequency);
 }
 
 void
-ao_config_radio_channel_set(void) __reentrant
+ao_config_frequency_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.frequency = ao_cmd_lex_u32;
+       ao_config_set_radio();
        _ao_config_edit_finish();
        ao_radio_recv_abort();
 }
 
-#if HAS_ADC
+#if HAS_FLIGHT
 
 void
 ao_config_main_deploy_show(void) __reentrant
@@ -291,7 +300,25 @@ 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 */
 
 void
 ao_config_radio_cal_show(void) __reentrant
@@ -306,7 +333,8 @@ ao_config_radio_cal_set(void) __reentrant
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.radio_setting = ao_config.radio_cal = ao_cmd_lex_u32;
+       ao_config.radio_cal = ao_cmd_lex_u32;
+       ao_config_set_radio();
        _ao_config_edit_finish();
 }
 
@@ -385,25 +413,6 @@ ao_config_pad_orientation_set(void) __reentrant
 }
 #endif
 
-void
-ao_config_radio_setting_show(void) __reentrant
-{
-       printf("Radio setting: %ld\n", ao_config.radio_setting);
-}
-
-void
-ao_config_radio_setting_set(void) __reentrant
-{
-       ao_cmd_decimal();
-       if (ao_cmd_status != ao_cmd_success)
-               return;
-       _ao_config_edit_start();
-       ao_config.radio_setting = ao_cmd_lex_u32;
-       ao_config.radio_channel = 0;
-       _ao_config_edit_finish();
-       ao_radio_recv_abort();
-}
-
 void
 ao_config_radio_enable_show(void) __reentrant
 {
@@ -464,18 +473,18 @@ 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 */
+       { "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 },
-       { "R <setting>\0Radio freq control (freq = 434.550 * setting/cal)",
-         ao_config_radio_setting_set,  ao_config_radio_setting_show },
        { "e <0 disable, 1 enable>\0Enable telemetry and RDF",
          ao_config_radio_enable_set, ao_config_radio_enable_show },
 #if HAS_ACCEL
@@ -485,7 +494,7 @@ __code struct ao_config_var ao_config_vars[] = {
        { "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
@@ -545,6 +554,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++)
@@ -572,7 +582,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 },
 };