From: Keith Packard <keithp@keithp.com>
Date: Sun, 11 Oct 2009 00:16:21 +0000 (-0700)
Subject: Merge branch 'master' into skytraq
X-Git-Tag: 0.6~22
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=69b6f6bb465163cf767bb68e0e4a716d8ad2b39c;hp=-c

Merge branch 'master' into skytraq
---

69b6f6bb465163cf767bb68e0e4a716d8ad2b39c
diff --combined src/ao.h
index 0f3f0ea7,f89568f2..b6862a87
--- a/src/ao.h
+++ b/src/ao.h
@@@ -668,8 -668,7 +668,8 @@@ voi
  ao_serial_putchar(char c) __critical;
  
  #define AO_SERIAL_SPEED_4800	0
 -#define AO_SERIAL_SPEED_57600	1
 +#define AO_SERIAL_SPEED_9600	1
 +#define AO_SERIAL_SPEED_57600	2
  
  void
  ao_serial_set_speed(uint8_t speed);
@@@ -861,7 -860,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 -869,7 +870,7 @@@
  	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;