X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ChangeLog;h=83023fd333380ae59e564b744542b9861bc6b33b;hp=ec555bf8ce7c55423ca232cd0c6ec75b35cc2c93;hb=6c4cdc927b43736b39be29d23ac3dc723f69e4d6;hpb=327c64305a59f48ababf19875874a550af6b9cef

diff --git a/ChangeLog b/ChangeLog
index ec555bf8..83023fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,149 @@
+commit c57bd7fd2f80e50b0b4c87fccb024ab07c93773d
+Merge: adf8764 2b76572
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Oct 12 15:57:08 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 2b765728ce177e26899f6feef00bfdf6aeaf2678
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Oct 10 17:15:38 2009 -0700
+
+    Add apogee igniter delay.
+    
+    Provide for a delay after apogee before the drogue charge is
+    fired. This allows TM to be used as a back-up altimeter.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8f7ea3de7037f40b0ff462b60d503c19431ae62b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Oct 10 15:08:14 2009 -0700
+
+    Report igniter continuity in pad/idle mode via beeper
+    
+    one short beep = drogue
+    two short beeps = main
+    three short beeps = both
+    one long warble = neither
+    
+    In idle mode, it does this just once. In pad mode, it keeps testing
+    and reporting.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit adf8764bc4591795ba4e618ccbd6393fc6ce6450
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sat Oct 10 15:11:23 2009 -0600
+
+    update changelogs for Debian build
+
+commit 541da6f3bbf81be93dfe3c01f7c8cfd757b28a2b
+Merge: dfc73cb 5f26ad6
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sat Oct 10 15:05:50 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 5f26ad663b3f60dddc9d967206e365f45dc4acd1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Oct 10 13:58:16 2009 -0700
+
+    ao-dumplog: switch to 'e' command, display progress
+    
+    Using the 'e' command allows additional checking of the data,
+    including end-to-end checksums and detection of missing data.
+    
+    Progress is displayed by showing the recorded flight state along with
+    a '.' for each eeprom block read.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b8fc3975bd92037a0cf53b0ff2b0e05ce0ba668f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Oct 10 13:39:01 2009 -0700
+
+    Send 0-length IN packet to flush USB after full packet
+    
+    USB bulk transfers are a sequence of maximum-sized packets followed by
+    a short packet, which signals the end of the transfer. When the last
+    packet of the transfer would be a full-sized packet, an additional
+    packet of zero length is sent to signal the transfer end.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e29961fdb2a48874c895829880eadbf13e094c0c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sat Oct 10 11:43:31 2009 -0700
+
+    Add channel menu to ao-view.
+    
+    Sets radio channel when TD is connected, saves selected channel in
+    gconf database.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a3771bfc5ce740f9d89193e9f8b1d7987aa57264
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Oct 6 20:06:00 2009 -0700
+
+    ao-view: fix snd_pcm_open return checking
+    
+    I don't know how this code was supposed to work before...
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ac4b8a73848f434999a532eab4665253c267c597
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Oct 6 20:05:36 2009 -0700
+
+    ao-postflight: dump out GPS signal data
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit dfc73cba1bee8b121e00e8cba45e7dfaaf79e9d8
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Sep 21 22:46:59 2009 -0700
+
+    update changelogs for Debian build
+
+commit 459ff3d377297f80ee2fba0df0a29ff6603467a1
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Sep 21 11:00:32 2009 -0700
+
+    update changelogs for Debian build
+
+commit 327c64305a59f48ababf19875874a550af6b9cef
+Merge: c8a81a4 74f0fb4
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Mon Sep 21 11:00:22 2009 -0700
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 74f0fb4dd189abc1d5027c64fa5a648a6003285a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 20 13:33:59 2009 -0700
+
+    make bit-banging reset script actually reset
+
+commit 7ea371a09385e2a93199f78685e8cb86793ed104
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 20 13:33:26 2009 -0700
+
+    Add --gps option to ao-postflight
+
+commit bc7ccb339e538a0e6120db0e5c0d9130c565e0dd
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 20 13:32:59 2009 -0700
+
+    ao_rawload: Don't reset after we finish loading
+
+commit c8a81a419f7f2331624f90bd6c107a86f6b04451
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 20 09:21:00 2009 -0600
+
+    update changelogs for Debian build
+
 commit df42ccaaf468cdc5d93cbd1c001f58df58419722
 Merge: 0b24e40 078e9cd
 Author: Bdale Garbee <bdale@gag.com>