From: Keith Packard Date: Thu, 8 Apr 2010 18:46:56 +0000 (-0700) Subject: Merge remote branch 'origin/master' into altosui X-Git-Tag: debian/0.6+163+g01e524f~5 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=447c121fc1ceb878e45718ad1364a5349965a59a;hp=10330d23518c94a8b791193a97a6cc07b1c9a97c Merge remote branch 'origin/master' into altosui --- diff --git a/.gbp.conf b/.gbp.conf deleted file mode 100644 index 9561fdfe..00000000 --- a/.gbp.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Configuration file for git-buildpackage and friends - -[DEFAULT] -# the default build command: -#builder = debuild -i\.git/ -I.git -# the default clean command: -cleaner = debian/rules prebuild && debuild clean -# the default branch for upstream sources: -upstream-branch = upstream -# the default branch for the debian patch: -debian-branch = master -# the default tag formats used: -#upstream-tag = upstream/%(version)s -#debian-tag = debian/%(version)s -# use pristine-tar: -pristine-tar = True - -# Options only affecting git-buildpackage -[git-buildpackage] -#upstream-branch = dfsgclean -# uncomment this to automatically GPG sign tags -#sign-tags = True -# keyid to GPG sign tags with -#keyid = 0xdeadbeef -# push to a remote repository after a successful tag: -posttag = git push --mirror -# use this for more svn-buildpackage like behaviour: -export-dir = ../build-area/altos/ -#tarball-dir = ../tarballs/ - -# Options only affecting git-import-orig -[git-import-orig] -#upstream-branch = newupstream -#debian-branch = dfsgclean -#filter = .svn - -# Options only affecting git-import-dsc -[git-import-dsc] -#upstream-branch = svn-upstream -#filter = [ 'CVS', '.cvsignore' ] - -# Options only affecting git-dch -[git-dch] -#git-log = --no-merges -#snapshot-number = snapshot + 1 - diff --git a/.gitignore b/.gitignore index eafee20f..16ff1f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,6 @@ Makefile.in missing stamp-h1 tags +doc/telemetrum.fo +doc/telemetrum.html +doc/telemetrum.pdf diff --git a/ChangeLog b/ChangeLog index ea64f192..618c4a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,82 @@ +commit 00f49c8fb0aa38331360bdb85c32bcebe60dcdc3 +Author: Bdale Garbee +Date: Tue Mar 30 23:19:07 2010 -0600 + + fix typo + +commit f03ed0876c67b58624abf0c14bf73444b0322d3c +Author: Bdale Garbee +Date: Tue Mar 30 23:18:37 2010 -0600 + + update changelogs for Debian build + +commit b41e617080fe825f7810ee5eee52ea37f7618ec6 +Merge: 28e40cc df7bda1 +Author: Bdale Garbee +Date: Tue Mar 30 23:15:32 2010 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + + Conflicts: + ChangeLog + +commit 28e40ccfcd80ab8764d4aa235257cea4d193a0c1 +Author: Bdale Garbee +Date: Tue Mar 30 23:14:47 2010 -0600 + + update changelogs for Debian build + +commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8 +Author: Bdale Garbee +Date: Tue Mar 30 23:11:40 2010 -0600 + + initial harness for documentation + +commit 9801ff7de21027935f52ccabaa3ff157e22d21ce +Author: Bdale Garbee +Date: Mon Mar 15 12:04:18 2010 -0600 + + move gbp.conf into debian/ + +commit df7bda1f32b0049c3878c325ea0b55999f3980e3 +Merge: 23da4f3 a7042fe +Author: Keith Packard +Date: Fri Mar 12 10:38:26 2010 -0800 + + Merge remote branch 'origin/master' + +commit 23da4f3bcdd1d780c9e1f6b68ad2fb309fcae6ba +Author: Keith Packard +Date: Fri Mar 12 10:37:32 2010 -0800 + + Document the ao-dumplog '--remote' flag for radio-link downloads + + The --remote (or -R) flag uses TeleDongle to fetch data over the radio + command link from TeleMetrum. It's been there for a while, but the man + page failed to mention it. + + Signed-off-by: Keith Packard + +commit 93df98898f8cd199ae13158bc4f65e3494c954ad +Author: Keith Packard +Date: Fri Mar 12 10:35:12 2010 -0800 + + Round radio calibration value instead of truncating + + The radio calibration function in the bring-up code was truncating the + radio calibration value which caused the resulting frequency to + always measure above the target frequency, instead of trying to get as + close as possible. This change will result in a closer frequency + match, but may sometimes be below the target frequency. + + Signed-off-by: Keith Packard + +commit a7042fe7d065d1da1252be5ad43e3c9856214dc8 +Author: Bdale Garbee +Date: Fri Mar 5 19:11:11 2010 -0800 + + update changelogs for Debian build + commit eda5e1166a97766aa22561beaa1086ba4e19ee16 Author: Bdale Garbee Date: Thu Mar 4 17:33:39 2010 -0700 diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle index 97c1e419..7dbb82b5 100755 --- a/ao-bringup/turnon_teledongle +++ b/ao-bringup/turnon_teledongle @@ -1,5 +1,23 @@ #!/bin/sh +if [ -x ../ao-tools/ao-load/ao-load ]; then + AOLOAD=../ao-tools/ao-load/ao-load +elif [ -x /usr/bin/ao-load ]; then + AOLOAD=/usr/bin/ao-load +else + echo "Can't find ao-load! Aborting." + exit 1 +fi + +if [ -x ../ao-tools/ao-rawload/ao-rawload ]; then + RAWLOAD=../ao-tools/ao-rawload/ao-rawload +elif [ -x /usr/bin/ao-rawload ]; then + RAWLOAD=/usr/bin/ao-rawload +else + echo "Can't find ao-rawload! Aborting." + exit 1 +fi + echo "TeleDongle v0.2 Turn-On and Calibration Program" echo "Copyright 2010 by Bdale Garbee. Released under GPL v2" echo @@ -11,18 +29,20 @@ echo echo -n "TeleDongle serial number: " read SERIAL -../ao-tools/ao-rawload/ao-rawload -r ao_led_blink.ihx +echo $RAWLOAD + +$RAWLOAD -r ao_led_blink.ihx echo "LEDs should be blinking" sleep 5 -../ao-tools/ao-rawload/ao-rawload -r ao_radio_xmit.ihx +$RAWLOAD -r ao_radio_xmit.ihx echo -n "Generating RF carrier. Please enter measured frequency: " read FREQ CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"` echo "Programming flash with cal value " $CAL_VALUE -ao-load --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL +$AOLOAD --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE echo "Unplug and replug USB, cu to the board, confirm freq and record power" diff --git a/debian/changelog b/debian/changelog index 90b79f26..f0fe4564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +altos (0.6+119+g00f49c8) unstable; urgency=low + + [ Bdale Garbee ] + * update changelogs for Debian build + * move gbp.conf into debian/ + * initial harness for documentation + * fix typo + + [ Keith Packard ] + * Round radio calibration value instead of truncating + * Document the ao-dumplog '--remote' flag for radio-link downloads + + -- Bdale Garbee Tue, 30 Mar 2010 23:19:15 -0600 + altos (0.6+108+g6e61170) unstable; urgency=low [ Keith Packard ] diff --git a/debian/control b/debian/control index 7d21e602..85074142 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: otherosfs Priority: extra Maintainer: Bdale Garbee Uploaders: Keith Packard -Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, gawk, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, libplplot-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, gawk, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, libplplot-dev, xsltproc, fop, docbook-xsl +Standards-Version: 3.8.4 Homepage: http://altusmetrum.org/AltOS Package: altos diff --git a/debian/docs b/debian/docs index 50bd824b..d5af59c7 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,4 @@ NEWS README +doc/telemetrum.html +doc/telemetrum.pdf diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..9561fdfe --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,46 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +cleaner = debian/rules prebuild && debuild clean +# the default branch for upstream sources: +upstream-branch = upstream +# the default branch for the debian patch: +debian-branch = master +# the default tag formats used: +#upstream-tag = upstream/%(version)s +#debian-tag = debian/%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +posttag = git push --mirror +# use this for more svn-buildpackage like behaviour: +export-dir = ../build-area/altos/ +#tarball-dir = ../tarballs/ + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 + diff --git a/debian/rules b/debian/rules index 780011b7..a7468b9f 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir $(MAKE) VERSION=$(PKG_VERSION) + (cd doc ; $(MAKE)) touch $@ clean: diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 00000000..d3293900 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,25 @@ +# +# http://docbook.sourceforge.net/release/xsl/current/README +# + +all: telemetrum.html telemetrum.pdf + +telemetrum.html: telemetrum.xsl + xsltproc -o telemetrum.html \ + /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \ + telemetrum.xsl + +telemetrum.fo: telemetrum.xsl + xsltproc -o telemetrum.fo \ + /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl \ + telemetrum.xsl + +telemetrum.pdf: telemetrum.fo + fop -fo telemetrum.fo -pdf telemetrum.pdf + +clean: + rm -f telemetrum.html telemetrum.pdf telemetrum.fo + +indent: telemetrum.xsl + xmlindent -i 2 < telemetrum.xsl > telemetrum.new + diff --git a/doc/telemetrum.xsl b/doc/telemetrum.xsl new file mode 100644 index 00000000..97d8fb23 --- /dev/null +++ b/doc/telemetrum.xsl @@ -0,0 +1,80 @@ + + + + + + Bdale + Garbee + + + Keith + Packard + + + 2010 + Bdale Garbee and Keith Packard + + TeleMetrum + Owner's Manual for the TeleMetrum System + + + This document is released under the terms of the + + Creative Commons ShareAlike 3.0 + + license. + + + + + 0.1 + 30 March 2010 + Initial content + + + + + Introduction and Overview + + Placeholder. + + + + Specifications + + Placeholder. + + + + Handling Precautions + + Placeholder. + + + + Hardware Overview + + Placeholder. + + + + Operation + + Placeholder. + + + + System Overview + + Placeholder. + + + + System Overview + + Placeholder. + + + +