From cd5ce661e2a8f9694933358ccb5b916fbed089c2 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 18 Aug 2009 21:49:39 -0600 Subject: add support for building Debian package --- debian/rules | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100755 debian/rules (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..078dac56 --- /dev/null +++ b/debian/rules @@ -0,0 +1,78 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +export DH_VERBOSE=1 +PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') + +# this target invoked by git-buildpackage using a clean hook, see .gbp.conf +prebuild: + dch -v `git describe | tr - +` "build for Debian from git" + git log > ChangeLog + git commit ChangeLog debian/changelog \ + -m "update changelogs for Debian build" + +configure: configure-stamp +configure-stamp: + dh_testdir + ./autogen.sh --prefix=/usr + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + $(MAKE) VERSION=$(PKG_VERSION) + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/altos install + +# Build architecture-independent files here. +binary-indep: install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure -- cgit v1.2.3 From 21e3dd0affac89919e5d0e29c6e9eb1eacb51801 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 19 Aug 2009 02:06:49 -0600 Subject: enable support for Debian menus --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 078dac56..a2fd3fc7 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ binary-arch: install dh_installdocs dh_installexamples dh_install -# dh_installmenu + dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen -- cgit v1.2.3 From c8c5b7963babe8eb16e2651fba9cd2c8d1cba74e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 31 Aug 2009 16:42:37 -0600 Subject: deliver an icon for the Debian menu system --- debian/altusmetrum.xpm | 175 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/dirs | 1 + debian/menu | 8 ++- debian/rules | 2 + 4 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 debian/altusmetrum.xpm (limited to 'debian/rules') diff --git a/debian/altusmetrum.xpm b/debian/altusmetrum.xpm new file mode 100644 index 00000000..037b42d6 --- /dev/null +++ b/debian/altusmetrum.xpm @@ -0,0 +1,175 @@ +/* XPM */ +static char *icon[] = { +/* columns rows colors chars-per-pixel */ +"26 32 137 2", +" c #BB3D7F", +". c #BC3F7C", +"X c #BC3E7E", +"o c #BF4178", +"O c #BE4179", +"+ c #BD407A", +"@ c #BE407A", +"# c #D95F46", +"$ c #D95F47", +"% c #D55B4B", +"& c #D75D49", +"* c #D65C4B", +"= c #D75C4B", +"- c #D55A4E", +"; c #D85D49", +": c #D85E48", +"> c #D85E49", +", c #CD525B", +"< c #CE525B", +"1 c #CE535B", +"2 c #CF5459", +"3 c #CB505D", +"4 c #CD515D", +"5 c #CC515E", +"6 c #CC505F", +"7 c #D05654", +"8 c #D15655", +"9 c #D05556", +"0 c #D05557", +"q c #D35851", +"w c #D35951", +"e c #D25852", +"r c #D25853", +"t c #D45950", +"y c #D05558", +"u c #DB6241", +"i c #DB6142", +"p c #DC6340", +"a c #D96044", +"s c #DA6044", +"d c #C64B66", +"f c #CB4F60", +"g c #CB4F61", +"h c #C94E63", +"j c #CA4E62", +"k c #C84C65", +"l c #C94D65", +"z c #C84C66", +"x c #C84C67", +"c c #C2466E", +"v c #C3476F", +"b c #C4476E", +"n c #C74B68", +"m c #C74A69", +"M c #C5496B", +"N c #C6496A", +"B c #C6496B", +"V c #C4486D", +"C c #CB5060", +"Z c #C04471", +"A c #C24571", +"S c #C34670", +"D c #C24671", +"F c #C14473", +"G c #C24572", +"H c #C04375", +"J c #C14474", +"K c #B53885", +"L c #B83B81", +"P c #BA3C80", +"I c #BA3C81", +"U c #B83985", +"Y c #B83A85", +"T c #B63789", +"R c #B4358B", +"E c #B5378A", +"W c #B3348E", +"Q c #B3348F", +"! c #B4358D", +"~ c #B63888", +"^ c #AF2F96", +"/ c #AE2F97", +"( c #AB2C99", +") c #A82A9D", +"_ c #AB2B9E", +"` c #AC2C9C", +"' c #AF3095", +"] c #B23390", +"[ c #B03095", +"{ c #9E1DB2", +"} c #9F1EB2", +"| c #9B1BB5", +" . c #9D1CB5", +".. c #9A17BF", +"X. c #9B19BB", +"o. c #9C1ABA", +"O. c #9A19BC", +"+. c #9B19BC", +"@. c #A01EB3", +"#. c #A726A5", +"$. c #A625A6", +"%. c #A626A6", +"&. c #A929A0", +"*. c #A828A2", +"=. c #A423AB", +"-. c #A524A8", +";. c #A524AA", +":. c #A221AE", +">. c #8E0CCD", +",. c #910FCB", +"<. c #900DCE", +"1. c #9413C4", +"2. c #9613C6", +"3. c #9815C2", +"4. c #9310CA", +"5. c #9512C8", +"6. c #8F0CD2", +"7. c #8E0BD4", +"8. c #8D09D7", +"9. c #8603DE", +"0. c #8A05DD", +"q. c #8C08D8", +"w. c #8200E1", +"e. c #8200E2", +"r. c #8300E2", +"t. c #8300E3", +"y. c #8401E0", +"u. c #8602E0", +"i. c #8602E2", +"p. c #8400E4", +"a. c #8400E5", +"s. c #8500E5", +"d. c #8501E5", +"f. c #8601E5", +"g. c #8500E6", +"h. c #8804E0", +"j. c None", +/* pixels */ +"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.j.a.j.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.j.a.g.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.j.g.a.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.a.a.a.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.a.a.a.a.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.g.a.a.a.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.a.a.j.j.a.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.a.a.j.j.a.a.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.p.j.j.j.w.w.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.w.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.a.a.j.j.j.j.a.a.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.j.a.a.w.j.j.a.a.a.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.p.a.a.a.j.a.a.a.a.j.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.a.a.w.j.w.w.j.a.a.a.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.j.a.a.p.j.j.j.j.p.g.a.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.p.a.a.w.j.j.j.j.p.g.a.j.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.a.g.a.p.j.j.j.j.p.f.a.a.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.j.a.h.q.>.j.j.j.j.,.7.0.p.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.9.q.4.3. .j.j.j.j.{ X.2.6.j.j.j.j.j.j.j.", +"j.j.j.j.j.j.<.3.@.#._ j.j.j.j.( *.:.X.2.j.j.j.j.j.j.", +"j.j.j.j.j.j.O.;.` ! K j.j.j.j.I E [ #.@.j.j.j.j.j.j.", +"j.j.j.j.j. .;.' Y o F j.j.j.j.v J P ] &.j.j.j.j.j.j.", +"j.j.j.j.j.$.' P F M k j.j.j.j.k M v O ! ( j.j.j.j.j.", +"j.j.j.j.j.' P F M j 3 j.j.j.j.1 6 z b O E j.j.j.j.j.", +"j.j.j.j.j.~ F n C 2 9 j.j.j.j.w 9 6 z V X j.j.j.j.j.", +"j.j.j.j.! O V C 2 w % j.j.j.j.% * 9 6 z F P j.j.j.j.", +"j.j.j.j.K S z y t : $ j.j.j.j.p s - 9 j M O j.j.j.j.", +"j.j.j./ + V C 9 * s j.j.j.j.j.j.p : t 1 z J E j.j.j.", +"j.j.:.] J z 2 t : j.j.j.j.j.j.j.j.s * 9 j b I *.j.j.", +"j.5.;.~ S z y t j.j.j.j.j.j.j.j.j.j.: r 6 M X _ X.j." +}; diff --git a/debian/dirs b/debian/dirs index 8b9a4657..3783a46c 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,3 +1,4 @@ etc/apt/sources.list.d usr/bin usr/share/altos +/usr/share/pixmaps diff --git a/debian/menu b/debian/menu index 9bd98c5a..c175534d 100644 --- a/debian/menu +++ b/debian/menu @@ -1,2 +1,6 @@ -?package(altos):needs="X11" section="Applications/Viewers"\ - title="ao-view" command="/usr/bin/ao-view" +?package(altos): \ + needs="X11" \ + section="Applications/Viewers" \ + title="ao-view" \ + command="/usr/bin/ao-view" \ + icon="/usr/share/pixmaps/altusmetrum.xpm" diff --git a/debian/rules b/debian/rules index a2fd3fc7..fff5585f 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,8 @@ binary-arch: install dh_installexamples dh_install dh_installmenu + install debian/altusmetrum.xpm \ + debian/altos/usr/share/pixmaps/altusmetrum.xpm # dh_installdebconf # dh_installlogrotate # dh_installemacsen -- cgit v1.2.3 From 6926c4ab5d87a8f2eb4fcde2c673fb3a4639e115 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 31 Aug 2009 16:47:44 -0600 Subject: pixmap file should not be executable --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index fff5585f..74cc078d 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,8 @@ install: build dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/altos install + install -o root -g root -m 0644 debian/altusmetrum.xpm \ + $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm # Build architecture-independent files here. binary-indep: install @@ -52,8 +54,6 @@ binary-arch: install dh_installexamples dh_install dh_installmenu - install debian/altusmetrum.xpm \ - debian/altos/usr/share/pixmaps/altusmetrum.xpm # dh_installdebconf # dh_installlogrotate # dh_installemacsen -- cgit v1.2.3 From 241a860fe856b1dfad6e792736313648300d5c24 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:48:43 -0600 Subject: flush repetitive junk out of debian/changelog, and update the prebuild target in debian/rules to put git commit details into the Debian changelog --- debian/changelog | 137 ------------------------------------------------------- debian/rules | 2 +- 2 files changed, 1 insertion(+), 138 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 4c503f86..e886205e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,140 +4,3 @@ altos (0.5+77+gc57bd7f) unstable; urgency=low -- Bdale Garbee Mon, 12 Oct 2009 15:57:19 -0600 -altos (0.5+73+g541da6f) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sat, 10 Oct 2009 15:11:23 -0600 - -altos (0.5+66+g459ff3d) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Mon, 21 Sep 2009 22:46:58 -0700 - -altos (0.5+65+g327c643) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Mon, 21 Sep 2009 11:00:31 -0700 - -altos (0.5+60+gdf42cca) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 20 Sep 2009 09:21:00 -0600 - -altos (0.5+53+ga5e94aa) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 18:01:20 -0600 - -altos (0.5+51+g3f95a5a) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 17:48:22 -0600 - -altos (0.5+49+gae4e131) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 17:47:56 -0600 - -altos (0.5+48+g37e6c9a) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 17:46:39 -0600 - -altos (0.5+43+g4b0de75) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 14:15:57 -0600 - -altos (0.5+39+g45ede4a) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 14:05:55 -0600 - -altos (0.5+36+gd42ebf0) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 14:02:14 -0600 - -altos (0.5+33+g35c54b3) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Sun, 06 Sep 2009 10:40:06 -0600 - -altos (0.5+27+g332b056) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Fri, 04 Sep 2009 16:03:55 -0600 - -altos (0.5+19+gcb4a73f) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Wed, 02 Sep 2009 23:18:15 -0600 - -altos (0.5+13+g6926c4a) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Mon, 31 Aug 2009 16:48:03 -0600 - -altos (0.5+11+gc8c5b79) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Mon, 31 Aug 2009 16:42:55 -0600 - -altos (0.5+9+gb34474c) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Mon, 31 Aug 2009 16:26:00 -0600 - -altos (0.4+98+g42ab6d5) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Wed, 19 Aug 2009 02:21:23 -0600 - -altos (0.4+96+g8d4d665) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Wed, 19 Aug 2009 02:11:11 -0600 - -altos (0.4+94+g21e3dd0) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Wed, 19 Aug 2009 02:07:16 -0600 - -altos (0.4+92+g4486d91) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Wed, 19 Aug 2009 00:52:57 -0600 - -altos (0.4+88+gcd5ce66) unstable; urgency=low - - * build for Debian from git - - -- Bdale Garbee Tue, 18 Aug 2009 21:57:00 -0600 - -altos (0) unstable; urgency=low - - * Initial packaging - - -- Bdale Garbee Tue, 18 Aug 2009 11:43:43 -0600 diff --git a/debian/rules b/debian/rules index 74cc078d..0033fcbe 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - dch -v `git describe | tr - +` "build for Debian from git" + git-dch --release --new-version=`git describe | tr - +` git log > ChangeLog git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" -- cgit v1.2.3 From 7da56ad8576ef212ffb6cb573bdaf578453e3fe0 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:52:52 -0600 Subject: add support for tagging git repository on each Debian package build --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0033fcbe..384bacf6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,15 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') +DEB_VERSION := $(shell git describe | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - git-dch --release --new-version=`git describe | tr - +` + git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" + git tag debian/$(DEB_VERSION) configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 513328ac5f7c25f9ee144ab6befbea60d69eed1a Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:56:50 -0600 Subject: automate push of updated and tagged master branch during debian/rules prebuild --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 384bacf6..f306f1df 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,7 @@ prebuild: git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) + git push --tags master configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 2de548f45d0f50b558acc83f57e1e2fc1223ab92 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 12 Oct 2009 16:58:19 -0600 Subject: oops, forgot to specify the repo to push to --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f306f1df..ac594c07 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ prebuild: git commit ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) - git push --tags master + git push --tags origin master configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 144db05f6b286a0450d486f69ce192632a2c0656 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 2 Nov 2009 21:38:18 -0800 Subject: Add two-point accelerometer calibration. Calibration now uses two values, one upside right and the other upside down instead of a single horizontal value. This allows the use of other accelerometers and compensates for variations in the divider circuit to provide more accurate data. --- debian/rules | 2 +- src/ao.h | 10 +++++---- src/ao_config.c | 61 +++++++++++++++++++++++++++++++++++++--------------- src/ao_flight.c | 46 +++++++++++++++++++-------------------- src/ao_flight_test.c | 7 ++++-- 5 files changed, 79 insertions(+), 47 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ac594c07..260ba773 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ DEB_VERSION := $(shell git describe | tr - +) prebuild: git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog - git commit ChangeLog debian/changelog \ + git commit -n ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) git push --tags origin master diff --git a/src/ao.h b/src/ao.h index 4cceefe1..22e8785f 100644 --- a/src/ao.h +++ b/src/ao.h @@ -117,8 +117,9 @@ ao_panic(uint8_t reason); */ /* Our timer runs at 100Hz */ -#define AO_MS_TO_TICKS(ms) ((ms) / 10) -#define AO_SEC_TO_TICKS(s) ((s) * 100) +#define AO_HERTZ 100 +#define AO_MS_TO_TICKS(ms) ((ms) / (1000 / AO_HERTZ)) +#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ) /* Returns the current time in ticks */ uint16_t @@ -928,16 +929,17 @@ ao_igniter_init(void); */ #define AO_CONFIG_MAJOR 1 -#define AO_CONFIG_MINOR 1 +#define AO_CONFIG_MINOR 2 struct ao_config { uint8_t major; uint8_t minor; uint16_t main_deploy; - int16_t accel_zero_g; + int16_t accel_plus_g; uint8_t radio_channel; char callsign[AO_MAX_CALLSIGN + 1]; uint8_t apogee_delay; + int16_t accel_minus_g; }; extern __xdata struct ao_config ao_config; diff --git a/src/ao_config.c b/src/ao_config.c index 021fb6f6..85fcff8c 100644 --- a/src/ao_config.c +++ b/src/ao_config.c @@ -45,7 +45,8 @@ _ao_config_get(void) ao_config.minor = AO_CONFIG_MINOR; ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY; ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL; - ao_config.accel_zero_g = AO_CONFIG_DEFAULT_ACCEL_ZERO_G; + ao_config.accel_plus_g = 0; + ao_config.accel_minus_g = 0; memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign)); memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN, sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1); @@ -53,9 +54,14 @@ _ao_config_get(void) ao_config_dirty = 1; } if (ao_config.minor < AO_CONFIG_MINOR) { - /* Fixups for major version 1 */ + /* Fixups for mior version 1 */ if (ao_config.minor < 1) ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY; + /* Fixupes for minor version 2 */ + if (ao_config.minor < 2) { + ao_config.accel_plus_g = 0; + ao_config.accel_minus_g = 0; + } ao_config.minor = AO_CONFIG_MINOR; ao_config_dirty = 1; } @@ -152,23 +158,28 @@ ao_config_main_deploy_set(void) __reentrant } void -ao_config_accel_zero_g_show(void) __reentrant +ao_config_accel_calibrate_show(void) __reentrant { - printf("Accel zero g point: %d\n", - ao_config.accel_zero_g); + printf("Accel cal +1g: %d -1g: %d\n", + ao_config.accel_plus_g, ao_config.accel_minus_g); } -#define ZERO_G_SAMPLES 1000 +#define ACCEL_CALIBRATE_SAMPLES 1024 +#define ACCEL_CALIBRATE_SHIFT 10 static int16_t -ao_config_accel_zero_g_auto(void) __reentrant +ao_config_accel_calibrate_auto(char *orientation) __reentrant { uint16_t i; int32_t accel_total; uint8_t cal_adc_ring; - puts("Calibrating accelerometer..."); flush(); - i = ZERO_G_SAMPLES; + printf("Orient %s and press a key...", orientation); + flush(); + (void) getchar(); + puts("\r\n"); flush(); + puts("Calibrating..."); flush(); + i = ACCEL_CALIBRATE_SAMPLES; accel_total = 0; cal_adc_ring = ao_adc_head; while (i) { @@ -179,22 +190,38 @@ ao_config_accel_zero_g_auto(void) __reentrant i--; } } - return (int16_t) (accel_total / ZERO_G_SAMPLES); + return accel_total >> ACCEL_CALIBRATE_SHIFT; } + void -ao_config_accel_zero_g_set(void) __reentrant +ao_config_accel_calibrate_set(void) __reentrant { + int16_t up, down; ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - if (ao_cmd_lex_i == 0) - ao_cmd_lex_i = ao_config_accel_zero_g_auto(); + if (ao_cmd_lex_i == 0) { + up = ao_config_accel_calibrate_auto("antenna up"); + down = ao_config_accel_calibrate_auto("antenna down"); + } else { + up = ao_cmd_lex_i; + ao_cmd_decimal(); + if (ao_cmd_status != ao_cmd_success) + return; + down = ao_cmd_lex_i; + } + if (up >= down) { + printf("Invalid accel calibration: antenna up (%d) should be less than antenna down (%d)\n", + up, down); + return; + } ao_mutex_get(&ao_config_mutex); _ao_config_get(); - ao_config.accel_zero_g = ao_cmd_lex_i; + ao_config.accel_plus_g = up; + ao_config.accel_minus_g = down; ao_config_dirty = 1; ao_mutex_put(&ao_config_mutex); - ao_config_accel_zero_g_show(); + ao_config_accel_calibrate_show(); } void @@ -237,8 +264,8 @@ ao_config_write(void) __reentrant; __code struct ao_config_var ao_config_vars[] = { { 'm', ao_config_main_deploy_set, ao_config_main_deploy_show, "m Set height above launch for main deploy (in meters)" }, - { 'a', ao_config_accel_zero_g_set, ao_config_accel_zero_g_show, - "a Set accelerometer zero g point (0 for auto)" }, + { 'a', ao_config_accel_calibrate_set, ao_config_accel_calibrate_show, + "a <+g> <-g> Set accelerometer calibration (0 for auto)" }, { 'r', ao_config_radio_channel_set, ao_config_radio_channel_show, "r Set radio channel (freq = 434.550 + channel * .1)" }, { 'c', ao_config_callsign_set, ao_config_callsign_show, diff --git a/src/ao_flight.c b/src/ao_flight.c index e91a5daa..92c955fb 100644 --- a/src/ao_flight.c +++ b/src/ao_flight.c @@ -48,6 +48,7 @@ __pdata int16_t ao_interval_max_pres; __data uint8_t ao_flight_adc; __pdata int16_t ao_raw_accel, ao_raw_accel_prev, ao_raw_pres; +__pdata int16_t ao_accel_2g; /* Accelerometer calibration * @@ -72,19 +73,18 @@ __pdata int16_t ao_raw_accel, ao_raw_accel_prev, ao_raw_pres; #define GRAVITY 9.80665 /* convert m/s to velocity count */ -#define VEL_MPS_TO_COUNT(mps) ((int32_t) (((mps) / GRAVITY) * ACCEL_G * 100)) +#define VEL_MPS_TO_COUNT(mps) (((int32_t) (((mps) / GRAVITY) * (AO_HERTZ/2))) * (int32_t) ao_accel_2g) #define ACCEL_G 265 -#define ACCEL_ZERO_G 16000 -#define ACCEL_NOSE_UP (ACCEL_G * 2 /3) -#define ACCEL_BOOST ACCEL_G * 2 +#define ACCEL_NOSE_UP (ao_accel_2g / 4) +#define ACCEL_BOOST ao_accel_2g #define ACCEL_INT_LAND (ACCEL_G / 10) -#define ACCEL_VEL_LAND VEL_MPS_TO_COUNT(10) #define ACCEL_VEL_MACH VEL_MPS_TO_COUNT(200) -#define ACCEL_VEL_APOGEE VEL_MPS_TO_COUNT(2) -#define ACCEL_VEL_MAIN VEL_MPS_TO_COUNT(100) #define ACCEL_VEL_BOOST VEL_MPS_TO_COUNT(5) +int32_t accel_vel_mach; +int32_t accel_vel_boost; + /* * Barometer calibration * @@ -170,14 +170,14 @@ ao_flight(void) * so subtract instead of add. */ ticks = ao_flight_tick - ao_flight_prev_tick; - ao_vel_change = (((ao_raw_accel >> 1) + (ao_raw_accel_prev >> 1)) - ao_ground_accel); + ao_vel_change = ao_ground_accel - (((ao_raw_accel + 1) >> 1) + ((ao_raw_accel_prev + 1) >> 1)); ao_raw_accel_prev = ao_raw_accel; /* one is a common interval */ if (ticks == 1) - ao_flight_vel -= (int32_t) ao_vel_change; + ao_flight_vel += (int32_t) ao_vel_change; else - ao_flight_vel -= (int32_t) ao_vel_change * (int32_t) ticks; + ao_flight_vel += (int32_t) ao_vel_change * (int32_t) ticks; ao_flight_adc = ao_adc_ring_next(ao_flight_adc); } @@ -211,6 +211,9 @@ ao_flight(void) ao_min_pres = ao_ground_pres; ao_config_get(); ao_main_pres = ao_altitude_to_pres(ao_pres_to_altitude(ao_ground_pres) + ao_config.main_deploy); + ao_accel_2g = ao_config.accel_minus_g - ao_config.accel_plus_g; + accel_vel_mach = ACCEL_VEL_MACH; + accel_vel_boost = ACCEL_VEL_BOOST; ao_flight_vel = 0; ao_min_vel = 0; ao_old_vel = ao_flight_vel; @@ -218,8 +221,9 @@ ao_flight(void) /* Go to pad state if the nose is pointing up */ ao_config_get(); - if (ao_flight_accel < ao_config.accel_zero_g - ACCEL_NOSE_UP) { - + if (ao_config.accel_plus_g != 0 && ao_config.accel_minus_g != 0 && + ao_flight_accel < ao_config.accel_plus_g + ACCEL_NOSE_UP) + { /* Disable the USB controller in flight mode * to save power */ @@ -337,19 +341,15 @@ ao_flight(void) /* apogee detect: coast to drogue deploy: * - * accelerometer: abs(velocity) > min_velocity + 2m/s - * OR * barometer: fall at least 10m * - * If the barometer saturates because the flight - * goes over its measuring range (about 53k'), - * requiring a 10m fall will avoid prematurely - * detecting apogee; the accelerometer will take - * over in that case and the integrated velocity - * measurement should suffice to find apogee + * It would be nice to use the accelerometer + * to detect apogee as well, but tests have + * shown that flights far from vertical would + * grossly mis-detect apogee. So, for now, + * we'll trust to a single sensor for this test */ - if (/* abs(ao_flight_vel) > ao_min_vel + ACCEL_VEL_APOGEE || */ - ao_flight_pres > ao_min_pres + BARO_APOGEE) + if (ao_flight_pres > ao_min_pres + BARO_APOGEE) { /* ignite the drogue charge */ ao_ignite(ao_igniter_drogue); @@ -462,7 +462,7 @@ ao_flight_status(void) __reentrant { printf("STATE: %7s accel: %d speed: %d altitude: %d main: %d\n", ao_state_names[ao_flight_state], - AO_ACCEL_COUNT_TO_MSS(ACCEL_ZERO_G - ao_flight_accel), + AO_ACCEL_COUNT_TO_MSS( - ao_flight_accel), AO_VEL_COUNT_TO_MS(ao_flight_vel), ao_pres_to_altitude(ao_flight_pres), ao_pres_to_altitude(ao_main_pres)); diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c index 83c63016..61f48cb6 100644 --- a/src/ao_flight_test.c +++ b/src/ao_flight_test.c @@ -22,6 +22,8 @@ #include #include +#define AO_HERTZ 100 + #define AO_ADC_RING 64 #define ao_adc_ring_next(n) (((n) + 1) & (AO_ADC_RING - 1)) #define ao_adc_ring_prev(n) (((n) - 1) & (AO_ADC_RING - 1)) @@ -144,12 +146,13 @@ ao_altitude_to_pres(int16_t alt) __reentrant struct ao_config { uint16_t main_deploy; - int16_t accel_zero_g; + int16_t accel_plus_g; + int16_t accel_minus_g; }; #define ao_config_get() -struct ao_config ao_config = { 250, 16000 }; +struct ao_config ao_config = { 250, 15937, 16467 }; #include "ao_flight.c" -- cgit v1.2.3 From c74958d3e8c5ce8006a9f9f6853238fce0c77432 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 24 Feb 2010 17:13:29 -0700 Subject: move git-using variable declaration into the prebuild target --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 260ba773..343cd71a 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') -DEB_VERSION := $(shell git describe | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: + DEB_VERSION := $(shell git describe | tr - +) git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog git commit -n ChangeLog debian/changelog \ -- cgit v1.2.3 From 4b6b28530206c6fdbe46699b81746fbbcab5b148 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 24 Feb 2010 17:22:20 -0700 Subject: see if this works --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 343cd71a..f4e9f840 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') +DEB_VERSION := $(shell -git describe | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - DEB_VERSION := $(shell git describe | tr - +) git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog git commit -n ChangeLog debian/changelog \ -- cgit v1.2.3 From cdccd92f6ed97be7385e84de5694064cb8f43946 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 24 Feb 2010 17:25:28 -0700 Subject: conditionalize use of git on executability of /usr/bin/git binary --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f4e9f840..f6efe990 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') -DEB_VERSION := $(shell -git describe | tr - +) +DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: -- cgit v1.2.3 From 540f86678853e7ea80ae91f3f2ec0ec88c5b1ca7 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 24 Feb 2010 17:27:51 -0700 Subject: debugging --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f6efe990..780011b7 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; f # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: + echo $(DEB_VERSION) git-dch --release --new-version=$(DEB_VERSION) git log > ChangeLog git commit -n ChangeLog debian/changelog \ -- cgit v1.2.3 From 20d4d410e0fc04fe192e309811eed6c0194fa5a8 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 30 Mar 2010 23:11:40 -0600 Subject: initial harness for documentation --- .gitignore | 3 +++ debian/control | 4 ++-- debian/docs | 2 ++ debian/rules | 1 + doc/Makefile | 25 +++++++++++++++++++++++++ doc/telemetrum.xsl | 44 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 doc/Makefile create mode 100644 doc/telemetrum.xsl (limited to 'debian/rules') 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/debian/control b/debian/control index 7d21e602..2ba1722d 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/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/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..7d855318 --- /dev/null +++ b/doc/telemetrum.xsl @@ -0,0 +1,44 @@ + + + + + + Bdale + Garbee + + + Keith + Packard + + + 2010 + Bdale Garbee + + 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 + + Placeholder. + + + + -- cgit v1.2.3 From bc89d962c87b50e5487628f8ca25e4443ac4823d Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 18 May 2010 00:24:03 -0600 Subject: merge the altusmetrum-themes package --- debian/altos.install | 8 +++++ debian/control | 4 ++- debian/dirs | 2 ++ debian/rules | 5 ---- themes/background.png | Bin 0 -> 3309056 bytes themes/background.xcf | Bin 0 -> 7648194 bytes themes/gdm/GdmGreeterTheme.desktop | 7 +++++ themes/gdm/altusmetrum.xml | 60 +++++++++++++++++++++++++++++++++++++ themes/gdm/screenshot.png | Bin 0 -> 38754 bytes themes/slim/panel.png | Bin 0 -> 25395 bytes themes/slim/slim.theme | 37 +++++++++++++++++++++++ 11 files changed, 117 insertions(+), 6 deletions(-) create mode 100644 themes/background.png create mode 100644 themes/background.xcf create mode 100644 themes/gdm/GdmGreeterTheme.desktop create mode 100644 themes/gdm/altusmetrum.xml create mode 100644 themes/gdm/screenshot.png create mode 100644 themes/slim/panel.png create mode 100644 themes/slim/slim.theme (limited to 'debian/rules') diff --git a/debian/altos.install b/debian/altos.install index 8d8a1987..8be48ca3 100644 --- a/debian/altos.install +++ b/debian/altos.install @@ -1,4 +1,12 @@ debian/altos.desktop usr/share/applications debian/altos.list etc/apt/sources.list.d +debian/altusmetrum.xpm usr/share/pixmaps src/*.ihx usr/share/altos src/*.map usr/share/altos +themes/background.png usr/share/slim/themes/altusmetrum +themes/slim/panel.png usr/share/slim/themes/altusmetrum +themes/slim/slim.theme usr/share/slim/themes/altusmetrum +themes/background.png usr/share/gdm/themes/altusmetrum +themes/gdm/altusmetrum.xml /usr/share/gdm/themes/altusmetrum +themes/gdm/GdmGreeterTheme.desktop /usr/share/gdm/themes/altusmetrum +themes/gdm/screenshot.png /usr/share/gdm/themes/altusmetrum diff --git a/debian/control b/debian/control index ff6c12e7..fb620e3d 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,9 @@ Homepage: http://altusmetrum.org/AltOS Package: altos Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, nickle, plplot9-driver-cairo -Suggests: slim-altusmetrum +Suggests: slim | gdm +Replaces: altusmetrum-themes, slim-altusmetrum +Conflicts: altusmetrum-themes, slim-altusmetrum Description: Altus Metrum firmware and utilities Firmware and utilities needed to support the TeleMetrum dual-deploy recording altimeter for high power model rocketry. diff --git a/debian/dirs b/debian/dirs index 29840efb..db75fea7 100644 --- a/debian/dirs +++ b/debian/dirs @@ -2,4 +2,6 @@ etc/apt/sources.list.d usr/bin usr/share/altos usr/share/applications +usr/share/gdm/themes/altusmetrum usr/share/pixmaps +usr/share/slim/themes/altusmetrum diff --git a/debian/rules b/debian/rules index a7468b9f..53a8a340 100755 --- a/debian/rules +++ b/debian/rules @@ -43,14 +43,9 @@ install: build dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/altos install - install -o root -g root -m 0644 debian/altusmetrum.xpm \ - $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm -# Build architecture-independent files here. binary-indep: install -# We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: install dh_testdir dh_testroot diff --git a/themes/background.png b/themes/background.png new file mode 100644 index 00000000..a3c78f36 Binary files /dev/null and b/themes/background.png differ diff --git a/themes/background.xcf b/themes/background.xcf new file mode 100644 index 00000000..92c17093 Binary files /dev/null and b/themes/background.xcf differ diff --git a/themes/gdm/GdmGreeterTheme.desktop b/themes/gdm/GdmGreeterTheme.desktop new file mode 100644 index 00000000..b0fa34b9 --- /dev/null +++ b/themes/gdm/GdmGreeterTheme.desktop @@ -0,0 +1,7 @@ +[GdmGreeterTheme] +Greeter=altusmetrum.xml +Name=AltusMetrum +Description=altusmetrum.org +Author=Bdale Garbee +Copyright=Bdale Garbee +Screenshot=screenshot.png diff --git a/themes/gdm/altusmetrum.xml b/themes/gdm/altusmetrum.xml new file mode 100644 index 00000000..e2755e8e --- /dev/null +++ b/themes/gdm/altusmetrum.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %n | %c + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/gdm/screenshot.png b/themes/gdm/screenshot.png new file mode 100644 index 00000000..5c49ec1c Binary files /dev/null and b/themes/gdm/screenshot.png differ diff --git a/themes/slim/panel.png b/themes/slim/panel.png new file mode 100644 index 00000000..f61bafe3 Binary files /dev/null and b/themes/slim/panel.png differ diff --git a/themes/slim/slim.theme b/themes/slim/slim.theme new file mode 100644 index 00000000..1eeef966 --- /dev/null +++ b/themes/slim/slim.theme @@ -0,0 +1,37 @@ +# altusmetrum theme for SLiM +# by Bdale Garbee + +# Messages (ie: shutdown) +msg_color #000000 +msg_font Verdana:size=18:bold:dpi=75 +msg_x 50% +msg_y 40% +msg_shadow_color #FFFFFF +msg_shadow_xoffset 1 +msg_shadow_yoffset 1 + +# valid values: stretch, tile +background_style stretch +background_color #eedddd + +# Input controls +input_panel_x 50% +input_panel_y 70% +input_name_x 59 +input_name_y 161 +input_font Verdana:size=12:dpi=75 +input_fgcolor #000000 + +# Username / password request +username_font Verdana:size=14:bold:dpi=75 +username_color #000000 +username_x 50% +username_y 122 +password_x 50% +password_y 122 +username_shadow_color #FFFFFF +username_shadow_xoffset 1 +username_shadow_yoffset 1 + +username_msg Username: +password_msg Password: -- cgit v1.2.3 From ea7130e953622884afc348265f5a4c58f9876823 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 1 Dec 2010 00:00:58 -0700 Subject: modify Debian package build to deliver one copy of background.png for the themes and symlink it into place for gdm and slim --- debian/altos.install | 3 +-- debian/dirs | 2 +- debian/rules | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/altos.install b/debian/altos.install index 8be48ca3..c23e1628 100644 --- a/debian/altos.install +++ b/debian/altos.install @@ -3,10 +3,9 @@ debian/altos.list etc/apt/sources.list.d debian/altusmetrum.xpm usr/share/pixmaps src/*.ihx usr/share/altos src/*.map usr/share/altos -themes/background.png usr/share/slim/themes/altusmetrum +themes/background.png usr/share/altos/themes themes/slim/panel.png usr/share/slim/themes/altusmetrum themes/slim/slim.theme usr/share/slim/themes/altusmetrum -themes/background.png usr/share/gdm/themes/altusmetrum themes/gdm/altusmetrum.xml /usr/share/gdm/themes/altusmetrum themes/gdm/GdmGreeterTheme.desktop /usr/share/gdm/themes/altusmetrum themes/gdm/screenshot.png /usr/share/gdm/themes/altusmetrum diff --git a/debian/dirs b/debian/dirs index 7b4dffb8..1cffaa67 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,7 +1,7 @@ etc/apt/sources.list.d usr/bin usr/lib/altos -usr/share/altos +usr/share/altos/themes usr/share/applications usr/share/gdm/themes/altusmetrum usr/share/java diff --git a/debian/rules b/debian/rules index 53a8a340..e0f1f72c 100755 --- a/debian/rules +++ b/debian/rules @@ -53,6 +53,10 @@ binary-arch: install dh_installdocs dh_installexamples dh_install + ln -s /usr/share/altos/themes/background.png \ + /usr/share/gdm/themes/altusmetrum/background.png + ln -s /usr/share/altos/themes/background.png \ + /usr/share/slim/themes/altusmetrum/background.png dh_installmenu # dh_installdebconf # dh_installlogrotate -- cgit v1.2.3 From ea95c060f8bd959cefc60dd6d411151f3c91384e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 1 Dec 2010 00:12:05 -0700 Subject: fix symlink paths in rules file --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e0f1f72c..83f3a53f 100755 --- a/debian/rules +++ b/debian/rules @@ -54,9 +54,9 @@ binary-arch: install dh_installexamples dh_install ln -s /usr/share/altos/themes/background.png \ - /usr/share/gdm/themes/altusmetrum/background.png + debian/altos/usr/share/gdm/themes/altusmetrum/background.png ln -s /usr/share/altos/themes/background.png \ - /usr/share/slim/themes/altusmetrum/background.png + debian/altos/usr/share/slim/themes/altusmetrum/background.png dh_installmenu # dh_installdebconf # dh_installlogrotate -- cgit v1.2.3 From 3cad81b0ebb52352c66643a2587e94a2b693a2d2 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 8 Aug 2011 07:38:48 -0600 Subject: stop doing automatic tag push during builds --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 83f3a53f..1ea1f68d 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ prebuild: git commit -n ChangeLog debian/changelog \ -m "update changelogs for Debian build" git tag debian/$(DEB_VERSION) - git push --tags origin master +# git push --tags origin master configure: configure-stamp configure-stamp: -- cgit v1.2.3 From 5082b4998b8a9787e0e2f4d96d912e434aa9b81a Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 8 Aug 2011 09:31:18 -0600 Subject: clean up all existing lintian warnings --- debian/control | 2 +- debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/control b/debian/control index 61ba6cfe..fc70c8e0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ 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, xsltproc, fop, docbook-xml, docbook-xsl, libsndfile1-dev, swig, openjdk-6-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://altusmetrum.org/AltOS Package: altos diff --git a/debian/rules b/debian/rules index 1ea1f68d..1353321d 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,9 @@ configure-stamp: ./autogen.sh --prefix=/usr touch configure-stamp -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: configure-stamp dh_testdir @@ -43,6 +45,7 @@ install: build dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/altos install + sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'` binary-indep: install -- cgit v1.2.3 From fc7e46b1215ea2b4cc138ed77d8eaa122369b15f Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 23 Aug 2011 20:10:14 -0600 Subject: turn off auto-tagging during Debian build --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 1353321d..028b548f 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ prebuild: git log > ChangeLog git commit -n ChangeLog debian/changelog \ -m "update changelogs for Debian build" - git tag debian/$(DEB_VERSION) +# git tag debian/$(DEB_VERSION) # git push --tags origin master configure: configure-stamp -- cgit v1.2.3 From c3314dae2d3df82e188daf6ba8520cce833592c6 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 25 Aug 2011 03:36:25 -0600 Subject: use multimaint-merge to make Debian changelogs less ugly --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 028b548f..9f24321b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; f # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: echo $(DEB_VERSION) - git-dch --release --new-version=$(DEB_VERSION) + git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge git log > ChangeLog git commit -n ChangeLog debian/changelog \ -m "update changelogs for Debian build" -- cgit v1.2.3 From 01eb36408d7e0e826b431fcc1d3b2deb23607e0b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 11 Sep 2012 22:23:24 -0600 Subject: use non-native versioning, don't run prebuild target on this branch, update changelog --- debian/changelog | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++-- debian/rules | 9 +----- debian/source/format | 2 +- 3 files changed, 80 insertions(+), 12 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index b9e78c8b..2aeaaa3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,84 @@ -altos (1.0.1+3+g93b8f40) unstable; urgency=low +altos (1.1-1) unstable; urgency=low + + * new upstream minor release, which provides a few new features in AltosUI + and the AltOS firmware, and fixes bugs + - Add apogee-lockout value. Overrides the apogee detection logic to + prevent incorrect apogee charge firing. A configuration menu + provides a list of reasonable values, or the value can be set by hand. + - Fix a bug where the data reported in telemetry packets was from + 320ms ago. + - Force the radio frequency to 434.550MHz when the debug clock + pin is connected to ground at boot time. This provides a way + to talk to a TeleMini which is configured to some unknown frequency. + - Provide RSSI values for Monitor Idle mode. This makes it easy to check + radio range without needing to go to flight mode. + - Fix a bug which caused the old received telemetry packets to + be retransmitted over the USB link when the radio was turned + off and back on. + - Fix a bug that caused GPS ready to happen too quickly. The + software was using every telemetry packet to signal new GPS + data, which caused GPS ready to be signalled after 10 packets + instead of 10 GPS updates. + - Fix Google Earth data export to work with recent versions. The + google earth file loading code got a lot pickier, requiring + some minor white space changes in the export code. + - Make the look-n-feel configurable, providing a choice from + the available options. + - Add an 'Age' element to mark how long since a telemetry packet + has been received. Useful to quickly gauge whether + communications with the rocket are still active. + - Add 'Configure Ground Station' dialog to set the radio + frequency used by a particular TeleDongle without having to go + through the flight monitor UI. + - Re-compute time spent in each state for the flight graph; this + figures out the actual boost and landing times instead of + using the conservative values provide by the flight + electronics. This improves the accuracy of the boost + acceleration and main descent rate computations. + - Make AltosUI run on Mac OS Lion. The default Java heap space + was dramatically reduced for this release causing much of the + UI to fail randomly. This most often affected the satellite + mapping download and displays. + - Change how data are displayed in the 'table' tab of the flight + monitoring window. This eliminates entries duplicated from the + header and adds both current altitude and pad altitude, which + are useful in 'Monitor Idle' mode. + - Add Imperial units mode to present data in feet instead of + * update build-deps to use cc1111 intead of sdcc, closes: #676739 + + -- Bdale Garbee Tue, 11 Sep 2012 18:20:32 -0600 + +altos (1.0.3) unstable; urgency=low + [ Bdale Garbee ] + * lose the bluetooth lib dependency until it's relevant + * don't try to include bluetooth headers + * don't try to link bluetooth lib + * mention release notes in Releasing file prep stage + * more notes on release notes in Releasing + * releasing 1.0.3 + + [ Keith Packard ] + * altos: Create TeleMetrum v1.2 directory + * Add 1.0.3 release notes. + + -- Bdale Garbee Sun, 25 Dec 2011 19:08:56 -0700 + +altos (1.0.2) unstable; urgency=low + + [ Bdale Garbee ] * update release process docs - * more release process doc updates + * update changelogs for Debian build + * include 1.0.1 release notes in docs, closes: #642705 + * add run-time dependency on libjfreechart-java + + [ Keith Packard ] + * altos: Delay reboot by a second to avoid re-entering idle mode + * Bump to version 1.0.2 + * altos: TM: Don't turn on packet slave mode until idle/invalid state + * doc: Add 1.0.2 release notes - -- Bdale Garbee Sun, 28 Aug 2011 13:39:31 -0600 + -- Bdale Garbee Wed, 28 Sep 2011 01:58:27 -0600 altos (1.0.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 9f24321b..a4cbe2c1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,17 +3,10 @@ export DH_VERBOSE=1 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p') -DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +) # this target invoked by git-buildpackage using a clean hook, see .gbp.conf prebuild: - echo $(DEB_VERSION) - git-dch --release --new-version=$(DEB_VERSION) --multimaint-merge - git log > ChangeLog - git commit -n ChangeLog debian/changelog \ - -m "update changelogs for Debian build" -# git tag debian/$(DEB_VERSION) -# git push --tags origin master + echo "not frobbing changelog for official builds" configure: configure-stamp configure-stamp: diff --git a/debian/source/format b/debian/source/format index 89ae9db8..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) -- cgit v1.2.3