altos, altosui: Add igniter mode (dual, apogee, main)

[fw/altos] / src / ao_config.c

diff --git a/src/ao_config.c b/src/ao_config.c
index bbee3b443e6a0a7e17bfb9805af311dfba6e3982..4551574f01d01705832aa0d70b32d9285c20e94d 100644 (file)
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -27,7 +27,12 @@ __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_IGNITE_MODE  AO_IGNITE_MODE_DUAL
+#if USE_INTERNAL_EEPROM
+#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
 
 #if HAS_EEPROM
 static void
@@ -70,6 +75,8 @@ _ao_config_get(void)
                       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
                ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
                ao_config.radio_cal = ao_radio_cal;
+               ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
+               ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
                ao_config_dirty = 1;
        }
        if (ao_config.minor < AO_CONFIG_MINOR) {
@@ -87,6 +94,9 @@ _ao_config_get(void)
                /* Fixups for minor version 4 */
                if (ao_config.minor < 4)
                        ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
+               /* Fixupes for minor version 5 */
+               if (ao_config.minor < 5)
+                       ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
                ao_config.minor = AO_CONFIG_MINOR;
                ao_config_dirty = 1;
        }
@@ -185,6 +195,7 @@ ao_config_main_deploy_set(void) __reentrant
        ao_config_main_deploy_show();
 }
 
+#if HAS_ACCEL
 void
 ao_config_accel_calibrate_show(void) __reentrant
 {
@@ -209,10 +220,10 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant
        puts("Calibrating..."); flush();
        i = ACCEL_CALIBRATE_SAMPLES;
        accel_total = 0;
-       cal_adc_ring = ao_flight_adc;
+       cal_adc_ring = ao_sample_adc;
        while (i) {
-               ao_sleep(DATA_TO_XDATA(&ao_flight_adc));
-               while (i && cal_adc_ring != ao_flight_adc) {
+               ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
+               while (i && cal_adc_ring != ao_sample_adc) {
                        accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel;
                        cal_adc_ring = ao_adc_ring_next(cal_adc_ring);
                        i--;
@@ -251,6 +262,7 @@ ao_config_accel_calibrate_set(void) __reentrant
        ao_mutex_put(&ao_config_mutex);
        ao_config_accel_calibrate_show();
 }
+#endif /* HAS_ACCEL */
 
 void
 ao_config_apogee_delay_show(void) __reentrant
@@ -328,6 +340,28 @@ ao_config_log_set(void) __reentrant
 }
 #endif /* HAS_EEPROM */
 
+#if HAS_ADC
+void
+ao_config_ignite_mode_show(void) __reentrant
+{
+       printf("Ignite mode: %d\n", ao_config.ignite_mode);
+}
+
+void
+ao_config_ignite_mode_set(void) __reentrant
+{
+       ao_cmd_decimal();
+       if (ao_cmd_status != ao_cmd_success)
+               return;
+       ao_mutex_get(&ao_config_mutex);
+       _ao_config_get();
+       ao_config.ignite_mode = ao_cmd_lex_i;
+       ao_config_dirty = 1;
+       ao_mutex_put(&ao_config_mutex);
+       ao_config_log_show();
+}
+#endif
+
 struct ao_config_var {
        char            cmd;
        void            (*set)(void) __reentrant;
@@ -355,15 +389,19 @@ __code struct ao_config_var ao_config_vars[] = {
                "r <channel> Set radio channel (freq = 434.550 + channel * .1)" },
        { 'c',  ao_config_callsign_set,         ao_config_callsign_show,
                "c <call>    Set callsign broadcast in each packet (8 char max)" },
-#if HAS_ADC
+#if HAS_ACCEL
        { 'a',  ao_config_accel_calibrate_set,  ao_config_accel_calibrate_show,
                "a <+g> <-g> Set accelerometer calibration (0 for auto)" },
-#endif /* HAS_ADC */
+#endif /* HAS_ACCEL */
        { '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
+#if HAS_ADC
+       { 'i',  ao_config_ignite_mode_set,      ao_config_ignite_mode_show,
+         "i <0 dual, 1 apogee, 2 main> Set igniter mode" },
 #endif
        { 's',  ao_config_show,                 ao_config_show,
                "s           Show current config values" },
@@ -438,8 +476,8 @@ ao_config_write(void) __reentrant
 #endif
 
 __code struct ao_cmds ao_config_cmds[] = {
-       { 'c',  ao_config_set,  "c <var> <value>                    Set config variable (? for help, s to show)" },
-       { '\0', ao_config_set, NULL },
+       { ao_config_set,        "c <var> <value>\0Set config variable (? for help, s to show)" },
+       { 0, NULL },
 };
 
 void