diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | ao-bringup/turnon_teledongle | 2 | ||||
| -rw-r--r-- | ao-tools/ao-dumplog/ao-dumplog.1 | 6 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,4 @@ +<<<<<<< HEAD commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8 Author: Bdale Garbee <bdale@gag.com> Date: Tue Mar 30 23:11:40 2010 -0600 @@ -10,6 +11,8 @@ 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 diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle index ea7a7b2a..7dbb82b5 100755 --- a/ao-bringup/turnon_teledongle +++ b/ao-bringup/turnon_teledongle @@ -39,7 +39,7 @@ $RAWLOAD -r ao_radio_xmit.ihx 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 $AOLOAD --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 |