Merge branch 'master' into telegps-v0.3

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index 40604ce3574060a3a20d09f62244ac6a32f6d3c0..a73e3fd8ee2837e67df4e23e02ba86543afb6386 100644 (file)
--- 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 dfd72ab46f99f8fd425ece356f0fe149b01771b5..98a98c19aed94ddc44a2a0ffb8bf82f20d82abbc 100644 (file)
--- 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 3c9ac9c6f1156ca9a2a75d6403602405ea5db3de..75b1f8485684dbf4f2409ea582479094f510f0aa 100644 (file)
--- 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