diff options
| -rwxr-xr-x | ao-bringup/turnon_telebt | 73 | ||||
| -rwxr-xr-x | ao-bringup/turnon_telebt_v1 | 62 | ||||
| -rwxr-xr-x | ao-bringup/turnon_teledongle | 2 | ||||
| -rw-r--r-- | debian/altos.install | 6 | ||||
| -rw-r--r-- | debian/control | 38 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/docs | 10 | ||||
| -rw-r--r-- | doc/altusmetrum.xsl | 12 |
8 files changed, 156 insertions, 49 deletions
diff --git a/ao-bringup/turnon_telebt b/ao-bringup/turnon_telebt index f4100ae2..7c036bc2 100755 --- a/ao-bringup/turnon_telebt +++ b/ao-bringup/turnon_telebt @@ -1,62 +1,61 @@ #!/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 +if [ -x /usr/bin/ao-flash-stm ]; then + FLASH_STM=/usr/bin/ao-flash-stm else - echo "Can't find ao-load! Aborting." + echo "Can't find ao-flash-stm! 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 +if [ -x /usr/bin/ao-usbload ]; then + USBLOAD=/usr/bin/ao-usbload else - echo "Can't find ao-rawload! Aborting." + echo "Can't find ao-usbload! Aborting." exit 1 fi -echo "TeleBT v1.1 Turn-On and Calibration Program" -echo "Copyright 2013 by Bdale Garbee. Released under GPL v2" +VERSION=3.0 +REPO=~/altusmetrumllc/Binaries + +echo "TeleBT v$VERSION Turn-On and Calibration Program" +echo "Copyright 2015 by Bdale Garbee. Released under GPL v2" echo echo "Expectations:" -echo "\tTeleBT v1.1 powered from USB" -echo "\t\twith TeleDonlge (on /dev/ttyACM0) cabled to debug header" -echo "\t\twith coax from SMA to frequency counter" +echo "\tTeleBT v$VERSION powered from USB" +echo "\t\twith ST-Link-V2 cabled to debug header" +echo "\t\twith coax from UHF to frequency counter" echo -echo -n "TeleBT serial number: " +echo -n "TeleBT-$VERSION serial number: " read SERIAL -echo $RAWLOAD +echo $FLASH_STM -case $USER in - bdale) - DONGLE=100 - ;; - keithp) - DONGLE=186 +$FLASH_STM $REPO/loaders/telebt-v$VERSION*.elf || exit 1 + +sleep 5 + +$USBLOAD --serial=$SERIAL $REPO/telebt-v$VERSION*.elf || exit 1 + +sleep 5 + +dev=`ao-list | awk '/TeleBT-v'"$VERSION"'/ { print $3; exit(0); }'` + +case "$dev" in +/dev/tty*) + echo "TeleBT found on $dev" ;; - *) - echo "Unknow user" +*) + echo 'No TeleBT-v'"$VERSION"' found' exit 1 ;; esac -$RAWLOAD -D $DONGLE -r ao_led_blink.ihx -echo "LEDs should be blinking" -sleep 5 +echo 'E 0' > $dev -$RAWLOAD -D $DONGLE -r ao_radio_xmit.ihx -echo -n "Generating RF carrier. Please enter measured frequency: " -read FREQ +SERIAL=$SERIAL ./cal-freq $dev -CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"` +echo 'E 1' > $dev -echo "Programming flash with cal value " $CAL_VALUE -$AOLOAD -D $DONGLE --cal $CAL_VALUE ~/altusmetrumllc/Binaries/telebt-v1.0*.ihx $SERIAL +echo "TeleBT-v$VERSION $SERIAL is ready to ship" -echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE -echo $SERIAL","$CAL_VALUE >> cal_values -echo "Unplug debug cable, power cycle, cu to the board, confirm freq and record power" +exit $? diff --git a/ao-bringup/turnon_telebt_v1 b/ao-bringup/turnon_telebt_v1 new file mode 100755 index 00000000..f4100ae2 --- /dev/null +++ b/ao-bringup/turnon_telebt_v1 @@ -0,0 +1,62 @@ +#!/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 "TeleBT v1.1 Turn-On and Calibration Program" +echo "Copyright 2013 by Bdale Garbee. Released under GPL v2" +echo +echo "Expectations:" +echo "\tTeleBT v1.1 powered from USB" +echo "\t\twith TeleDonlge (on /dev/ttyACM0) cabled to debug header" +echo "\t\twith coax from SMA to frequency counter" +echo +echo -n "TeleBT serial number: " +read SERIAL + +echo $RAWLOAD + +case $USER in + bdale) + DONGLE=100 + ;; + keithp) + DONGLE=186 + ;; + *) + echo "Unknow user" + exit 1 + ;; +esac + +$RAWLOAD -D $DONGLE -r ao_led_blink.ihx +echo "LEDs should be blinking" +sleep 5 + +$RAWLOAD -D $DONGLE -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 +$AOLOAD -D $DONGLE --cal $CAL_VALUE ~/altusmetrumllc/Binaries/telebt-v1.0*.ihx $SERIAL + +echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE +echo $SERIAL","$CAL_VALUE >> cal_values +echo "Unplug debug cable, power cycle, cu to the board, confirm freq and record power" diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle index e6750c45..d17e2b96 100755 --- a/ao-bringup/turnon_teledongle +++ b/ao-bringup/turnon_teledongle @@ -58,7 +58,7 @@ esac echo 'E 0' > $dev -./cal-freq-file $dev $SERIAL +SERIAL=$SERIAL ./cal-freq $dev case $? in 0) diff --git a/debian/altos.install b/debian/altos.install index 50f21eb1..626e21e0 100644 --- a/debian/altos.install +++ b/debian/altos.install @@ -2,8 +2,8 @@ debian/altusmetrum.xpm usr/share/pixmaps src/*/*.ihx usr/share/altos src/*/*.map usr/share/altos 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/gdm/altusmetrum.xml /usr/share/gdm/themes/altusmetrum themes/gdm/GdmGreeterTheme.desktop /usr/share/gdm/themes/altusmetrum +themes/gdm/altusmetrum.xml /usr/share/gdm/themes/altusmetrum themes/gdm/screenshot.png /usr/share/gdm/themes/altusmetrum +themes/slim/panel.png usr/share/slim/themes/altusmetrum +themes/slim/slim.theme usr/share/slim/themes/altusmetrum diff --git a/debian/control b/debian/control index c9b0fa83..7fa2029d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,36 @@ Section: electronics Priority: optional Maintainer: Bdale Garbee <bdale@gag.com> Uploaders: Keith Packard <keithp@keithp.com> -Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info, libgtk-3-bin +Build-Depends: autoconf, + automake, + cc1111, + debhelper (>= 7), + default-jdk, + docbook-xml, + docbook-xsl, + fop, + freetts, + gawk, + gcc-arm-none-eabi, + graphicsmagick | imagemagick, + icnsutils, + icoutils, + libbluetooth-dev, + libelf-dev, + libgtk-3-bin, + libjfreechart-java, + libreadline-dev, + librsvg2-bin, + libssl-dev, + libtool, + libusb-1.0-0-dev, + netpbm, + nickle, + pkg-config, + shared-mime-info, + swig, + xmlto, + xsltproc Standards-Version: 3.9.5 Homepage: http://altusmetrum.org/AltOS Vcs-Git: git://git.gag.com/fw/altos -b debian @@ -11,7 +40,12 @@ Vcs-Browser: http://git.gag.com/?p=fw/altos Package: altos Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle, libjfreechart-java +Depends: default-jre | java2-runtime, + freetts, + libjfreechart-java, + nickle, + ${misc:Depends}, + ${shlibs:Depends} Suggests: slim | gdm Replaces: altusmetrum-themes, slim-altusmetrum Conflicts: altusmetrum-themes, slim-altusmetrum diff --git a/debian/copyright b/debian/copyright index 55841bca..f227602e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,7 +26,7 @@ Copyright: Copyright © 1996-2000 Grace Development Team Copyright © 1984, 1987, 1989, 1995 Stephen L. Moshier Copyright © 2003 Maarten Brock, sourceforge.brock@dse.nl - + License: This program is free software; you can redistribute it and/or modify diff --git a/debian/docs b/debian/docs index 4a7eba68..c0a63faf 100644 --- a/debian/docs +++ b/debian/docs @@ -1,12 +1,12 @@ NEWS README +doc/altos.html +doc/altos.pdf doc/altusmetrum.html doc/altusmetrum.pdf +doc/easymini-outline.pdf +doc/telemega-outline.pdf +doc/telemetrum-outline.pdf doc/telemetry.html doc/telemetry.pdf -doc/altos.html -doc/altos.pdf -doc/telemetrum-outline.pdf -doc/telemega-outline.pdf -doc/easymini-outline.pdf doc/telemini.pdf diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index a40481f1..d1328abf 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -3990,6 +3990,18 @@ NAR #88757, TRA #12200 </para> </section> <section> + <title>Charging TeleBT Battery</title> + <para> + Before using TeleBT with AltosDroid, make sure the internal + TeleBT battery is charged. To do this, attach a micro USB + cable from a computer or other USB power source to TeleBT. + A dual LED on the circuit board should illuminate, showing + red while the battery is charging, green when charging is + completed, and both red and green on at the same time if + there is a battery fault. + </para> + </section> + <section> <title>Connecting to TeleBT over Bluetooth™</title> <para> Press the Android 'Menu' button or soft-key to see the |