Merge branch 'branch-1.5' into debian

Conflicts:
	ChangeLog
	Releasing
	altosui/Instdrv/NSIS/Includes/java.nsh
	altosui/altos-windows.nsi.in
	configure.ac
	doc/Makefile
	doc/altusmetrum.xsl
	micropeak/micropeak-windows.nsi.in
	telegps/telegps-windows.nsi.in

1 files changed, 3 insertions, 28 deletions

diff --git a/src/test/ao_aprs_test.c b/src/test/ao_aprs_test.c
index 86cf527a..ae505dea 100644
--- a/src/test/ao_aprs_test.c
+++ b/src/test/ao_aprs_test.c
@@ -21,6 +21,8 @@
 #include <stdint.h>
 #include <stdarg.h>
 
+#define HAS_GPS	1
+
 #include <ao_telemetry.h>
 
 #define AO_GPS_NUM_SAT_MASK	(0xf << 0)
@@ -97,41 +99,14 @@ audio_gap(int secs)
 #endif
 }
 
-#include <math.h>
-
-int
-ao_aprs_encode_altitude_expensive(int meters)
-{
-	double	feet = meters / 0.3048;
-
-	double	encode = log(feet) / log(1.002);
-	return floor(encode + 0.5);
-}
-
 // This is where we go after reset.
 int main(int argc, char **argv)
 {
-	int	e, x;
-	int	a;
-
-	for (a = 1; a < 100000; a++) {
-		e = ao_aprs_encode_altitude(a);
-		x = ao_aprs_encode_altitude_expensive(a);
-
-		if (e != x) {
-			double	back_feet, back_meters;
-			back_feet = pow(1.002, e);
-			back_meters = back_feet * 0.3048;
-			fprintf (stderr, "APRS altitude encoding failure: altitude %d actual %d expected %d actual meters %f\n",
-				 a, e, x, back_meters);
-		}
-	}
-
     audio_gap(1);
 
     ao_gps_data.latitude = (45.0 + 28.25 / 60.0) * 10000000;
     ao_gps_data.longitude = (-(122 + 44.2649 / 60.0)) * 10000000;
-    ao_gps_data.altitude = 84;
+    AO_TELEMETRY_LOCATION_SET_ALTITUDE(&ao_gps_data, 84);
     ao_gps_data.flags = (AO_GPS_VALID|AO_GPS_RUNNING);
 
     /* Transmit one packet */