diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-17 17:33:31 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-17 17:33:31 +0200 |
| commit | f0e126251360f050b7121f167771c057bda8747e (patch) | |
| tree | 3cea2dff8c386397edce6a0d11fb5dcfa7a35e35 | |
| parent | d95a2c5d1ddce913dcb1d1ab5dc59f6a588ab599 (diff) | |
| parent | 4fe47adc7aca54951a50b1c1ae95cb02e46f8d3d (diff) | |
Merge branch 'master' into telegps-v0.3
| -rw-r--r-- | altosui/AltosGraph.java | 19 | ||||
| -rw-r--r-- | doc/altusmetrum.xsl | 7 | ||||
| -rw-r--r-- | src/test/Makefile | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java index 40604ce3..a73e3fd8 100644 --- a/altosui/AltosGraph.java +++ b/altosui/AltosGraph.java @@ -92,6 +92,25 @@ class AltosPressure extends AltosUnits { } } +class AltosDbm extends AltosUnits { + + public double value(double d) { + return d; + } + + public String show_units() { + return "dBm"; + } + + public String say_units() { + return "D B M"; + } + + public int show_fraction(int width) { + return 0; + } +} + public class AltosGraph extends AltosUIGraph { static final private Color height_color = new Color(194,31,31); diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index dfd72ab4..98a98c19 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -1397,6 +1397,13 @@ NAR #88757, TRA #12200 with the AltosUI operators call sign as needed to comply with your local radio regulations. </para> + <para> + Note that to successfully command a flight computer over the radio + (to configure the altimeter, monitor idle, or fire pyro charges), + the callsign configured here must exactly match the callsign + configured in the flight computer. This matching is case + sensitive. + </para> </section> <section> <title>Imperial Units</title> diff --git a/src/test/Makefile b/src/test/Makefile index 3c9ac9c6..75b1f848 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -69,7 +69,7 @@ ao_micropeak_test: ao_micropeak_test.c ao_microflight.c ao_kalman.h cc $(CFLAGS) -o $@ ao_micropeak_test.c -lm ao_fat_test: ao_fat_test.c ao_fat.c ao_bufio.c - cc $(CFLAGS) -o $@ ao_fat_test.c -lssl + cc $(CFLAGS) -o $@ ao_fat_test.c -lssl -lcrypto ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c cc $(CFLAGS) -o $@ ao_aes_test.c |