altos: Make TeleMini v2.0 fit

Mash lots of storage locations and code around to shrink stuff down to size

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 106 insertions, 1 deletions

diff --git a/src/test/Makefile b/src/test/Makefile
index 9c304318..5eee6bbb 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -2,7 +2,8 @@ vpath % ..:../core:../drivers:../util:../micropeak:../aes
 
 PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_flight_test_mm \
 	ao_gps_test ao_gps_test_skytraq ao_gps_test_ublox ao_convert_test ao_convert_pa_test ao_fec_test \
-	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test
+	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test \
+	ao_ms5607_convert_test
 
 INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h
 
@@ -76,3 +77,6 @@ ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c
 
 ao_int64_test: ao_int64_test.c ao_int64.c ao_int64.h
 	cc $(CFLAGS) -o $@ ao_int64_test.c
+
+ao_ms5607_convert_test: ao_ms5607_convert_test.c ao_ms5607_convert_8051.c ao_int64.c ao_int64.h
+	cc $(CFLAGS) -o $@ ao_ms5607_convert_test.c
diff --git a/src/test/ao_int64_test.c b/src/test/ao_int64_test.c
index c26a63b0..8557a1c7 100644
--- a/src/test/ao_int64_test.c
+++ b/src/test/ao_int64_test.c
@@ -15,6 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#define __data
+#define __pdata
+#define __xdata
+#define __reentrant
+
 #include <ao_int64.h>
 #include <ao_int64.c>
 #include <stdio.h>
diff --git a/src/test/ao_ms5607_convert_test.c b/src/test/ao_ms5607_convert_test.c
new file mode 100644
index 00000000..ad593204
--- /dev/null
+++ b/src/test/ao_ms5607_convert_test.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#define __xdata
+#define __data
+#define __pdata
+#define __reentrant
+
+#include <stdint.h>
+#include <ao_ms5607.h>
+
+struct ao_ms5607_prom ms5607_prom = {
+	0x002c,
+	0xa6e0,
+	0x988e,
+	0x6814,
+	0x5eff,
+	0x8468,
+	0x6c86,
+	0xa271,
+};
+
+int32_t D1_mm = 6179630;
+int32_t D2_mm = 8933155;
+
+#include <ao_ms5607_convert.c>
+#define ao_ms5607_convert ao_ms5607_convert_8051
+#include <ao_ms5607_convert_8051.c>
+#include <ao_int64.c>
+#include <stdio.h>
+#include <stdlib.h>
+
+struct ao_ms5607_sample ao_sample = {
+	6179630,
+	8933155
+};
+
+int errors;
+
+void test(int trial, struct ao_ms5607_sample *sample)
+{
+	struct ao_ms5607_value	value, value_8051;
+
+	ao_ms5607_convert(sample, &value);
+	ao_ms5607_convert_8051(sample, &value_8051);
+	if (value.temp != value_8051.temp || value.pres != value_8051.pres) {
+		++errors;
+		printf ("trial %d: %d, %d -> %d, %d (should be %d, %d)\n",
+			trial,
+			sample->pres, sample->temp,
+			value_8051.pres, value_8051.temp,
+			value.pres, value.temp);
+	}
+}
+
+#define TESTS	10000000
+
+#include <stdlib.h>
+
+static int32_t rand24(void) { return random() & 0xffffff; }
+
+int
+main(int argc, char **argv)
+{
+	struct ao_ms5607_sample sample;
+	int	i, start;
+
+	if (argv[1])
+		start = atoi(argv[1]);
+	else
+		start = 0;
+
+	srandom(10000);
+	test(-1, &ao_sample);
+	for (i = 0; i < TESTS; i++) {
+		sample.pres = rand24();
+		sample.temp = rand24();
+		if (i >= start)
+			test(i, &sample);
+	}
+	return errors;
+}