Merge branch 'master' into skytraq

diff --combined src/ao.h
index 0f3f0ea7394e57a66061cac9adade96a55deb0d0,f89568f2b4ff9a1ad2503368df02d1d9a4fb14a8..b6862a87597fae90c4c03655b9540f63bb8a413a
--- 1/src/ao.h
--- 2/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;