diff options
| author | Keith Packard <keithp@keithp.com> | 2011-05-23 11:32:29 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-23 16:13:46 -0600 |
| commit | 252b7e63715f48e99d0eb26faf1690c909dd2bb2 (patch) | |
| tree | 78120f2d500029d98bf1a583d8ab911b3f667590 /src/ao_config.c | |
| parent | 6c87e4f77e6072ae7e8587d327b2ff80af2c3e6a (diff) | |
altos, altosui: Add igniter mode (dual, apogee, main)
This provides for redundant charges for either apogee or main.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/ao_config.c')
| -rw-r--r-- | src/ao_config.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/ao_config.c b/src/ao_config.c index 319febb9..4551574f 100644 --- a/src/ao_config.c +++ b/src/ao_config.c @@ -27,6 +27,7 @@ __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 @@ -75,6 +76,7 @@ _ao_config_get(void) 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) { @@ -92,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; } @@ -335,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; @@ -372,6 +399,10 @@ __code struct ao_config_var ao_config_vars[] = { { '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" }, #if HAS_EEPROM |