summaryrefslogtreecommitdiff
path: root/src/ao.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-10-10 17:16:21 -0700
committerKeith Packard <keithp@keithp.com>2009-10-10 17:16:21 -0700
commit69b6f6bb465163cf767bb68e0e4a716d8ad2b39c (patch)
tree139e6d36c54c42a76657347a0d8cf0b8be79a023 /src/ao.h
parentbc77da68c9cb7d4cca483eadbbb7e9ccf71c0060 (diff)
parent2b765728ce177e26899f6feef00bfdf6aeaf2678 (diff)
Merge branch 'master' into skytraq
Diffstat (limited to 'src/ao.h')
-rw-r--r--src/ao.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ao.h b/src/ao.h
index 0f3f0ea7..b6862a87 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -861,7 +861,7 @@ ao_igniter_init(void);
*/
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR 0
+#define AO_CONFIG_MINOR 1
struct ao_config {
uint8_t major;
@@ -870,6 +870,7 @@ struct ao_config {
int16_t accel_zero_g;
uint8_t radio_channel;
char callsign[AO_MAX_CALLSIGN + 1];
+ uint8_t apogee_delay;
};
extern __xdata struct ao_config ao_config;