X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftest%2Fao_aprs_test.c;h=3852668af9014e133f05ffa1aefa5c69859a10ac;hp=86cf527ae2f4c7219e376135b357aad327a6f14d;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=12c408c5aa1d234fe9c946078d8a343b4fda7ebb

diff --git a/src/test/ao_aprs_test.c b/src/test/ao_aprs_test.c
index 86cf527a..3852668a 100644
--- a/src/test/ao_aprs_test.c
+++ b/src/test/ao_aprs_test.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,6 +22,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 +100,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 */