+<<<<<<< HEAD
+commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
+Author: Bdale Garbee <bdale@gag.com>
+Date: Tue Mar 30 23:11:40 2010 -0600
+
+ initial harness for documentation
+
+commit 9801ff7de21027935f52ccabaa3ff157e22d21ce
+Author: Bdale Garbee <bdale@gag.com>
+Date: Mon Mar 15 12:04:18 2010 -0600
+
+ move gbp.conf into debian/
+
+=======
+>>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3
+commit eda5e1166a97766aa22561beaa1086ba4e19ee16
+Author: Bdale Garbee <bdale@gag.com>
+Date: Thu Mar 4 17:33:39 2010 -0700
+
+ update changelogs for Debian build
+
+commit 6e61170d42936c18cd6efba6f4c14af616a30745
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Feb 28 18:24:46 2010 -0800
+
+ Need to duplicate new altitude conversion code in aoview.
+
+ Altitude conversion is now done with a smaller table and interpolation
+ instead of a giant table.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e4e17e6d3844ae682a0e7a9469a522359bac77b6
+Author: Bdale Garbee <bdale@gag.com>
+Date: Sat Feb 27 17:36:13 2010 -0700
+
+ update changelogs for Debian build
+
+commit a1478f65538fdaac7b58ffbd958a035b74956099
+Merge: 901fce5 bbf8c9f
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 27 15:19:33 2010 -0800
+
+ Merge remote branch 'origin/master'
+
+commit 901fce5fe3e2762406079ecaa787612b5ed4b34a
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 27 15:18:47 2010 -0800
+
+ Add .gitignore for ao-bringup
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7aab73a265841aac817ea34235dd1eb819debf76
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 27 15:14:04 2010 -0800
+
+ Fix up LED colors for each product.
+
+ Different products assign different color LEDs to the two available
+ LED drivers (P1_0, P1_1). Make the LED color pin assignments
+ per-product (in ao_pins.h), then deal with not always having a green LED.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1d6d8d76ec65373ffee70add75d183f5c4168f61
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 27 15:11:44 2010 -0800
+
+ Eliminate deadlock when writing config from radio link
+
+ Writing the 'Saved\r\n' string would fill the packet buffer and cause
+ a flush to occur, which would need to wait for the radio link to
+ receive and transmit a packet. The radio link always re-fetches the
+ radio channel number when lighting up the radio, so it need to look in
+ the config space. If the config mutex was held by the config writing
+ process while the radio was trying to get the channel number, then
+ we'd get a deadlock.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f1956ebadd7bf46b84a05a0c383b6404ca26b344
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 27 15:10:16 2010 -0800
+
+ Leave .ihx files in the build directory too - easier to debug that way
+
+ sdcdb wants the .ihx and .cdb files in the same directory, so humor it
+ by copying the .ihx files to the src directory instead of moving them.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bbf8c9f1748af3f1fac08ddf80ae98da2e9b5727
+Author: Bdale Garbee <bdale@gag.com>
+Date: Fri Feb 26 15:21:12 2010 -0700
+
+ create a turn on script for lighting up TeleDongle v0.2 boards
+
+commit 461d4a1948e112ec7353caf88967391d876469dd
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Feb 26 10:33:13 2010 -0800
+
+ Add LED test
+
+commit 5d7a3a5fbc0af4621c67a6fd51a9c9d5ae688fa5
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Feb 25 16:40:13 2010 -0800
+
+ Fix and document the ao-rawload --run flag
+
+ This allows ram-based programs to be loaded and executed easily.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1e60deca147c85a064719dfad14ccabd1049bbbd
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Feb 25 16:33:34 2010 -0800
+
+ Allow product names to have suffixes (like board revisions)
+
+ When looking for a board by product name, just look at the prefix of
+ the name instead of requiring an exact match. This will allow products
+ to have board version suffixes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f4d5790a284e2d02dd7568fbca90402fa5ed1aea
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Feb 25 16:32:57 2010 -0800
+
+ Add ao_radio_xmit to help test boards without flashing them.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d7d551b0078acb1596a9b9023c3df6dbfa46213c
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:30:23 2010 -0700
+
+ update changelogs for Debian build
+
+commit 2f45953ee54034209a23c254e65da36e44cf075f
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:29:47 2010 -0700
+
+ un-muck changelog
+
+commit 540f86678853e7ea80ae91f3f2ec0ec88c5b1ca7
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:27:51 2010 -0700
+
+ debugging
+
+commit cdccd92f6ed97be7385e84de5694064cb8f43946
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:25:28 2010 -0700
+
+ conditionalize use of git on executability of /usr/bin/git binary
+
+commit 54dd7a200e6956aace5a580d4c4d6a10a13c654b
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:22:45 2010 -0700
+
+ update changelogs for Debian build
+
+commit 4b6b28530206c6fdbe46699b81746fbbcab5b148
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:22:20 2010 -0700
+
+ see if this works
+
+commit c74958d3e8c5ce8006a9f9f6853238fce0c77432
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 17:13:29 2010 -0700
+
+ move git-using variable declaration into the prebuild target
+
+commit cf091a7252eba09902a42a3cfe7b4d6a343907ce
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 16:44:44 2010 -0700
+
+ update changelogs for Debian build
+
+commit deccc10f0305c0cd02bf6317d6dc9d2ae38c3dac
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 16:43:32 2010 -0700
+
+ add gawk as a build dependency since strtonum is a gawk extension
+
+commit ac45da6e61597dcdb119b976f7301b2cc7fdced4
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 14:57:26 2010 -0700
+
+ update changelogs for Debian build
+
+commit 24912821b3230b8357b9e0094cd69fa0bccc5513
+Author: Bdale Garbee <bdale@gag.com>
+Date: Wed Feb 24 14:53:27 2010 -0700
+
+ update changelogs for Debian build
+
+commit 82fdbfe1229d1ea5e6906ea240d54b3da73d9a69
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 21:35:43 2010 -0800
+
+ Must install .map files for ao-load to work
+
+ ao-load uses the .map files to rewrite the serial number and other
+ config parameters into the program flash.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a5215c2bd9249a285fc834db0c453fb3e7daed87
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 21:20:05 2010 -0800
+
+ Add back stack size checking to altos linking phase
+
+ This verifies that the stack start specified during the compile
+ will work with the resulting program
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 18eeb79026f7e5c54bf99435537c024427011a36
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 21:05:45 2010 -0800
+
+ Quiet make output.
+
+ This borrows ideas from the notmuch project to reduce the command line
+ clutter seen when compiling or linking stuff.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 004c2a9b7a4b44ef71ca60482573e8e9d8c6ce93
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 20:36:08 2010 -0800
+
+ Update .gitignore files
+
+commit 84c93bb2fc4558a5e4654794ba90e730a84eaf67
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 20:22:16 2010 -0800
+
+ Change altos build process to support per-product compile-time changes
+
+ This creates per-product subdirectories and recompiles everything for
+ each product, allowing per-product compile-time changes for things
+ like peripheral pin assignments and attached serial devices.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit fd0a42e0e96dcb8ecc9e999f70bcf70692692af9
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 20 20:21:07 2010 -0800
+
+ Change barometer conversion code to shrink conversion table
+
+commit 876e9a10b9096ead85fbe08ec9a6a0329cf7cbd4
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Feb 13 16:42:27 2010 -0800
+
+ Log GPS data on pad after boost detect.
+
+ This wakes up the two GPS reporting tasks and gets them to report out
+ any existing GPS data to the log file. To make sure the timestamps in
+ that GPS data are accurate, this also records GPS time on receipt of
+ the GPS data instead of when that is logged.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c83615567b4567f3dc45a7f7b894943b45fbb65c
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Feb 7 00:25:22 2010 -0800
+
+ Pull in a bit more data for filtering the start of the boost
+
+commit f8967607b3dda0c0ce7afe8bb077da2da5ed3dcd
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Feb 7 00:24:56 2010 -0800
+
+ Compute daytime using GPS as time base
+
+commit 2a6350149407c7d2e7d143906c40c5e331248aeb
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Feb 11 18:48:56 2010 -0800
+
+ Missing ao_mutex_put in gps_dump
+
+commit 9856b7c4397afcecc8f541af9a83824e817b3612
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jan 10 16:31:50 2010 -0800
+
+ Switch to using internal cc1111 temperature sensor
+
+ v0.2 has no temperature sensor, and several of the v0.1 boards didn't
+ get a temperature sensor loaded. Use the internal temperature sensor
+ on the cc1111 in all cases instead.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0c2533be15858774ef9381aa8c8344356fd5b971
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 22:06:19 2010 -0800
+
+ Force idle mode by shorting the SPI clock to ground at boot time.
+
+ This allows you to override the flight mode detection code in case the
+ accelerometer calibration is broken somehow. Hold the SPI clock shoted
+ to ground until the LED comes on, then remove it.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 28346736a7799c0767e54511d9949cd61d35e471
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 20:57:48 2010 -0800
+
+ Add simple gps dump command 'g'
+
+ This just dumps out the data in a very simple format to verify the GPS
+ receiver.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a6082a8b4501ac4cb18584ace1f0c40e088e5484
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 20:57:29 2010 -0800
+
+ Remove flash debugging printfs
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 05bb953830604721c9a49dd56256b86f3666b5ff
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 20:42:57 2010 -0800
+
+ Don't set ao_flash_setup_done until we're actually done.
+
+ Because we're accessing this variable outside of the mutex, we need to
+ make sure it isn't set until the data it covers has been initialized.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 327e5e782958e516a7b7a786ab6c176b0decb8b8
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 20:04:42 2010 -0800
+
+ Dump config block from read/write config and flash_status commands
+
+commit 05e5bb2d330b755967d06fb859585c81f5f5fbb5
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 19:46:46 2010 -0800
+
+ Dump more flash parameters for the flash_status command
+
+commit d4c8895b349998e02e03ed83466a0ca7afb3d99b
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 17:57:52 2010 -0800
+
+ Add 'f' command to display flash status register contents
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c1334f712f01543adb10809bc1a3ca120e27290b
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 09:55:04 2010 -0800
+
+ Add at45db161d.h header file for new flash part.
+
+ Forgot to add this when I added the driver.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a0d4c1b06d27e850d233f8ddf8fe32912bf0ec8f
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 01:29:41 2010 -0800
+
+ Remove green LED and temp sensor from v0.2 code
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit dc8d18736239b14c2ec48a40a01515912c5c25e6
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jan 9 01:22:06 2010 -0800
+
+ Add AT45DBxx1D driver
+
+ This driver supports the AT45DB011D through AT45DB321D DataFlash
+ parts as found in TeleMetrum v0.2
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3bab7e66d25988f5d63ec139c8814a85b983f8f3
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 19 20:32:18 2009 -0800
+
+ Remove dbg driver code from telemetrum/teledongle
+
+ The only board with debug outputs is the TI dongle at this point, so
+ the debug modules were disabled in TM and TD some time
+ ago. Unfortunately, the code was not removed then.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit eddb82390a0ecb07ef83c04861993842906b03ab
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 19 15:31:36 2009 -0800
+
+ Ensure that ao_alarm waits at least the specified time
+
+ Because the timer tick may happen soon, it's important to delay by
+ another tick to ensure that we don't wake up early.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 598d168bd6552c3756e4b0267de44147eadab9f6
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 19 14:03:11 2009 -0800
+
+ Disable monitor mode before attempting radio test.
+
+ If monitor mode is left active, then the radio lock will not be able
+ to be acquired for the radio test.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d4cf1446680d8b47396bcda338e8df7af395d102
+Author: Bdale Garbee <bdale@gag.com>
+Date: Sat Dec 19 13:53:38 2009 -0700
+
+ update changelogs for Debian build
+
+commit 10d1bbcd9709a5eee8d50989215242b16feb7232
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 19 11:34:16 2009 -0800
+
+ Use ao_radio_get/ao_radio_put in packet code.
+
+ The ao_radio_get function both acquires the mutex *and* configures the
+ radio channel and frequency. Failing to use this in the packet code
+ would leave the radio frequency unconfigured.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a15abc1882a3bdd2c980eed169f3b80337528390
+Author: Bdale Garbee <bdale@gag.com>
+Date: Sat Dec 19 12:15:29 2009 -0700
+
+ update changelogs for Debian build
+
+commit bbb152c712801653374a8f82869e2e8bf41f7279
+Author: Bdale Garbee <bdale@gag.com>
+Date: Sat Dec 19 12:05:40 2009 -0700
+
+ update changelogs for Debian build
+
+commit 7ac8efea5d60b81adccdc1e38ac4c13facfae7c9
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 15 23:58:29 2009 -0800
+
+ Add --cal to man page
+
+commit 5481082b18226a0de6b377215b3b330bdbc4a6c6
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 5 19:50:38 2009 -0800
+
+ Allow radio calibration to be set from ao-load
+
+ This moves the initial radio calibration value into const memory where
+ it will be used if no eeprom configuration value is available, either
+ on an unprogrammed board with eeprom or a device without an eeprom.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 46f03ab3145a61139c8ca6fc99e8f2798728b5a9
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Dec 5 15:36:12 2009 -0800
+
+ Re-order config values. Change frequency to cal
+
+ Place more often used values at top, and consistently call the radio
+ value 'calibration' instead of 'frequency'.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bf29a62532fec12e6af2d2f3a6624882c863e933
+Author: Bdale Garbee <bdale@gag.com>
+Date: Sat Dec 5 11:03:42 2009 -0700
+
+ update changelogs for Debian build
+
+commit cd49847f3125df1733f298b56a43e8027ab5ce05
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 4 23:38:26 2009 -0800
+
+ Add radio calibration configuration.
+
+ The crystal we use is only good for 20ppm, which generates a fairly
+ significant error bounds at our RF frequency. This commit adds a
+ configuration variable that sets the RF frequency control variable so
+ that the output frequency can be adjusted.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c671a3f31f54715284beef5baa4a72ca922e4018
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 4 23:36:54 2009 -0800
+
+ Make ao_cmd_decimal produce both 32 and 16 bit values.
+
+ ao_cmd_lex_u32 is produced in addition to ao_cmd_lex_i so that
+ functions can easily read 32-bit values from the command line.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e6d6ad66ce177eb6e49eaa04b1ecc6426f4bbdbf
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 4 23:35:40 2009 -0800
+
+ Remove send_serial and serial_baud commands.
+
+ No longer useful, and they take up space.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ce7325cefbbe91054c1e8174cf40a6c687f6694b
+Author: Bdale Garbee <bdale@gag.com>
+Date: Fri Dec 4 21:02:07 2009 -0700
+
+ update changelogs for Debian build
+
+commit 9a1d7dd78c07d18954ef620b6ed25d6701df21e2
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 4 14:35:39 2009 -0800
+
+ Change default callsign to "N0CALL"
+
+commit 291e2004e77debdc1543912cf11043c849305de8
+Author: Bdale Garbee <bdale@gag.com>
+Date: Thu Nov 26 11:18:37 2009 -0700
+
+ update changelogs for Debian build
+
commit 40533095a96b6c6364eebdc4b7d53c4eabe72e9a
Author: Bdale Garbee <bdale@gag.com>
Date: Thu Nov 26 11:16:04 2009 -0700
projects / fw / altos / blobdiff