From: Keith Packard <keithp@keithp.com>
Date: Fri, 12 Mar 2010 18:38:26 +0000 (-0800)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: debian/0.6+117+gb41e617~1^2
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=df7bda1f32b0049c3878c325ea0b55999f3980e3;hp=a7042fe7d065d1da1252be5ad43e3c9856214dc8;p=fw%2Faltos

Merge remote branch 'origin/master'
---

diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 1786f251..97c1e419 100755
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -19,7 +19,7 @@ sleep 5
 echo -n "Generating RF carrier.  Please enter measured frequency: "
 read FREQ
 
-CAL_VALUE=`nickle -e "ceil(434.55 / $FREQ * 1186611)"`
+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
diff --git a/ao-tools/ao-dumplog/ao-dumplog.1 b/ao-tools/ao-dumplog/ao-dumplog.1
index 8c2df7c6..d381e335 100644
--- a/ao-tools/ao-dumplog/ao-dumplog.1
+++ b/ao-tools/ao-dumplog/ao-dumplog.1
@@ -25,6 +25,8 @@ ao-dumplog \- Store flight log from TeleMetrum device
 [\--tty \fItty-device\fP]
 [\-D \fIaltos-device\fP]
 [\--device \fIaltos-device\fP]
+[\--R\fP]
+[\--remote\fP]
 .SH OPTIONS
 .TP
 \-T tty-device | --tty tty-device
@@ -44,6 +46,10 @@ TeleMetrum
 Leaving out the product name will cause the tool to select a suitable
 product, leaving out the serial number will cause the tool to match
 one of the available devices.
+.TP
+\-R | --remote
+This uses the command radio link to download the log from TeleMetrum
+through a TeleDongle.
 .SH DESCRIPTION
 .I ao-dumplog
 downloads the flight log from a connected TeleMetrum device and stores