X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ChangeLog;h=bd7e99fb407931aa16b3ded4653b7910720cbdd3;hp=cd539832cbcdbcabb976ff2d7782bb1e3d05364c;hb=d256f8204e9fce53ae4309562bb4c0cde1fae43e;hpb=384dbe9fc7fa8e4e5dceec5e150f0f1d3383bbdc

diff --git a/ChangeLog b/ChangeLog
index cd539832..bd7e99fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,84 @@
+commit 4b0de757874c0ecaf38e3dfd3beefc398150e3d5
+Merge: 773c4ff d0eac98
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:15:53 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit d0eac989b1ffc8ae30ba12da403eb4bf1ad42d6b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 6 13:15:10 2009 -0700
+
+    Don't look at NULL strings (summary_name)
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 73f4a57239f770aff603b961169c0e2cfe2c276b
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 6 13:08:54 2009 -0700
+
+    Use pressure speed for drogue and beyond states. Fix differentiation time.
+    
+    Drogue state should always use pressure speeds.
+    
+    Differentiation code was using centi-seconds instead of seconds.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 773c4ffbc1d2e02eb02cfa543a077a408986da30
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:05:55 2009 -0600
+
+    update changelogs for Debian build
+
+commit 45ede4a4b203ef9da5bf05c49cb9c5a2e6382ec5
+Merge: 45e2938 e35e485
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:05:51 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit e35e485ffe6b26034788ab295121bc2693b7eec1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 6 13:04:31 2009 -0700
+
+    Initialize summary_name and detail_name so stuff appears on stdout.
+    
+    Uninitialized variables lead to mysterious results.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 45e2938121411d1fc9b3aec3fdeaaeb3c90db5ed
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:02:14 2009 -0600
+
+    update changelogs for Debian build
+
+commit d42ebf0661ecf15455e5051de1e16ae66f8dd857
+Merge: 384dbe9 7a19aac
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 14:02:09 2009 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 7a19aac5e881e635962a64fff73027ca2143b96f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Sep 6 12:51:48 2009 -0700
+
+    Add DSP code to filter data, allowing for integration/differentiation
+    
+    This adds the computation of speed from both accelerometer and
+    barometer measurements and then presents a periodic flight profile
+    using filtered data as a detailed flight record.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 384dbe9fc7fa8e4e5dceec5e150f0f1d3383bbdc
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sun Sep 6 10:40:06 2009 -0600
+
+    update changelogs for Debian build
+
 commit 35c54b3a278fa9bc2bc7f4b5ee04866697c93ba0
 Merge: 4f8eff7 6d018ab
 Author: Bdale Garbee <bdale@gag.com>