From 5e9193f6375be27e5f7a0321fd34b6acfe81247f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 14 May 2013 09:12:29 -0700
Subject: altos: Add 'g' command to ublox GPS code.

Take the gps_dump function from ao_gps_skytraq.c and move it to a new
file so it can be shared with the u-blox driver. That affects every
skytraq and u-blox user as they need to include the new file.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/test/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/test/Makefile')

diff --git a/src/test/Makefile b/src/test/Makefile
index 169c1dc6..8032a163 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -35,10 +35,10 @@ ao_flight_test_mm: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.
 ao_gps_test: ao_gps_test.c ao_gps_sirf.c ao_gps_print.c ao_host.h
 	cc $(CFLAGS) -o $@ $<
 
-ao_gps_test_skytraq: ao_gps_test_skytraq.c ao_gps_skytraq.c ao_gps_print.c ao_host.h
+ao_gps_test_skytraq: ao_gps_test_skytraq.c ao_gps_skytraq.c ao_gps_print.c ao_gps_show.c ao_host.h
 	cc $(CFLAGS) -o $@ $<
 
-ao_gps_test_ublox: ao_gps_test_ublox.c ao_gps_ublox.c ao_gps_print.c ao_host.h ao_gps_ublox.h
+ao_gps_test_ublox: ao_gps_test_ublox.c ao_gps_ublox.c ao_gps_print.c ao_gps_show.c ao_host.h ao_gps_ublox.h
 	cc $(CFLAGS) -o $@ $<
 
 ao_convert_test: ao_convert_test.c ao_convert.c altitude.h
-- 
cgit v1.2.3


From 277577fecc71e3c52b823938f396cf42be403ebe Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 26 May 2013 19:01:58 -0600
Subject: altos: Add pyro code testing to ao_flight_test for TeleMega

This parses the pyro settings and signals when the pyro channels are
fired in the output.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/core/ao_pyro.c        | 120 +++++++++++++++++++++++++++-------------------
 src/test/Makefile         |   2 +-
 src/test/ao_flight_test.c |  57 ++++++++++++++++++++++
 3 files changed, 130 insertions(+), 49 deletions(-)

(limited to 'src/test/Makefile')

diff --git a/src/core/ao_pyro.c b/src/core/ao_pyro.c
index aac8fda5..b655eaca 100644
--- a/src/core/ao_pyro.c
+++ b/src/core/ao_pyro.c
@@ -15,10 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#ifndef AO_FLIGHT_TEST
 #include <ao.h>
-#include <ao_pyro.h>
 #include <ao_sample.h>
 #include <ao_flight.h>
+#endif
+#include <ao_pyro.h>
 
 #if IS_COMPANION
 #include <ao_companion.h>
@@ -130,12 +132,13 @@ ao_pyro_ready(struct ao_pyro *pyro)
 	return TRUE;
 }
 
+#ifndef AO_FLIGHT_TEST
 #define ao_pyro_fire_port(port, bit, pin) do {	\
 		ao_gpio_set(port, bit, pin, 1);	\
 		ao_delay(AO_MS_TO_TICKS(50));	\
 		ao_gpio_set(port, bit, pin, 0);	\
 	} while (0)
-
+#endif
 
 static void
 ao_pyro_fire(uint8_t p)
@@ -172,66 +175,58 @@ ao_pyro_fire(uint8_t p)
 
 uint8_t	ao_pyro_wakeup;
 
-static void
-ao_pyro(void)
+static uint8_t
+ao_pyro_check(void)
 {
-	uint8_t		p, any_waiting;
 	struct ao_pyro	*pyro;
+	uint8_t		p, any_waiting;
+	
+	any_waiting = 0;
+	for (p = 0; p < AO_PYRO_NUM; p++) {
+		pyro = &ao_config.pyro[p];
 
-	ao_config_get();
-	while (ao_flight_state < ao_flight_boost)
-		ao_sleep(&ao_flight_state);
-
-	for (;;) {
-		ao_alarm(AO_MS_TO_TICKS(100));
-		ao_sleep(&ao_pyro_wakeup);
-		ao_clear_alarm();
-		any_waiting = 0;
-		for (p = 0; p < AO_PYRO_NUM; p++) {
-			pyro = &ao_config.pyro[p];
+		/* Ignore igniters which have already fired
+		 */
+		if (pyro->fired)
+			continue;
 
-			/* Ignore igniters which have already fired
-			 */
-			if (pyro->fired)
-				continue;
+		/* Ignore disabled igniters
+		 */
+		if (!pyro->flags)
+			continue;
 
-			/* Ignore disabled igniters
-			 */
-			if (!pyro->flags)
+		any_waiting = 1;
+		/* Check pyro state to see if it should fire
+		 */
+		if (!pyro->delay_done) {
+			if (!ao_pyro_ready(pyro))
 				continue;
 
-			any_waiting = 1;
-			/* Check pyro state to see if it shoule fire
+			/* If there's a delay set, then remember when
+			 * it expires
 			 */
-			if (!pyro->delay_done) {
-				if (!ao_pyro_ready(pyro))
-					continue;
-
-				/* If there's a delay set, then remember when
-				 * it expires
-				 */
-				if (pyro->flags & ao_pyro_delay)
-					pyro->delay_done = ao_time() + pyro->delay;
-			}
-
-			/* Check to see if we're just waiting for
-			 * the delay to expire
-			 */
-			if (pyro->delay_done) {
-				if ((int16_t) (ao_time() - pyro->delay_done) < 0)
-					continue;
+			if (pyro->flags & ao_pyro_delay) {
+				pyro->delay_done = ao_time() + pyro->delay;
+				if (!pyro->delay_done)
+					pyro->delay_done = 1;
 			}
+		}
 
-			ao_pyro_fire(p);
+		/* Check to see if we're just waiting for
+		 * the delay to expire
+		 */
+		if (pyro->delay_done) {
+			if ((int16_t) (ao_time() - pyro->delay_done) < 0)
+				continue;
 		}
-		if (!any_waiting)
-			break;
+
+		ao_pyro_fire(p);
+		pyro->fired = 1;
+		ao_pyro_fired |= (1 << p);
 	}
-	ao_exit();
+	return any_waiting;
 }
 
-__xdata struct ao_task ao_pyro_task;
-
 #define NO_VALUE	0xff
 
 #define AO_PYRO_NAME_LEN	3
@@ -283,6 +278,34 @@ const struct {
 	{ "", ao_pyro_none,		NO_VALUE, HELP(NULL) },
 };
 
+#define NUM_PYRO_VALUES (sizeof ao_pyro_values / sizeof ao_pyro_values[0])
+
+#ifndef AO_FLIGHT_TEST
+static void
+ao_pyro(void)
+{
+	uint8_t		any_waiting;
+
+	ao_config_get();
+	while (ao_flight_state < ao_flight_boost)
+		ao_sleep(&ao_flight_state);
+
+	for (;;) {
+		ao_alarm(AO_MS_TO_TICKS(100));
+		ao_sleep(&ao_pyro_wakeup);
+		ao_clear_alarm();
+		if (ao_flight_state >= ao_flight_landed)
+			break;
+		any_waiting = ao_pyro_check();
+		if (!any_waiting)
+			break;
+	}
+	ao_exit();
+}
+
+__xdata struct ao_task ao_pyro_task;
+
+
 static void
 ao_pyro_print_name(uint8_t v)
 {
@@ -449,3 +472,4 @@ ao_pyro_init(void)
 	ao_cmd_register(&ao_pyro_cmds[0]);
 	ao_add_task(&ao_pyro_task, ao_pyro, "pyro");
 }
+#endif
diff --git a/src/test/Makefile b/src/test/Makefile
index 8032a163..3c9ac9c6 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -29,7 +29,7 @@ ao_flight_test_baro: ao_flight_test.c ao_host.h ao_flight.c  ao_sample.c ao_kalm
 ao_flight_test_accel: ao_flight_test.c ao_host.h ao_flight.c  ao_sample.c ao_kalman.c $(INCS)
 	cc $(CFLAGS) -o $@ -DFORCE_ACCEL=1 ao_flight_test.c
 
-ao_flight_test_mm: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c $(INCS)
+ao_flight_test_mm: ao_flight_test.c ao_host.h ao_flight.c ao_sample.c ao_kalman.c ao_pyro.c ao_pyro.h $(INCS)
 	cc -DTELEMEGA=1 $(CFLAGS) -o $@ $< -lm
 
 ao_gps_test: ao_gps_test.c ao_gps_sirf.c ao_gps_print.c ao_host.h
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 99bed7ee..6e53d8e1 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <getopt.h>
 #include <math.h>
@@ -137,6 +138,18 @@ int	tick_offset;
 
 static int32_t	ao_k_height;
 
+int16_t
+ao_time(void)
+{
+	return ao_data_static.tick;
+}
+
+void
+ao_delay(int16_t interval)
+{
+	return;
+}
+
 void
 ao_ignite(enum ao_igniter igniter)
 {
@@ -200,6 +213,8 @@ struct ao_cmds {
 #include <ao_ms5607.h>
 struct ao_ms5607_prom	ms5607_prom;
 #include "ao_ms5607_convert.c"
+#define AO_PYRO_NUM	4
+#include <ao_pyro.h>
 #else
 #include "ao_convert.c"
 #endif
@@ -210,6 +225,9 @@ struct ao_config {
 	int16_t		accel_minus_g;
 	uint8_t		pad_orientation;
 	uint16_t	apogee_lockout;
+#if TELEMEGA
+	struct ao_pyro	pyro[AO_PYRO_NUM];	/* minor version 12 */
+#endif
 };
 
 #define AO_PAD_ORIENTATION_ANTENNA_UP	0
@@ -246,6 +264,24 @@ uint16_t	prev_tick;
 #include "ao_sqrt.c"
 #include "ao_sample.c"
 #include "ao_flight.c"
+#if TELEMEGA
+#define AO_PYRO_NUM	4
+
+#define AO_PYRO_0	0
+#define AO_PYRO_1	1
+#define AO_PYRO_2	2
+#define AO_PYRO_3	3
+
+static void
+ao_pyro_tell(int pin)
+{
+	printf ("fire pyro %d\n", pin);
+}
+
+#define ao_pyro_fire_port(port,bit,pin) ao_pyro_tell(pin)
+
+#include "ao_pyro.c"
+#endif
 
 #define to_double(f)	((f) / 65536.0)
 
@@ -771,6 +807,10 @@ ao_sleep(void *wchan)
 		char		*words[64];
 		int		nword;
 
+#if TELEMEGA
+		if (ao_flight_state >= ao_flight_boost && ao_flight_state < ao_flight_landed)
+			ao_pyro_check();
+#endif
 		for (;;) {
 			if (ao_records_read > 2 && ao_flight_state == ao_flight_startup)
 			{
@@ -883,6 +923,23 @@ ao_sleep(void *wchan)
 				else if (strcmp(words[1], "crc:") == 0)
 					ms5607_prom.crc = strtoul(words[2], NULL, 10);
 				continue;
+			} else if (nword >= 3 && strcmp(words[0], "Pyro") == 0) {
+				int	p = strtoul(words[1], NULL, 10);
+				int	i, j;
+				struct ao_pyro	*pyro = &ao_config.pyro[p];
+
+				for (i = 2; i < nword; i++) {
+					for (j = 0; j < NUM_PYRO_VALUES; j++)
+						if (!strcmp (words[2], ao_pyro_values[j].name))
+							break;
+					if (j == NUM_PYRO_VALUES)
+						continue;
+					pyro->flags |= ao_pyro_values[j].flag;
+					if (ao_pyro_values[j].offset != NO_VALUE && i + 1 < nword) {
+						int16_t	val = strtoul(words[++i], NULL, 10);
+						*((int16_t *) ((char *) pyro + ao_pyro_values[j].offset)) = val;
+					}
+				}
 			}
 #else
 			if (nword == 4 && log_format != AO_LOG_FORMAT_TELEMEGA) {
-- 
cgit v1.2.3


From fa0859a51576efe231effcb5995f325f9e7e0fcb Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 17 Aug 2013 16:01:44 +0200
Subject: altos: Make FAT test program link explicitly against libcrypto

For some reason, the MD5_Final symbol isn't resolved when linking only
against libssl.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test/Makefile')

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
-- 
cgit v1.2.3


From d0b4e926ecececa7499a301b6135189be119512e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 22 May 2013 13:03:06 -0700
Subject: Initial TeleMini bits

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c                  |   5 ++
 src/cc1111/ao_usb.c                  |   5 ++
 src/core/ao_data.c                   |   2 +
 src/core/ao_data.h                   |   2 +-
 src/core/ao_log_mini.c               |   1 -
 src/core/ao_telemetry.c              |  40 +++++++++-
 src/core/ao_telemetry.h              |  27 +++++++
 src/drivers/ao_ms5607.c              |  40 +++++-----
 src/drivers/ao_ms5607.h              |   2 +-
 src/drivers/ao_ms5607_convert_8051.c |  60 +++++++++++++++
 src/telemini-v2.0/Makefile           | 108 +++++++++++++++++++++++++++
 src/telemini-v2.0/ao_pins.h          | 140 +++++++++++++++++++++++++++++++++++
 src/telemini-v2.0/ao_telemini.c      |  54 ++++++++++++++
 src/test/Makefile                    |   5 +-
 14 files changed, 466 insertions(+), 25 deletions(-)
 create mode 100644 src/drivers/ao_ms5607_convert_8051.c
 create mode 100644 src/telemini-v2.0/Makefile
 create mode 100644 src/telemini-v2.0/ao_pins.h
 create mode 100644 src/telemini-v2.0/ao_telemini.c

(limited to 'src/test/Makefile')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 4a58023d..6cc08399 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -162,6 +162,11 @@ ao_adc_isr(void) __interrupt 1
 #define GOT_ADC
 #endif	
 
+#ifdef FETCH_ADC
+	FETCH_ADC()
+#define GOT_ADC
+#endif
+
 #ifndef GOT_ADC
 #error No known ADC configuration set
 #endif
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index a655d1be..b0ab409d 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -201,6 +201,11 @@ ao_usb_ep0_setup(void)
 				ao_usb_ep0_queue_byte(0);
 				break;
 			case AO_USB_REQ_SET_ADDRESS:
+#if USB_FORCE_FLIGHT_IDLE
+				/* Go to idle mode if USB is connected
+				 */
+				ao_flight_force_idle = 1;
+#endif
 				ao_usb_set_address(ao_usb_setup.value);
 				break;
 			case AO_USB_REQ_GET_DESCRIPTOR:
diff --git a/src/core/ao_data.c b/src/core/ao_data.c
index 38d2f7ff..6a3d02a1 100644
--- a/src/core/ao_data.c
+++ b/src/core/ao_data.c
@@ -22,6 +22,7 @@ volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
 volatile __data uint8_t		ao_data_present;
 
+#ifndef ao_data_count
 void
 ao_data_get(__xdata struct ao_data *packet)
 {
@@ -32,3 +33,4 @@ ao_data_get(__xdata struct ao_data *packet)
 #endif
 	memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
 }
+#endif
diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index b0f086f8..080a534f 100644
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -101,7 +101,7 @@ extern volatile __data uint8_t		ao_data_count;
  * signaled by the timer tick
  */
 #define AO_DATA_WAIT() do {				\
-		ao_sleep((void *) &ao_data_count);	\
+		ao_sleep(DATA_TO_XDATA ((void *) &ao_data_count));	\
 	} while (0)
 
 #endif /* AO_DATA_RING */
diff --git a/src/core/ao_log_mini.c b/src/core/ao_log_mini.c
index 1273b0e3..46b285f3 100644
--- a/src/core/ao_log_mini.c
+++ b/src/core/ao_log_mini.c
@@ -79,7 +79,6 @@ void
 ao_log(void)
 {
 	__pdata uint16_t	next_sensor, next_other;
-	uint8_t			i;
 
 	ao_storage_setup();
 
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 03a8a273..9c673030 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -171,6 +171,36 @@ ao_send_mega_data(void)
 }
 #endif /* AO_SEND_MEGA */
 
+#ifdef AO_SEND_MINI
+
+static void
+ao_send_mini(void)
+{
+	__xdata	struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
+			
+	telemetry.generic.tick = packet->tick;
+	telemetry.generic.type = AO_TELEMETRY_MINI;
+
+	telemetry.mini.state = ao_flight_state;
+
+	telemetry.mini.v_batt = packet->adc.v_batt;
+	telemetry.mini.sense_a = packet->adc.sense_a;
+	telemetry.mini.sense_m = packet->adc.sense_m;
+
+	telemetry.mini.pres = ao_data_pres(packet);
+	telemetry.mini.temp = ao_data_temp(packet);
+
+	telemetry.mini.acceleration = ao_accel;
+	telemetry.mini.speed = ao_speed;
+	telemetry.mini.height = ao_height;
+
+	telemetry.mini.ground_pres = ao_ground_pres;
+
+	ao_radio_send(&telemetry, sizeof (telemetry));
+}
+
+#endif
+
 #ifdef AO_SEND_ALL_BARO
 static uint8_t		ao_baro_sample;
 
@@ -323,12 +353,16 @@ ao_telemetry(void)
 				ao_send_baro();
 #endif
 #if HAS_FLIGHT
-#ifdef AO_SEND_MEGA
+# ifdef AO_SEND_MEGA
 				ao_send_mega_sensor();
 				ao_send_mega_data();
-#else
+# else
+#  ifdef AO_SEND_MINI
+				ao_send_mini();
+#  else
 				ao_send_sensor();
-#endif
+#  endif
+# endif
 #endif
 
 #if HAS_COMPANION
diff --git a/src/core/ao_telemetry.h b/src/core/ao_telemetry.h
index f2d201de..77601529 100644
--- a/src/core/ao_telemetry.h
+++ b/src/core/ao_telemetry.h
@@ -207,6 +207,32 @@ struct ao_telemetry_mega_data {
 };
 
 
+#define AO_TELEMETRY_MINI		0x10
+
+struct ao_telemetry_mini {
+	uint16_t	serial;		/*  0 */
+	uint16_t	tick;		/*  2 */
+	uint8_t		type;		/*  4 */
+
+	uint8_t         state;          /*  5 flight state */
+
+	int16_t		v_batt;		/*  6 battery voltage */
+	int16_t		sense_a;	/*  8 apogee continuity */
+	int16_t		sense_m;	/* 10 main continuity */
+
+	int32_t		pres;		/* 12 Pa * 10 */
+	int16_t		temp;		/* 16 °C * 100 */
+
+	int16_t         acceleration;   /* 18 m/s² * 16 */
+	int16_t         speed;          /* 20 m/s * 16 */
+	int16_t         height;         /* 22 m */
+
+	int32_t		ground_pres;	/* 24 average pres on pad */
+
+	int32_t		pad28;		/* 28 */
+	/* 32 */
+};
+
 /* #define AO_SEND_ALL_BARO */
 
 #define AO_TELEMETRY_BARO		0x80
@@ -240,6 +266,7 @@ union ao_telemetry_all {
 	struct ao_telemetry_companion		companion;
 	struct ao_telemetry_mega_sensor		mega_sensor;
 	struct ao_telemetry_mega_data		mega_data;
+	struct ao_telemetry_mini		mini;
 	struct ao_telemetry_baro		baro;
 };
 
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8f1dcbe1..5259b265 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -21,7 +21,7 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static struct ao_ms5607_prom	ms5607_prom;
+static __xdata struct ao_ms5607_prom	ms5607_prom;
 static uint8_t	  		ms5607_configured;
 
 static void
@@ -40,7 +40,7 @@ ao_ms5607_reset(void) {
 
 	cmd = AO_MS5607_RESET;
 	ao_ms5607_start();
-	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+	ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 	ao_delay(AO_MS_TO_TICKS(10));
 	ao_ms5607_stop();
 }
@@ -69,17 +69,17 @@ ao_ms5607_crc(uint8_t *prom)
 }
 
 static void
-ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
+ao_ms5607_prom_read(__xdata struct ao_ms5607_prom *prom)
 {
-	uint8_t		addr;
-	uint8_t		crc;
-	uint16_t	*r;
+	uint8_t			addr;
+	uint8_t			crc;
+	__xdata uint16_t	*r;
 
-	r = (uint16_t *) prom;
+	r = (__xdata uint16_t *) prom;
 	for (addr = 0; addr < 8; addr++) {
 		uint8_t	cmd = AO_MS5607_PROM_READ(addr);
 		ao_ms5607_start();
-		ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+		ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 		ao_spi_recv(r, 2, AO_MS5607_SPI_INDEX);
 		ao_ms5607_stop();
 		r++;
@@ -114,25 +114,25 @@ ao_ms5607_setup(void)
 	ao_ms5607_prom_read(&ms5607_prom);
 }
 
-static volatile uint8_t	ao_ms5607_done;
+static __xdata volatile uint8_t	ao_ms5607_done;
 
 static void
 ao_ms5607_isr(void)
 {
 	ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 	ao_ms5607_done = 1;
-	ao_wakeup((void *) &ao_ms5607_done);
+	ao_wakeup((__xdata void *) &ao_ms5607_done);
 }
 
 static uint32_t
 ao_ms5607_get_sample(uint8_t cmd) {
-	uint8_t	reply[3];
-	uint8_t read;
+	__xdata uint8_t	reply[3];
+	__xdata uint8_t read;
 
 	ao_ms5607_done = 0;
 
 	ao_ms5607_start();
-	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+	ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 
 	ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 
@@ -179,10 +179,14 @@ ao_ms5607_sample(struct ao_ms5607_sample *sample)
 	sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
 }
 
+#ifdef _CC1111_H_
+#include "ao_ms5607_convert_8051.c"
+#else
 #include "ao_ms5607_convert.c"
+#endif
 
 #if HAS_TASK
-struct ao_ms5607_sample	ao_ms5607_current;
+__xdata struct ao_ms5607_sample	ao_ms5607_current;
 
 static void
 ao_ms5607(void)
@@ -191,10 +195,10 @@ ao_ms5607(void)
 	for (;;)
 	{
 		ao_ms5607_sample(&ao_ms5607_current);
-		ao_arch_critical(
-			AO_DATA_PRESENT(AO_DATA_MS5607);
-			AO_DATA_WAIT();
-			);
+		ao_arch_block_interrupts();
+		AO_DATA_PRESENT(AO_DATA_MS5607);
+		AO_DATA_WAIT();
+		ao_arch_release_interrupts();
 	}
 }
 
diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index b2f98a59..3fd43fd4 100644
--- a/src/drivers/ao_ms5607.h
+++ b/src/drivers/ao_ms5607.h
@@ -56,7 +56,7 @@ struct ao_ms5607_value {
 	int32_t		temp;	/* in °C * 100 */
 };
 
-extern struct ao_ms5607_sample	ao_ms5607_current;
+extern __xdata struct ao_ms5607_sample	ao_ms5607_current;
 
 void
 ao_ms5607_setup(void);
diff --git a/src/drivers/ao_ms5607_convert_8051.c b/src/drivers/ao_ms5607_convert_8051.c
new file mode 100644
index 00000000..f47972c9
--- /dev/null
+++ b/src/drivers/ao_ms5607_convert_8051.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2012 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.
+ */
+
+#include <ao_ms5607.h>
+
+void
+ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value)
+{
+#if 0
+	int32_t	dT;
+	int32_t TEMP;
+	int64_t OFF;
+	int64_t SENS;
+
+	dT = sample->temp - ((int32_t) ms5607_prom.tref << 8);
+	
+	TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23);
+
+#if HAS_MS5611
+	OFF = ((int64_t) ms5607_prom.off << 16) + (((int64_t) ms5607_prom.tco * dT) >> 7);
+	SENS = ((int64_t) ms5607_prom.sens << 15) + (((int64_t) ms5607_prom.tcs * dT) >> 8);
+#else
+	OFF = ((int64_t) ms5607_prom.off << 17) + (((int64_t) ms5607_prom.tco * dT) >> 6);
+	SENS = ((int64_t) ms5607_prom.sens << 16) + (((int64_t) ms5607_prom.tcs * dT) >> 7);
+#endif
+
+	if (TEMP < 2000) {
+		int32_t	T2 = ((int64_t) dT * (int64_t) dT) >> 31;
+		int32_t TEMPM = TEMP - 2000;
+		int64_t OFF2 = (61 * (int64_t) TEMPM * (int64_t) TEMPM) >> 4;
+		int64_t SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM;
+		if (TEMP < 1500) {
+			int32_t TEMPP = TEMP + 1500;
+			int64_t TEMPP2 = TEMPP * TEMPP;
+			OFF2 = OFF2 + 15 * TEMPP2;
+			SENS2 = SENS2 + 8 * TEMPP2;
+		}
+		TEMP -= T2;
+		OFF -= OFF2;
+		SENS -= SENS2;
+	}
+
+	value->pres = ((((int64_t) sample->pres * SENS) >> 21) - OFF) >> 15;
+	value->temp = TEMP;
+#endif
+}
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
new file mode 100644
index 00000000..afd529f0
--- /dev/null
+++ b/src/telemini-v2.0/Makefile
@@ -0,0 +1,108 @@
+#
+# TeleMini build file
+#
+
+TELEMINI_VER=2.0
+TELEMINI_DEF=2_0
+
+vpath %.c ..:../core:../cc1111:../drivers:../product
+vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath ao-make-product.5c ../util
+
+ifndef VERSION
+include ../Version
+endif
+
+INC = \
+	ao.h \
+	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
+	cc1111.h \
+	ao_product.h
+
+CORE_SRC = \
+	ao_cmd.c \
+	ao_config.c \
+	ao_convert.c \
+	ao_flight.c \
+	ao_kalman.c \
+	ao_log.c \
+	ao_log_mini.c \
+	ao_mutex.c \
+	ao_panic.c \
+	ao_report.c \
+	ao_sample.c \
+	ao_stdio.c \
+	ao_storage.c \
+	ao_task.c \
+	ao_telemetry.c \
+	ao_freq.c
+
+CC1111_SRC = \
+	ao_adc.c \
+	ao_dma.c \
+	ao_ignite.c \
+	ao_led.c \
+	ao_packet.c \
+	ao_packet_slave.c \
+	ao_radio.c \
+	ao_romconfig.c \
+	ao_string.c \
+	ao_spi.c \
+	ao_usb.c \
+	ao_convert_pa.c \
+	ao_data.c \
+	ao_beep.c \
+	ao_timer.c \
+	_bp.c
+
+DRIVER_SRC = \
+	ao_ms5607.c \
+	ao_m25.c
+
+PRODUCT_SRC = \
+	ao_telemini.c
+
+SRC = \
+	$(CORE_SRC) \
+	$(CC1111_SRC) \
+	$(DRIVER_SRC) \
+	$(PRODUCT_SRC)
+
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
+PRODUCT=TeleMini-v$(TELEMINI_VER)
+PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
+IDPRODUCT=0x000a
+
+include ../cc1111/Makefile.cc1111
+
+NICKLE=nickle
+CHECK_STACK=sh ../util/check-stack
+
+V=0
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "  $1 $2 $@\n"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+all: ../$(PROG)
+
+../$(PROG): $(REL) Makefile
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
+
+ao_product.h: ao-make-product.5c ../Version
+	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+distclean:	clean
+
+clean: clean-cc1111
+
+install:
+
+uninstall:
+
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
new file mode 100644
index 00000000..386c8dc3
--- /dev/null
+++ b/src/telemini-v2.0/ao_pins.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2010 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.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define HAS_RADIO	1
+
+#define HAS_FLIGHT		1
+#define HAS_USB			1
+#define USB_FORCE_FLIGHT_IDLE	1
+#define HAS_BEEP		1
+#define HAS_GPS			0
+#define HAS_SERIAL_1		0
+#define HAS_EEPROM		1
+#define HAS_LOG			1
+#define USE_INTERNAL_FLASH	0
+#define HAS_DBG			0
+#define PACKET_HAS_SLAVE	1
+#define USE_FAST_ASCENT_LOG	1
+
+#define AO_LED_GREEN		1
+#define AO_LED_RED		2
+#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+#define HAS_EXTERNAL_TEMP	0
+#define HAS_ACCEL		0
+#define HAS_IGNITE		1
+#define HAS_IGNITE_REPORT 1
+#define HAS_MONITOR		0
+
+/*
+ * SPI
+ */
+
+#define SPI_CS_PORT		P1
+#define SPI_CS_SEL		P1SEL
+#define SPI_CS_DIR		P1DIR
+
+/*
+ * Flash
+ */
+#define AO_M25_SPI_CS_PORT	SPI_CS_PORT
+#define AO_M25_SPI_CS_MASK	0x04	/* cs_flash is P1_2 */
+#define M25_MAX_CHIPS		1
+
+/*
+ * MS5607
+ */
+
+#define HAS_MS5607		1
+#define HAS_MS5611		0
+#define AO_MS5607_PRIVATE_PINS	0
+#define AO_MS5607_CS_PORT	P1
+#define AO_MS5607_CS_PIN	3
+#define AO_MS5607_CS		P1_3
+#define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS_PIN)
+#define AO_MS5607_MISO_PORT	P0
+#define AO_MS5607_MISO_PIN	2
+#define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
+#define AO_MS5607_SPI_INDEX	0
+
+/*
+ * Igniters
+ */
+#define AO_IGNITER_PORT		P2
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
+#define AO_IGNITER_DROGUE	P2_3
+#define AO_IGNITER_MAIN		P2_4
+#define AO_IGNITER_DIR		P2DIR
+#define AO_IGNITER_DROGUE_BIT	(1 << 3)
+#define AO_IGNITER_MAIN_BIT	(1 << 4)
+#define AO_IGNITER_DROGUE_PIN	3
+#define AO_IGNITER_MAIN_PIN	4
+
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
+#define AO_IGNITER_MAIN_PORT	AO_IGNITER_PORT
+
+/* test these values with real igniters */
+#define AO_IGNITER_OPEN		1000
+#define AO_IGNITER_CLOSED	7000
+#define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(50)
+#define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
+
+#define AO_SEND_MINI
+
+/*
+ * ADC
+ */
+
+#define HAS_ADC			1
+#define AO_ADC_FIRST_PIN	0
+
+struct ao_adc {
+	int16_t		sense_a;	/* apogee continuity sense */
+	int16_t		sense_m;	/* main continuity sense */
+	int16_t		v_batt;		/* battery voltage */
+};
+
+#define ao_data_count	ao_adc_count
+
+#define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
+
+#define AO_ADC_DUMP(p) \
+	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
+
+#define FETCH_ADC() 							\
+	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
+	switch (sequence) {						\
+	case 4:								\
+		a += 4;							\
+		sequence = 0;						\
+		break;							\
+	case 1:								\
+		a += 2;							\
+		sequence = 4;						\
+		break;							\
+	case 0:								\
+		sequence = 1;						\
+		break;							\
+	}								\
+	if (sequence)							\
+		;
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telemini-v2.0/ao_telemini.c b/src/telemini-v2.0/ao_telemini.c
new file mode 100644
index 00000000..84df2b8c
--- /dev/null
+++ b/src/telemini-v2.0/ao_telemini.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2011 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.
+ */
+
+#include "ao.h"
+#include "ao_pins.h"
+
+__xdata uint8_t ao_force_freq;
+
+void
+main(void)
+{
+	/*
+	 * Reduce the transient on the ignite pins at startup by
+	 * pulling the pins low as soon as possible at power up
+	 */
+	ao_ignite_set_pins();
+
+	ao_clock_init();
+
+	/* Turn on the red LED until the system is stable */
+	ao_led_init(LEDS_AVAILABLE);
+	ao_led_on(AO_LED_RED);
+
+	ao_task_init();
+
+	ao_timer_init();
+	ao_adc_init();
+	ao_cmd_init();
+	ao_storage_init();
+	ao_ms5607_init();
+	ao_flight_init();
+	ao_log_init();
+	ao_report_init();
+	ao_telemetry_init();
+	ao_radio_init();
+	ao_packet_slave_init(TRUE);
+	ao_igniter_init();
+	ao_config_init();
+	ao_start_scheduler();
+}
diff --git a/src/test/Makefile b/src/test/Makefile
index 75b1f848..9c304318 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -2,7 +2,7 @@ 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_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test
 
 INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h
 
@@ -73,3 +73,6 @@ ao_fat_test: ao_fat_test.c ao_fat.c ao_bufio.c
 
 ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c
 	cc $(CFLAGS) -o $@ ao_aes_test.c
+
+ao_int64_test: ao_int64_test.c ao_int64.c ao_int64.h
+	cc $(CFLAGS) -o $@ ao_int64_test.c
-- 
cgit v1.2.3


From 56911f27376b0fe91a464e369bb8aa1531b3c7dc Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 23 May 2013 02:17:51 -0600
Subject: 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>
---
 src/core/ao.h                        |   2 +-
 src/core/ao_cmd.c                    |   4 +-
 src/core/ao_int64.c                  |  88 ++++++++++++------------
 src/core/ao_int64.h                  |  22 +++---
 src/core/ao_kalman.c                 |   4 +-
 src/core/ao_log_telem.c              |   2 +-
 src/core/ao_sample.h                 |   4 +-
 src/core/ao_task.h                   |   3 +
 src/drivers/ao_ms5607.c              |   4 +-
 src/drivers/ao_ms5607.h              |   7 +-
 src/drivers/ao_ms5607_convert_8051.c | 126 ++++++++++++++++++++++++++++-------
 src/telemini-v2.0/Makefile           |   9 ++-
 src/telemini-v2.0/ao_pins.h          |   2 +
 src/test/Makefile                    |   6 +-
 src/test/ao_int64_test.c             |   5 ++
 src/test/ao_ms5607_convert_test.c    |  96 ++++++++++++++++++++++++++
 16 files changed, 289 insertions(+), 95 deletions(-)
 create mode 100644 src/test/ao_ms5607_convert_test.c

(limited to 'src/test/Makefile')

diff --git a/src/core/ao.h b/src/core/ao.h
index caa0ec19..e7320327 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -182,7 +182,7 @@ void
 ao_cmd_hex(void);
 
 void
-ao_cmd_decimal(void);
+ao_cmd_decimal(void) __reentrant;
 
 /* Read a single hex nibble off stdin. */
 uint8_t
diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 5113548b..4ebaa607 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -206,9 +206,9 @@ ao_cmd_hex(void)
 }
 
 void
-ao_cmd_decimal(void)
+ao_cmd_decimal(void) __reentrant
 {
-	__pdata uint8_t	r = ao_cmd_lex_error;
+	uint8_t	r = ao_cmd_lex_error;
 
 	ao_cmd_lex_u32 = 0;
 	ao_cmd_white();
diff --git a/src/core/ao_int64.c b/src/core/ao_int64.c
index 07cdb357..aa23dbe0 100644
--- a/src/core/ao_int64.c
+++ b/src/core/ao_int64.c
@@ -17,8 +17,10 @@
 
 #include <ao_int64.h>
 
-void ao_plus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
-	uint32_t	t;
+__pdata ao_int64_t *__data ao_64r, *__data ao_64a, *__data ao_64b;
+
+void ao_plus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
+	__LOCAL uint32_t	t;
 
 	r->high = a->high + b->high;
 	t = a->low + b->low;
@@ -27,9 +29,8 @@ void ao_plus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
 	r->low = t;
 }
 
-void ao_minus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
-	uint32_t	t;
-
+void ao_minus64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, __pdata ao_int64_t *b) __FATTR {
+	__LOCAL uint32_t	t;
 
 	r->high = a->high - b->high;
 	t = a->low - b->low;
@@ -38,7 +39,7 @@ void ao_minus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
 	r->low = t;
 }
 
-void ao_rshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d) {
+void ao_rshift64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, uint8_t d) __FATTR {
 	if (d < 32) {
 		r->low = a->low >> d;
 		if (d)
@@ -51,7 +52,7 @@ void ao_rshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d) {
 	}
 }
 
-void ao_lshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d) {
+void ao_lshift64(__pdata ao_int64_t *r, __pdata ao_int64_t *a, uint8_t d) __FATTR {
 	if (d < 32) {
 		r->high = a->high << d;
 		if (d)
@@ -64,53 +65,49 @@ void ao_lshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d) {
 	}
 }
 
-static void ao_umul64_32_32(ao_int64_t *r, uint32_t a, uint32_t b)
-{
-	uint32_t	r1;
-	uint32_t	r2, r3, r4;
-	ao_int64_t	s,t,u,v;
-	r1 = (uint32_t) (uint16_t) a * (uint16_t) b;
-	r2 = (uint32_t) (uint16_t) (a >> 16) * (uint16_t) b;
-	r3 = (uint32_t) (uint16_t) a * (uint16_t) (b >> 16);
-	r4 = (uint32_t) (uint16_t) (a >> 16) * (uint16_t) (b >> 16);
-
-	s.low = r1;
-	s.high = r4;
-
-	t.high = r2 >> 16;
-	t.low = r2 << 16;
-	ao_plus64(&u, &s, &t);
-
-	v.high = r3 >> 16;
-	v.low = r3 << 16;
-	ao_plus64(r, &u, &v);
+static void ao_umul64_32_32(__ARG ao_int64_t *r, uint32_t a, uint32_t b) __reentrant {
+	__LOCAL uint32_t	s;
+	__LOCAL ao_int64_t	t;
+	r->low = (uint32_t) (uint16_t) a * (uint16_t) b;
+	r->high = (uint32_t) (uint16_t) (a >> 16) * (uint16_t) (b >> 16);
+
+	s = (uint32_t) (uint16_t) (a >> 16) * (uint16_t) b;
+
+	t.high = s >> 16;
+	t.low = s << 16;
+	ao_plus64(r, r, &t);
+
+	s = (uint32_t) (uint16_t) a * (uint16_t) (b >> 16);
+
+	t.high = s >> 16;
+	t.low = s << 16;
+	ao_plus64(r, r, &t);
 }
 
-void ao_neg64(ao_int64_t *r, ao_int64_t *a) {
+void ao_neg64(__pdata ao_int64_t *r, __pdata ao_int64_t *a) __FATTR {
 	r->high = ~a->high;
-	r->low = ~a->low;
-	if (!++r->low)
+	if (!(r->low = ~a->low + 1))
 		r->high++;
 }
 
-void ao_mul64_32_32(ao_int64_t *r, int32_t a, int32_t b) {
+void ao_mul64_32_32(__ARG ao_int64_t *r, int32_t a, int32_t b) __FATTR {
 	uint8_t		negative = 0;
 
 	if (a < 0) {
 		a = -a;
-		negative = ~0;
+		++negative;
 	}
 	if (b < 0) {
 		b = -b;
-		negative = ~negative;
+		--negative;
 	}
 	ao_umul64_32_32(r, a, b);
 	if (negative)
 		ao_neg64(r, r);
 }
 
-static void ao_umul64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
-	ao_int64_t	r2, r3;
+static void ao_umul64(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG ao_int64_t *b) __reentrant {
+	__LOCAL ao_int64_t	r2, r3;
 
 	ao_umul64_32_32(&r2, a->high, b->low);
 	ao_umul64_32_32(&r3, a->low, b->high);
@@ -119,38 +116,41 @@ static void ao_umul64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
 	r->high += r2.low + r3.low;
 }
 
-void ao_mul64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b) {
+static __ARG ao_int64_t	ap, bp;
+
+void ao_mul64(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG ao_int64_t *b) __FATTR {
 	uint8_t	negative = 0;
-	ao_int64_t	ap, bp;
 
 	if (ao_int64_negativep(a)) {
 		ao_neg64(&ap, a);
 		a = &ap;
-		negative = ~0;
+		++negative;
 	}
 	if (ao_int64_negativep(b)) {
 		ao_neg64(&bp, b);
 		b = &bp;
-		negative = ~negative;
+		--negative;
 	}
 	ao_umul64(r, a, b);
 	if (negative)
 		ao_neg64(r, r);
 }
 
-void ao_umul64_64_16(ao_int64_t *r, ao_int64_t *a, uint16_t b) {
-	uint32_t h = a->high * b;
+static void ao_umul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, uint16_t b) __reentrant {
+	__LOCAL uint32_t h;
+
+	h = a->high * b;
 	ao_umul64_32_32(r, a->low, b);
 	r->high += h;
 }
 
-void ao_mul64_64_16(ao_int64_t *r, ao_int64_t *a, uint16_t b) {
-	ao_int64_t	ap;
+void ao_mul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG uint16_t b) __FATTR {
 	uint8_t		negative = 0;
+
 	if ((int32_t) a->high < 0) {
 		ao_neg64(&ap, a);
 		a = &ap;
-		negative = ~0;
+		negative++;
 	} else
 		ao_umul64_64_16(r, a, b);
 	if (negative)
diff --git a/src/core/ao_int64.h b/src/core/ao_int64.h
index cf12f0d8..b16db58c 100644
--- a/src/core/ao_int64.h
+++ b/src/core/ao_int64.h
@@ -25,16 +25,18 @@ typedef struct {
 	uint32_t	low;
 } ao_int64_t;
 
-void ao_plus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b);
-void ao_minus64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b);
-void ao_neg64(ao_int64_t *r, ao_int64_t *a);
-void ao_lshift64_16(ao_int64_t *r, uint16_t a, uint8_t d);
-void ao_rshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d);
-void ao_lshift64(ao_int64_t *r, ao_int64_t *a, uint8_t d);
-void ao_mul64_64_64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b);
-void ao_mul64_32_32(ao_int64_t *r, int32_t a, int32_t b);
-void ao_mul64_64_16(ao_int64_t *r, ao_int64_t *a, uint16_t b);
-void ao_mul64(ao_int64_t *r, ao_int64_t *a, ao_int64_t *b);
+#define __FATTR
+#define __ARG __pdata
+#define __LOCAL static __pdata
+
+void ao_plus64(__pdata ao_int64_t *ao_64r, __pdata ao_int64_t *ao_64a, __pdata ao_int64_t *ao_64b) __FATTR;
+void ao_minus64(__pdata ao_int64_t *ao_64r, __pdata ao_int64_t *ao_64a, __pdata ao_int64_t *ao_64b) __FATTR;
+void ao_neg64(__pdata ao_int64_t *ao_64r, __pdata ao_int64_t *ao_64a) __FATTR;
+void ao_rshift64(__pdata ao_int64_t *ao_64r, __pdata ao_int64_t *ao_64a, uint8_t d) __FATTR;
+void ao_lshift64(__pdata ao_int64_t *ao_64r, __pdata ao_int64_t *ao_64a, uint8_t d) __FATTR;
+void ao_mul64_32_32(__ARG ao_int64_t *r, __ARG int32_t a, __ARG int32_t b) __FATTR;
+void ao_mul64_64_16(__ARG ao_int64_t *r, __ARG ao_int64_t *a, __ARG uint16_t b) __FATTR;
+void ao_mul64(__ARG ao_int64_t * __ARG r, __ARG ao_int64_t * __ARG a, __ARG ao_int64_t *__ARG b) __FATTR;
 
 #define ao_int64_init32(r, a) (((r)->high = 0), (r)->low = (a))
 #define ao_int64_init64(r, a, b) (((r)->high = (a)), (r)->low = (b))
diff --git a/src/core/ao_kalman.c b/src/core/ao_kalman.c
index 59ffd8b2..762b2c0a 100644
--- a/src/core/ao_kalman.c
+++ b/src/core/ao_kalman.c
@@ -40,9 +40,9 @@ static __pdata int32_t		ao_k_accel;
 __pdata int16_t			ao_height;
 __pdata int16_t			ao_speed;
 __pdata int16_t			ao_accel;
-__pdata int16_t			ao_max_height;
+__xdata int16_t			ao_max_height;
 static __pdata int32_t		ao_avg_height_scaled;
-__pdata int16_t			ao_avg_height;
+__xdata int16_t			ao_avg_height;
 
 __pdata int16_t			ao_error_h;
 __pdata int16_t			ao_error_h_sq_avg;
diff --git a/src/core/ao_log_telem.c b/src/core/ao_log_telem.c
index 23ebf7dd..095aca37 100644
--- a/src/core/ao_log_telem.c
+++ b/src/core/ao_log_telem.c
@@ -23,7 +23,7 @@ __code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRY;
 
 static __data uint8_t			ao_log_monitor_pos;
 __pdata enum ao_flight_state		ao_flight_state;
-__pdata int16_t				ao_max_height;	/* max of ao_height */
+__xdata int16_t				ao_max_height;	/* max of ao_height */
 __pdata int16_t				sense_d, sense_m;
 __pdata uint8_t				ao_igniter_present;
 
diff --git a/src/core/ao_sample.h b/src/core/ao_sample.h
index a2dac979..5bd29536 100644
--- a/src/core/ao_sample.h
+++ b/src/core/ao_sample.h
@@ -136,8 +136,8 @@ uint8_t ao_sample(void);
 extern __pdata int16_t			ao_height;	/* meters */
 extern __pdata int16_t			ao_speed;	/* m/s * 16 */
 extern __pdata int16_t			ao_accel;	/* m/s² * 16 */
-extern __pdata int16_t			ao_max_height;	/* max of ao_height */
-extern __pdata int16_t			ao_avg_height;	/* running average of height */
+extern __xdata int16_t			ao_max_height;	/* max of ao_height */
+extern __xdata int16_t			ao_avg_height;	/* running average of height */
 
 extern __pdata int16_t			ao_error_h;
 extern __pdata int16_t			ao_error_h_sq_avg;
diff --git a/src/core/ao_task.h b/src/core/ao_task.h
index 1a4b5b6b..e3a311ed 100644
--- a/src/core/ao_task.h
+++ b/src/core/ao_task.h
@@ -45,7 +45,10 @@ struct ao_task {
 #endif
 };
 
+#ifndef AO_NUM_TASKS
 #define AO_NUM_TASKS		16	/* maximum number of tasks */
+#endif
+
 #define AO_NO_TASK		0	/* no task id */
 
 extern __xdata struct ao_task * __xdata ao_tasks[AO_NUM_TASKS];
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 5259b265..4b4403a7 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -173,7 +173,7 @@ ao_ms5607_get_sample(uint8_t cmd) {
 #define AO_CONVERT_D2	token_evaluator(AO_MS5607_CONVERT_D2_, AO_MS5607_TEMP_OVERSAMPLE)
 
 void
-ao_ms5607_sample(struct ao_ms5607_sample *sample)
+ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample)
 {
 	sample->pres = ao_ms5607_get_sample(AO_CONVERT_D1);
 	sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
@@ -220,7 +220,7 @@ ao_ms5607_info(void)
 static void
 ao_ms5607_dump(void)
 {
-	struct ao_ms5607_value value;
+	__xdata struct ao_ms5607_value value;
 
 	ao_ms5607_convert(&ao_ms5607_current, &value);
 	printf ("Pressure:    %8u %8d\n", ao_ms5607_current.pres, value.pres);
diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index 3fd43fd4..206efd64 100644
--- a/src/drivers/ao_ms5607.h
+++ b/src/drivers/ao_ms5607.h
@@ -68,12 +68,13 @@ void
 ao_ms5607_info(void);
 
 void
-ao_ms5607_sample(struct ao_ms5607_sample *sample);
+ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample);
 
 void
-ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value);
+ao_ms5607_convert(__xdata struct ao_ms5607_sample *sample,
+		  __xdata struct ao_ms5607_value *value);
 
 void
-ao_ms5607_get_prom(struct ao_ms5607_prom *prom);
+ao_ms5607_get_prom(__data struct ao_ms5607_prom *prom);
 
 #endif /* _AO_MS5607_H_ */
diff --git a/src/drivers/ao_ms5607_convert_8051.c b/src/drivers/ao_ms5607_convert_8051.c
index f47972c9..f3a48c46 100644
--- a/src/drivers/ao_ms5607_convert_8051.c
+++ b/src/drivers/ao_ms5607_convert_8051.c
@@ -16,45 +16,121 @@
  */
 
 #include <ao_ms5607.h>
+#include <ao_int64.h>
+
+#if HAS_MS5611
+#define SHIFT_OFF	16
+#define SHIFT_TCO	7
+#define SHIFT_SENS	15
+#define SHFIT_TCS	8
+#else
+#define SHIFT_OFF	17
+#define SHIFT_TCO	6
+#define SHIFT_SENS	16
+#define SHIFT_TCS	7
+#endif
 
 void
-ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value)
+ao_ms5607_convert(__xdata struct ao_ms5607_sample *sample,
+		  __xdata struct ao_ms5607_value *value)
 {
-#if 0
-	int32_t	dT;
-	int32_t TEMP;
-	int64_t OFF;
-	int64_t SENS;
+	__LOCAL int32_t	dT;
+	__LOCAL int32_t TEMP;
+	__LOCAL ao_int64_t OFF;
+	__LOCAL ao_int64_t SENS;
+	__LOCAL ao_int64_t a;
 
 	dT = sample->temp - ((int32_t) ms5607_prom.tref << 8);
 	
-	TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23);
+	/* TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23); */
+	ao_mul64_32_32(&a, dT, ms5607_prom.tempsens);
+	ao_rshift64(&a, &a, 23);
+	TEMP = 2000 + a.low;
+	/* */
 
-#if HAS_MS5611
-	OFF = ((int64_t) ms5607_prom.off << 16) + (((int64_t) ms5607_prom.tco * dT) >> 7);
-	SENS = ((int64_t) ms5607_prom.sens << 15) + (((int64_t) ms5607_prom.tcs * dT) >> 8);
+	/* OFF = ((int64_t) ms5607_prom.off << SHIFT_OFF) + (((int64_t) ms5607_prom.tco * dT) >> SHIFT_TCO);*/
+#if SHIFT_OFF > 16
+	OFF.high = ms5607_prom.off >> (32 - SHIFT_OFF);
 #else
-	OFF = ((int64_t) ms5607_prom.off << 17) + (((int64_t) ms5607_prom.tco * dT) >> 6);
-	SENS = ((int64_t) ms5607_prom.sens << 16) + (((int64_t) ms5607_prom.tcs * dT) >> 7);
+	OFF.high = 0;
 #endif
+	OFF.low = (uint32_t) ms5607_prom.off << SHIFT_OFF;
+	ao_mul64_32_32(&a, ms5607_prom.tco, dT);
+	ao_rshift64(&a, &a, SHIFT_TCO);
+	ao_plus64(&OFF, &OFF, &a);
+	/**/
+
+	/* SENS = ((int64_t) ms5607_prom.sens << SHIFT_SENS) + (((int64_t) ms5607_prom.tcs * dT) >> SHIFT_TCS); */
+	SENS.high = 0;
+	SENS.low = (uint32_t) ms5607_prom.sens << SHIFT_SENS;
+	ao_mul64_32_32(&a, ms5607_prom.tcs, dT);
+	ao_rshift64(&a, &a, SHIFT_TCS);
+	ao_plus64(&SENS, &SENS, &a);
+	/**/
 
 	if (TEMP < 2000) {
-		int32_t	T2 = ((int64_t) dT * (int64_t) dT) >> 31;
-		int32_t TEMPM = TEMP - 2000;
-		int64_t OFF2 = (61 * (int64_t) TEMPM * (int64_t) TEMPM) >> 4;
-		int64_t SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM;
-		if (TEMP < 1500) {
-			int32_t TEMPP = TEMP + 1500;
-			int64_t TEMPP2 = TEMPP * TEMPP;
-			OFF2 = OFF2 + 15 * TEMPP2;
-			SENS2 = SENS2 + 8 * TEMPP2;
+		__LOCAL int32_t	T2;
+		__LOCAL int32_t TEMPM;
+		__LOCAL ao_int64_t OFF2;
+		__LOCAL ao_int64_t SENS2;
+
+		/* T2 = ((int64_t) dT * (int64_t) dT) >> 31; */
+		ao_mul64_32_32(&a, dT, dT);
+		T2 = (a.low >> 31) | (a.high << 1);
+		/**/
+
+		TEMPM = TEMP - 2000;
+
+		/* OFF2 = (61 * (int64_t) TEMPM * (int64_t) TEMPM) >> 4; */
+		ao_mul64_32_32(&OFF2, TEMPM, TEMPM);
+		ao_mul64_64_16(&OFF2, &OFF2, 61);
+		ao_rshift64(&OFF2, &OFF2, 4);
+		/**/
+		
+		/* SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM; */
+		ao_mul64_32_32(&SENS2, TEMPM, TEMPM);
+		ao_lshift64(&SENS2, &SENS2, 1);
+		/**/
+
+		if (TEMP < -1500) {
+			int32_t TEMPP;
+			int32_t TEMPP2;
+
+			TEMPP = TEMP + 1500;
+			TEMPP2 = TEMPP * TEMPP;
+
+			/* OFF2 = OFF2 + 15 * TEMPP2; */
+			ao_mul64_32_32(&a, 15, TEMPP2);
+			ao_plus64(&OFF2, &OFF2, &a);
+			/**/
+
+			/* SENS2 = SENS2 + 8 * TEMPP2; */
+			a.high = 0;
+			a.low = TEMPP2;
+			ao_lshift64(&a, &a, 3);
+			ao_plus64(&SENS2, &SENS2, &a);
+			/**/
 		}
 		TEMP -= T2;
-		OFF -= OFF2;
-		SENS -= SENS2;
+
+		/* OFF -= OFF2; */
+		ao_minus64(&OFF, &OFF, &OFF2);
+		/**/
+
+		/* SENS -= SENS2; */
+		ao_minus64(&SENS, &SENS, &SENS2);
+		/**/
 	}
 
-	value->pres = ((((int64_t) sample->pres * SENS) >> 21) - OFF) >> 15;
+	/* value->pres = ((((int64_t) sample->pres * SENS) >> 21) - OFF) >> 15; */
+	a.high = 0;
+	a.low = sample->pres;
+	ao_mul64(&a, &a, &SENS);
+	ao_rshift64(&a, &a, 21);
+	ao_minus64(&a, &a, &OFF);
+	ao_rshift64(&a, &a, 15);
+	value->pres = a.low;
+	/**/
+	
 	value->temp = TEMP;
-#endif
 }
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index afd529f0..984406a9 100644
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -19,7 +19,11 @@ INC = \
 	ao_arch.h \
 	ao_arch_funcs.h \
 	cc1111.h \
-	ao_product.h
+	ao_ms5607.h \
+	ao_ms5607_convert_8051.c \
+	ao_product.h \
+	ao_int64.h \
+	ao_sample.h
 
 CORE_SRC = \
 	ao_cmd.c \
@@ -37,7 +41,8 @@ CORE_SRC = \
 	ao_storage.c \
 	ao_task.c \
 	ao_telemetry.c \
-	ao_freq.c
+	ao_freq.c \
+	ao_int64.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index 386c8dc3..fad029e2 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -115,6 +115,8 @@ struct ao_adc {
 #define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
 
+#define AO_NUM_TASKS	10
+
 #define AO_ADC_DUMP(p) \
 	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
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;
+}
-- 
cgit v1.2.3


From 08143a922fe27bc50a19924f46538f9476ab5fd1 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 25 Oct 2013 04:05:09 -0700
Subject: altos: Add gyro-based orientation tracking

This tracks the angle-from-vertical as an additional input to the pyro
channels.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/core/ao_data.h            |   6 +-
 src/core/ao_flight.c          |   4 +
 src/core/ao_kalman.c          |   3 -
 src/core/ao_pyro.c            |   4 +-
 src/core/ao_quaternion.h      | 116 +++++++++++++++++++
 src/core/ao_sample.c          |  98 +++++++++++++++-
 src/core/ao_sample.h          |   3 +-
 src/core/ao_telemetry.c       |   1 +
 src/core/ao_telemetry.h       |   2 +-
 src/drivers/ao_mpu6000.c      |   2 +
 src/drivers/ao_mpu6000.h      |  17 ++-
 src/stm/Makefile.defs         |   4 +-
 src/telemega-v0.3/Makefile    |  16 +++
 src/test/Makefile             |   9 +-
 src/test/ao_flight_test.c     | 259 ++----------------------------------------
 src/test/ao_quaternion_test.c |  67 +++++++++++
 16 files changed, 343 insertions(+), 268 deletions(-)
 create mode 100644 src/core/ao_quaternion.h
 create mode 100644 src/test/ao_quaternion_test.c

(limited to 'src/test/Makefile')

diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index 339afe69..5a232885 100644
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -18,6 +18,8 @@
 #ifndef _AO_DATA_H_
 #define _AO_DATA_H_
 
+#define GRAVITY 9.80665
+
 #if HAS_ADC
 #define AO_DATA_ADC	(1 << 0)
 #else
@@ -300,8 +302,8 @@ typedef int16_t accel_t;
 
 #define HAS_GYRO	1
 
-typedef int16_t	gyro_t;
-typedef int32_t angle_t;
+typedef int16_t	gyro_t;		/* in raw sample units */
+typedef int16_t angle_t;	/* in degrees */
 
 /* Y axis is aligned with the direction of motion (along) */
 /* X axis is aligned in the other board axis (across) */
diff --git a/src/core/ao_flight.c b/src/core/ao_flight.c
index 2495a44b..240b348a 100644
--- a/src/core/ao_flight.c
+++ b/src/core/ao_flight.c
@@ -20,6 +20,10 @@
 #include <ao_log.h>
 #endif
 
+#if HAS_MPU6000
+#include <ao_quaternion.h>
+#endif
+
 #ifndef HAS_ACCEL
 #error Please define HAS_ACCEL
 #endif
diff --git a/src/core/ao_kalman.c b/src/core/ao_kalman.c
index 762b2c0a..7fd4f889 100644
--- a/src/core/ao_kalman.c
+++ b/src/core/ao_kalman.c
@@ -292,7 +292,4 @@ ao_kalman(void)
 	else 
 #endif
 		ao_avg_height = (ao_avg_height_scaled + 63) >> 7;
-#ifdef AO_FLIGHT_TEST
-	ao_sample_prev_tick = ao_sample_tick;
-#endif
 }
diff --git a/src/core/ao_pyro.c b/src/core/ao_pyro.c
index 531e1f50..24c9fe99 100644
--- a/src/core/ao_pyro.c
+++ b/src/core/ao_pyro.c
@@ -113,7 +113,7 @@ ao_pyro_ready(struct ao_pyro *pyro)
 				continue;
 			break;
 
-#if HAS_ORIENT
+#if HAS_GYRO
 		case ao_pyro_orient_less:
 			if (ao_orient <= pyro->orient_less)
 				continue;
@@ -310,7 +310,7 @@ const struct {
 	{ "h<",	ao_pyro_height_less,	offsetof(struct ao_pyro, height_less), HELP("height less (m)") },
 	{ "h>",	ao_pyro_height_greater,	offsetof(struct ao_pyro, height_greater), HELP("height greater (m)") },
 
-#if HAS_ORIENT
+#if HAS_GYRO
 	{ "o<",	ao_pyro_orient_less,	offsetof(struct ao_pyro, orient_less), HELP("orient less (deg)") },
 	{ "o>",	ao_pyro_orient_greater,	offsetof(struct ao_pyro, orient_greater), HELP("orient greater (deg)")  },
 #endif
diff --git a/src/core/ao_quaternion.h b/src/core/ao_quaternion.h
new file mode 100644
index 00000000..f4b8aaa4
--- /dev/null
+++ b/src/core/ao_quaternion.h
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+#ifndef _AO_QUATERNION_H_
+#define _AO_QUATERNION_H_
+
+#include <math.h>
+
+struct ao_quaternion {
+	float	r;		/* real bit */
+	float	x, y, z;	/* imaginary bits */
+};
+
+static inline void ao_quaternion_multiply(struct ao_quaternion *r,
+					  struct ao_quaternion *a,
+					  struct ao_quaternion *b)
+{
+	struct ao_quaternion	t;
+#define T(_a,_b)	(((a)->_a) * ((b)->_b))
+	t.r = T(r,r) - T(x,x) - T(y,y) - T(z,z);
+	t.x = T(r,x) + T(x,r) + T(y,z) - T(z,y);
+	t.y = T(r,y) - T(x,z) + T(y,r) + T(z,x);
+	t.z = T(r,z) + T(x,y) - T(y,x) + T(z,r);
+#undef T
+	*r = t;
+}
+
+static inline void ao_quaternion_conjugate(struct ao_quaternion *r,
+					   struct ao_quaternion *a)
+{
+	r->r = a->r;
+	r->x = -a->x;
+	r->y = -a->y;
+	r->z = -a->z;
+}
+
+static inline float ao_quaternion_normal(struct ao_quaternion *a)
+{
+#define S(_a)	(((a)->_a) * ((a)->_a))
+	return S(r) + S(x) + S(y) + S(z);
+#undef S
+}
+
+static inline void ao_quaternion_scale(struct ao_quaternion *r,
+				       struct ao_quaternion *a,
+				       float b)
+{
+	r->r = a->r * b;
+	r->x = a->x * b;
+	r->y = a->y * b;
+	r->z = a->z * b;
+}
+
+static inline void ao_quaternion_normalize(struct ao_quaternion *r,
+					   struct ao_quaternion *a)
+{
+	float	n = ao_quaternion_normal(a);
+
+	if (n > 0)
+		ao_quaternion_scale(r, a, 1/sqrtf(n));
+	else
+		*r = *a;
+}
+
+static inline void ao_quaternion_rotate(struct ao_quaternion *r,
+					struct ao_quaternion *a,
+					struct ao_quaternion *b)
+{
+	struct ao_quaternion	c;
+	struct ao_quaternion	t;
+
+	ao_quaternion_conjugate(&c, b);
+	ao_quaternion_multiply(&t, b, a);
+	ao_quaternion_multiply(r, &t, &c);
+}
+
+static inline void ao_quaternion_init_vector(struct ao_quaternion *r,
+					     float x, float y, float z)
+{
+	r->r = 0;
+	r->x = x;
+	r->y = y;
+	r->z = z;
+}
+
+static inline void ao_quaternion_init_rotation(struct ao_quaternion *r,
+					       float x, float y, float z,
+					       float s, float c)
+{
+	r->r = c;
+	r->x = s * x;
+	r->y = s * y;
+	r->z = s * z;
+}
+
+static inline void ao_quaternion_init_zero_rotation(struct ao_quaternion *r)
+{
+	r->r = 1;
+	r->x = r->y = r->z = 0;
+}
+
+#endif /* _AO_QUATERNION_H_ */
diff --git a/src/core/ao_sample.c b/src/core/ao_sample.c
index dec44f9f..676e0ffd 100644
--- a/src/core/ao_sample.c
+++ b/src/core/ao_sample.c
@@ -20,6 +20,10 @@
 #include <ao_data.h>
 #endif
 
+#if HAS_GYRO
+#include <ao_quaternion.h>
+#endif
+
 /*
  * Current sensor values
  */
@@ -44,8 +48,7 @@ __pdata accel_t		ao_sample_accel_through;
 __pdata gyro_t		ao_sample_roll;
 __pdata gyro_t		ao_sample_pitch;
 __pdata gyro_t		ao_sample_yaw;
-__pdata angle_t		ao_sample_angle;
-__pdata angle_t		ao_sample_roll_angle;
+__pdata angle_t		ao_orient;
 #endif
 
 __data uint8_t		ao_sample_data;
@@ -86,6 +89,8 @@ __pdata int32_t	ao_sample_accel_through_sum;
 __pdata int32_t ao_sample_pitch_sum;
 __pdata int32_t ao_sample_yaw_sum;
 __pdata int32_t	ao_sample_roll_sum;
+static struct ao_quaternion ao_rotation;
+static struct ao_quaternion ao_pad_orientation;
 #endif
 
 static void
@@ -129,11 +134,91 @@ ao_sample_preflight_set(void)
 	ao_sample_pitch_sum = 0;
 	ao_sample_yaw_sum = 0;
 	ao_sample_roll_sum = 0;
-	ao_sample_angle = 0;
+	ao_orient = 0;
+
+	/* No rotation yet */
+	ao_quaternion_init_zero_rotation(&ao_rotation);
+
+	/* XXX Assume we're pointing straight up for now */
+	ao_quaternion_init_vector(&ao_pad_orientation,
+				  ao_ground_accel_across,
+				  ao_ground_accel_through,
+				  -ao_ground_accel_along);
+	ao_quaternion_normalize(&ao_pad_orientation,
+				&ao_pad_orientation);
+				  
+	printf ("pad r%8.5f x%8.5f y%8.5f z%8.5f\n",
+		ao_pad_orientation.r,
+		ao_pad_orientation.x,
+		ao_pad_orientation.y,
+		ao_pad_orientation.z);
 #endif	
 	nsamples = 0;
 }
 
+#if HAS_GYRO
+static void
+ao_sample_rotate(void)
+{
+#ifdef AO_FLIGHT_TEST
+	float	dt = (ao_sample_tick - ao_sample_prev_tick) / 100.0;
+#else
+	static const float dt = 1/100.0;
+#endif
+	float	x = ao_mpu6000_gyro(ao_sample_pitch - ao_ground_pitch) * dt;
+	float	y = ao_mpu6000_gyro(ao_sample_yaw - ao_ground_yaw) * dt;
+	float	z = ao_mpu6000_gyro(ao_sample_roll - ao_ground_roll) * dt;
+
+	float			n_2, n;
+	float			s, c;
+	
+	struct ao_quaternion	rot;
+	struct ao_quaternion	point;
+
+	/* The amount of rotation is just the length of the vector. Now,
+	 * here's the trick -- assume that the rotation amount is small. In this case,
+	 * sin(x) ≃ x, so we can just make this the sin.
+	 */
+
+	n_2 = x*x + y*y + z*z;
+	n = sqrtf(n_2);
+	s = n / 2;
+	if (s > 1)
+		s = 1;
+	c = sqrtf(1 - s*s);
+
+	/* Make unit vector */
+	if (n > 0) {
+		x /= n;
+		y /= n;
+		z /= n;
+	}
+
+	/* Now compute the unified rotation quaternion */
+
+	ao_quaternion_init_rotation(&rot,
+				    x, y, z,
+				    s, c);
+
+	/* Integrate with the previous rotation amount */
+	ao_quaternion_multiply(&ao_rotation, &ao_rotation, &rot);
+
+	/* And normalize to make sure it remains a unit vector */
+	ao_quaternion_normalize(&ao_rotation, &ao_rotation);
+
+	/* Compute pitch angle from vertical by taking the pad
+	 * orientation vector and rotating it by the current total
+	 * rotation value. That will be a unit vector pointing along
+	 * the airframe axis. The Z value will be the cosine of the
+	 * change in the angle from vertical since boost
+	 */
+
+	ao_quaternion_rotate(&point, &ao_pad_orientation, &ao_rotation);
+
+	ao_orient = acosf(point.z) * (float) (180.0/M_PI);
+}
+#endif
+
 static void
 ao_sample_preflight(void)
 {
@@ -232,9 +317,12 @@ ao_sample(void)
 				ao_sample_preflight_update();
 			ao_kalman();
 #if HAS_GYRO
-			/* do quaternion stuff here... */
+			ao_sample_rotate();
 #endif
 		}
+#ifdef AO_FLIGHT_TEST
+		ao_sample_prev_tick = ao_sample_tick;
+#endif
 		ao_sample_data = ao_data_ring_next(ao_sample_data);
 	}
 	return !ao_preflight;
@@ -264,7 +352,7 @@ ao_sample_init(void)
 	ao_sample_pitch = 0;
 	ao_sample_yaw = 0;
 	ao_sample_roll = 0;
-	ao_sample_angle = 0;
+	ao_orient = 0;
 #endif
 	ao_sample_data = ao_data_head;
 	ao_preflight = TRUE;
diff --git a/src/core/ao_sample.h b/src/core/ao_sample.h
index 5bd29536..1d1bcc7c 100644
--- a/src/core/ao_sample.h
+++ b/src/core/ao_sample.h
@@ -64,8 +64,6 @@
  * for all further flight computations
  */
 
-#define GRAVITY 9.80665
-
 /*
  * Above this height, the baro sensor doesn't work
  */
@@ -118,6 +116,7 @@ extern __pdata accel_t	ao_ground_accel_through;
 extern __pdata gyro_t	ao_ground_pitch;
 extern __pdata gyro_t	ao_ground_yaw;
 extern __pdata gyro_t	ao_ground_roll;
+extern __pdata angle_t	ao_orient;
 #endif
 
 void ao_sample_init(void);
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 6b47a06a..a2726016 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -115,6 +115,7 @@ ao_send_mega_sensor(void)
 	telemetry.generic.tick = packet->tick;
 	telemetry.generic.type = AO_TELEMETRY_MEGA_SENSOR;
 
+	telemetry.mega_sensor.orient = ao_orient;
 	telemetry.mega_sensor.accel = ao_data_accel(packet);
 	telemetry.mega_sensor.pres = ao_data_pres(packet);
 	telemetry.mega_sensor.temp = ao_data_temp(packet);
diff --git a/src/core/ao_telemetry.h b/src/core/ao_telemetry.h
index fd6b76b3..237a35ab 100644
--- a/src/core/ao_telemetry.h
+++ b/src/core/ao_telemetry.h
@@ -162,7 +162,7 @@ struct ao_telemetry_mega_sensor {
 	uint16_t	tick;		/*  2 */
 	uint8_t		type;		/*  4 */
 
-	uint8_t		pad5;		/*  5 */
+	uint8_t		orient;		/*  5 angle from vertical */
 	int16_t		accel;		/*  6 Z axis */
 
 	int32_t		pres;		/*  8 Pa * 10 */
diff --git a/src/drivers/ao_mpu6000.c b/src/drivers/ao_mpu6000.c
index 73057820..5e75b78a 100644
--- a/src/drivers/ao_mpu6000.c
+++ b/src/drivers/ao_mpu6000.c
@@ -118,6 +118,7 @@ _ao_mpu6000_sample(struct ao_mpu6000_sample *sample)
 
 #define G	981	/* in cm/s² */
 
+#if 0
 static int16_t /* cm/s² */
 ao_mpu6000_accel(int16_t v)
 {
@@ -129,6 +130,7 @@ ao_mpu6000_gyro(int16_t v)
 {
 	return (int16_t) ((v * (int32_t) 20000) / 32767);
 }
+#endif
 
 static uint8_t
 ao_mpu6000_accel_check(int16_t normal, int16_t test, char *which)
diff --git a/src/drivers/ao_mpu6000.h b/src/drivers/ao_mpu6000.h
index a42f69c4..2241bf80 100644
--- a/src/drivers/ao_mpu6000.h
+++ b/src/drivers/ao_mpu6000.h
@@ -18,6 +18,10 @@
 #ifndef _AO_MPU6000_H_
 #define _AO_MPU6000_H_
 
+#ifndef M_PI
+#define M_PI 3.1415926535897832384626433
+#endif
+
 #define MPU6000_ADDR_WRITE	0xd0
 #define MPU6000_ADDR_READ	0xd1
 
@@ -166,9 +170,20 @@
 /* Self test gyro is approximately 50°/s */
 #define MPU6000_ST_GYRO(full_scale)	((int16_t) (((int32_t) 32767 * (int32_t) 50) / (full_scale)))
 
-#define MPU6000_GYRO_FULLSCALE	2000
+#define MPU6000_GYRO_FULLSCALE	((float) 2000 * M_PI/180.0)
+
+static inline float
+ao_mpu6000_gyro(int16_t sensor) {
+	return (float) sensor * ((float) (MPU6000_GYRO_FULLSCALE / 32767.0));
+}
+
 #define MPU6000_ACCEL_FULLSCALE	16
 
+static inline float
+ao_mpu6000_accel(int16_t sensor) {
+	return (float) sensor * ((float) (MPU6000_ACCEL_FULLSCALE * GRAVITY / 32767.0));
+}
+
 struct ao_mpu6000_sample {
 	int16_t		accel_x;
 	int16_t		accel_y;
diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index ee1cb658..0710d747 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -1,4 +1,4 @@
-vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:..
+vpath % ../stm:../product:../drivers:../core:../util:../kalman:../aes:../math:..
 vpath make-altitude ../util
 vpath make-kalman ../util
 vpath kalman.5c ../kalman
@@ -24,7 +24,7 @@ include $(TOPDIR)/Makedefs
 CC=$(ARM_CC)
 LIBS=-lpdclib-cortex-m3 -lgcc
 
-AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
+AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I../math -I..
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld
diff --git a/src/telemega-v0.3/Makefile b/src/telemega-v0.3/Makefile
index 6e5da721..2f460105 100644
--- a/src/telemega-v0.3/Makefile
+++ b/src/telemega-v0.3/Makefile
@@ -27,6 +27,7 @@ INC = \
 	ao_sample_profile.h \
 	ao_mpu.h \
 	stm32l.h \
+	math.h \
 	Makefile
 
 #
@@ -44,6 +45,20 @@ INC = \
 #STACK_GUARD=ao_mpu_stm.c
 #STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
 
+MATH_SRC=\
+	ef_acos.c \
+	ef_sqrt.c
+
+#	ef_rem_pio2.c \
+#	kf_cos.c \
+#	kf_sin.c \
+#	kf_rem_pio2.c \
+#	sf_copysign.c \
+#	sf_cos.c \
+#	sf_fabs.c \
+#	sf_floor.c \
+#	sf_scalbn.c
+
 ALTOS_SRC = \
 	ao_boot_chain.c \
 	ao_interrupt.c \
@@ -93,6 +108,7 @@ ALTOS_SRC = \
 	ao_companion.c \
 	ao_pyro.c \
 	ao_aprs.c \
+	$(MATH_SRC) \
 	$(PROFILE) \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
diff --git a/src/test/Makefile b/src/test/Makefile
index 5eee6bbb..f64a9531 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -1,15 +1,15 @@
-vpath % ..:../core:../drivers:../util:../micropeak:../aes
+vpath % ..:../core:../drivers:../util:../micropeak:../aes:../product
 
 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_ms5607_convert_test
+	ao_ms5607_convert_test ao_quaternion_test
 
 INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h
 
 KALMAN=make-kalman 
 
-CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -O0 -g -Wall
+CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -I../product -O0 -g -Wall
 
 all: $(PROGS) ao_aprs_data.wav
 
@@ -80,3 +80,6 @@ ao_int64_test: ao_int64_test.c ao_int64.c ao_int64.h
 
 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
+
+ao_quaternion_test: ao_quaternion_test.c ao_quaternion.h
+	cc $(CFLAGS) -o $@ ao_quaternion_test.c -lm
\ No newline at end of file
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index faf31aa7..e2f63e34 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -25,6 +25,8 @@
 #include <getopt.h>
 #include <math.h>
 
+#define GRAVITY 9.80665
+
 #define AO_HERTZ	100
 
 #define HAS_ADC 1
@@ -36,6 +38,11 @@
 #define AO_MS_TO_SPEED(ms)	((int16_t) ((ms) * 16))
 #define AO_MSS_TO_ACCEL(mss)	((int16_t) ((mss) * 16))
 
+#define AO_GPS_NEW_DATA		1
+#define AO_GPS_NEW_TRACKING	2
+
+int ao_gps_new;
+
 #if TELEMEGA
 #define AO_ADC_NUM_SENSE	6
 #define HAS_MS5607		1
@@ -240,7 +247,6 @@ struct ao_config ao_config;
 #define DATA_TO_XDATA(x) (x)
 
 
-#define GRAVITY 9.80665
 extern int16_t ao_ground_accel, ao_flight_accel;
 extern int16_t ao_accel_2g;
 
@@ -339,20 +345,6 @@ ao_test_exit(void)
 	exit(0);
 }
 
-#if HAS_MPU6000
-static double
-ao_mpu6000_accel(int16_t sensor)
-{
-	return sensor / 32767.0 * MPU6000_ACCEL_FULLSCALE * GRAVITY;
-}
-
-static double
-ao_mpu6000_gyro(int32_t sensor)
-{
-	return sensor / 32767.0 * MPU6000_GYRO_FULLSCALE;
-}
-#endif
-
 void
 ao_insert(void)
 {
@@ -408,23 +400,23 @@ ao_insert(void)
 		if (!ao_summary) {
 			printf("%7.2f height %8.2f accel %8.3f "
 #if TELEMEGA
-			       "roll %8.3f angle %8.3f qangle %8.3f "
-			       "accel_x %8.3f accel_y %8.3f accel_z %8.3f gyro_x %8.3f gyro_y %8.3f gyro_z %8.3f "
+			       "angle %5d "
+/*			       "accel_x %8.3f accel_y %8.3f accel_z %8.3f gyro_x %8.3f gyro_y %8.3f gyro_z %8.3f " */
 #endif
 			       "state %-8.8s k_height %8.2f k_speed %8.3f k_accel %8.3f avg_height %5d drogue %4d main %4d error %5d\n",
 			       time,
 			       height,
 			       accel,
 #if TELEMEGA
-			       ao_mpu6000_gyro(ao_sample_roll_angle) / 100.0,
-			       ao_mpu6000_gyro(ao_sample_angle) / 100.0,
-			       ao_sample_qangle,
+			       ao_orient,
+/*
 			       ao_mpu6000_accel(ao_data_static.mpu6000.accel_x),
 			       ao_mpu6000_accel(ao_data_static.mpu6000.accel_y),
 			       ao_mpu6000_accel(ao_data_static.mpu6000.accel_z),
 			       ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_x - ao_ground_mpu6000.gyro_x),
 			       ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_y - ao_ground_mpu6000.gyro_y),
 			       ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_z - ao_ground_mpu6000.gyro_z),
+*/
 #endif
 			       ao_state_names[ao_flight_state],
 			       ao_k_height / 65536.0,
@@ -589,207 +581,6 @@ int32(uint8_t *bytes, int off)
 
 static int log_format;
 
-#if TELEMEGA
-
-static double
-ao_vec_norm(double x, double y, double z)
-{
-	return x*x + y*y + z*z;
-}
-
-static void
-ao_vec_normalize(double *x, double *y, double *z)
-{
-	double	scale = 1/sqrt(ao_vec_norm(*x, *y, *z));
-
-	*x *= scale;
-	*y *= scale;
-	*z *= scale;
-}
-
-struct ao_quat {
-	double	q0, q1, q2, q3;
-};
-
-static void
-ao_quat_mul(struct ao_quat *r, struct ao_quat *a, struct ao_quat *b)
-{
-	r->q0 = a->q0 * b->q0 - a->q1 * b->q1 - a->q2 * b->q2 - a->q3 * b->q3;
-	r->q1 = a->q0 * b->q1 + a->q1 * b->q0 + a->q2 * b->q3 - a->q3 * b->q2;
-	r->q2 = a->q0 * b->q2 - a->q1 * b->q3 + a->q2 * b->q0 + a->q3 * b->q1;
-	r->q3 = a->q0 * b->q3 + a->q1 * b->q2 - a->q2 * b->q1 + a->q3 * b->q0;
-}
-
-#if 0
-static void
-ao_quat_scale(struct ao_quat *r, struct ao_quat *a, double s)
-{
-	r->q0 = a->q0 * s;
-	r->q1 = a->q1 * s;
-	r->q2 = a->q2 * s;
-	r->q3 = a->q3 * s;
-}
-#endif
-
-static void
-ao_quat_conj(struct ao_quat *r, struct ao_quat *a)
-{
-	r->q0 =  a->q0;
-	r->q1 = -a->q1;
-	r->q2 = -a->q2;
-	r->q3 = -a->q3;
-}
-
-static void
-ao_quat_rot(struct ao_quat *r, struct ao_quat *a, struct ao_quat *q)
-{
-	struct ao_quat	t;
-	struct ao_quat	c;
-	ao_quat_mul(&t, q, a);
-	ao_quat_conj(&c, q);
-	ao_quat_mul(r, &t, &c);
-}
-
-static void
-ao_quat_from_angle(struct ao_quat *r,
-		   double x_rad,
-		   double y_rad,
-		   double z_rad)
-{
-	double angle = sqrt (x_rad * x_rad + y_rad * y_rad + z_rad * z_rad);
-	double s = sin(angle/2);
-	double c = cos(angle/2);
-
-	r->q0 = c;
-	r->q1 = x_rad * s / angle;
-	r->q2 = y_rad * s / angle;
-	r->q3 = z_rad * s / angle;
-}
-
-static void
-ao_quat_from_vector(struct ao_quat *r, double x, double y, double z)
-{
-	ao_vec_normalize(&x, &y, &z);
-	double	x_rad = atan2(z, y);
-	double	y_rad = atan2(x, z);
-	double	z_rad = atan2(y, x);
-
-	ao_quat_from_angle(r, x_rad, y_rad, z_rad);
-}
-
-static double
-ao_quat_norm(struct ao_quat *a)
-{
-	return (a->q0 * a->q0 +
-		a->q1 * a->q1 +
-		a->q2 * a->q2 +
-		a->q3 * a->q3);
-}
-
-static void
-ao_quat_normalize(struct ao_quat *a)
-{
-	double	norm = ao_quat_norm(a);
-
-	if (norm) {
-		double m = 1/sqrt(norm);
-
-		a->q0 *= m;
-		a->q1 *= m;
-		a->q2 *= m;
-		a->q3 *= m;
-	}
-}
-
-static struct ao_quat	ao_up, ao_current;
-static struct ao_quat	ao_orient;
-static int		ao_orient_tick;
-
-void
-set_orientation(double x, double y, double z, int tick)
-{
-	struct ao_quat	t;
-
-	printf ("set_orientation %g %g %g\n", x, y, z);
-	ao_quat_from_vector(&ao_orient, x, y, z);
-	ao_up.q1 = ao_up.q2 = 0;
-	ao_up.q0 = ao_up.q3 = sqrt(2)/2;
-	ao_orient_tick = tick;
-
-	ao_orient.q0 = 1;
-	ao_orient.q1 = 0;
-	ao_orient.q2 = 0;
-	ao_orient.q3 = 0;
-
-	printf ("orient (%g) %g %g %g up (%g) %g %g %g\n",
-		ao_orient.q0,
-		ao_orient.q1,
-		ao_orient.q2,
-		ao_orient.q3,
-		ao_up.q0,
-		ao_up.q1,
-		ao_up.q2,
-		ao_up.q3);
-
-	ao_quat_rot(&t, &ao_up, &ao_orient);
-	printf ("pad orient (%g) %g %g %g\n",
-		t.q0,
-		t.q1,
-		t.q2,
-		t.q3);
-
-}
-
-void
-update_orientation (double rate_x, double rate_y, double rate_z, int tick)
-{
-	struct ao_quat	q_dot;
-	double		lambda;
-	double		dt = (tick - ao_orient_tick) / 100.0;
-
-	ao_orient_tick = tick;
- 
-//	lambda = 1 - ao_quat_norm(&ao_orient);
-	lambda = 0;
-
-	q_dot.q0 = -0.5 * (ao_orient.q1 * rate_x + ao_orient.q2 * rate_y + ao_orient.q3 * rate_z) + lambda * ao_orient.q0;
-	q_dot.q1 =  0.5 * (ao_orient.q0 * rate_x + ao_orient.q2 * rate_z - ao_orient.q3 * rate_y) + lambda * ao_orient.q1;
-	q_dot.q2 =  0.5 * (ao_orient.q0 * rate_y + ao_orient.q3 * rate_x - ao_orient.q1 * rate_z) + lambda * ao_orient.q2;
-	q_dot.q3 =  0.5 * (ao_orient.q0 * rate_z + ao_orient.q1 * rate_y - ao_orient.q2 * rate_x) + lambda * ao_orient.q3;
-
-#if 0
-	printf ("update_orientation %g %g %g (%g s)\n", rate_x, rate_y, rate_z, dt);
-	printf ("q_dot (%g) %g %g %g\n",
-		q_dot.q0,
-		q_dot.q1,
-		q_dot.q2,
-		q_dot.q3);
-#endif
-
-	ao_orient.q0 += q_dot.q0 * dt;
-	ao_orient.q1 += q_dot.q1 * dt;
-	ao_orient.q2 += q_dot.q2 * dt;
-	ao_orient.q3 += q_dot.q3 * dt;
-
-	ao_quat_normalize(&ao_orient);
-
-	ao_quat_rot(&ao_current, &ao_up, &ao_orient);
-
-	ao_sample_qangle = 180 / M_PI * acos(ao_current.q3 * sqrt(2));
-#if 0
-	printf ("orient (%g) %g %g %g current (%g) %g %g %g\n",
-		ao_orient.q0,
-		ao_orient.q1,
-		ao_orient.q2,
-		ao_orient.q3,
-		ao_current.q0,
-		ao_current.q1,
-		ao_current.q2,
-		ao_current.q3);
-#endif
-}
-#endif
-
 void
 ao_sleep(void *wchan)
 {
@@ -872,32 +663,6 @@ ao_sleep(void *wchan)
 #if HAS_MMA655X
 					ao_data_static.mma655x = int16(bytes, 26);
 #endif
-					if (ao_records_read == 0)
-						ao_ground_mpu6000 = ao_data_static.mpu6000;
-					else if (ao_records_read < 10) {
-#define f(f) ao_ground_mpu6000.f = ao_ground_mpu6000.f + ((ao_data_static.mpu6000.f - ao_ground_mpu6000.f) >> 2)
-						f(accel_x);
-						f(accel_y);
-						f(accel_z);
-						f(gyro_x);
-						f(gyro_y);
-						f(gyro_z);
-
-						double		accel_x = ao_mpu6000_accel(ao_ground_mpu6000.accel_x);
-						double		accel_y = ao_mpu6000_accel(ao_ground_mpu6000.accel_y);
-						double		accel_z = ao_mpu6000_accel(ao_ground_mpu6000.accel_z);
-
-						/* X and Y are in the ground plane, arbitraryily picked as MPU X and Z axes
-						 * Z is normal to the ground, the MPU y axis
-						 */
-						set_orientation(accel_x, accel_z, accel_y, tick);
-					} else {
-						double		rate_x = ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_x - ao_ground_mpu6000.gyro_x);
-						double		rate_y = ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_y - ao_ground_mpu6000.gyro_y);
-						double		rate_z = ao_mpu6000_gyro(ao_data_static.mpu6000.gyro_z - ao_ground_mpu6000.gyro_z);
-
-						update_orientation(rate_x * M_PI / 180, rate_z * M_PI / 180, rate_y * M_PI / 180, tick);
-					}
 					ao_records_read++;
 					ao_insert();
 					return;
diff --git a/src/test/ao_quaternion_test.c b/src/test/ao_quaternion_test.c
new file mode 100644
index 00000000..0e4b5b07
--- /dev/null
+++ b/src/test/ao_quaternion_test.c
@@ -0,0 +1,67 @@
+/*
+ * 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 _GNU_SOURCE
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <getopt.h>
+#include <math.h>
+
+#include "ao_quaternion.h"
+
+static void
+print_q(char *name, struct ao_quaternion *q)
+{
+	printf ("%8.8s: r%8.5f x%8.5f y%8.5f z%8.5f ", name,
+		q->r, q->x, q->y, q->z);
+}
+
+int main(int argc, char **argv)
+{
+	struct ao_quaternion	position;
+	struct ao_quaternion	rotation;
+	struct ao_quaternion	little_rotation;
+	int			i;
+
+	/* unit x vector */
+	ao_quaternion_init_vector(&position, 1, 0, 0);
+
+	/* zero rotation */
+	ao_quaternion_init_zero_rotation(&rotation);
+
+	/* π/16 rotation around Z axis */
+	ao_quaternion_init_rotation(&little_rotation, 0, 0, 1,
+				    sin((M_PI/16)/2),
+				    cos((M_PI/16)/2));
+	for (i = 0; i <= 16; i++) {
+		struct ao_quaternion	rotated;
+
+		ao_quaternion_rotate(&rotated, &position, &rotation);
+		print_q("position", &position);
+		print_q("rotated", &rotated);
+		print_q("rotation", &rotation);
+		printf ("\n");
+		ao_quaternion_multiply(&rotation, &rotation, &little_rotation);
+		ao_quaternion_normalize(&rotation, &rotation);
+	}
+	return 0;
+}
+
-- 
cgit v1.2.3


From 5d9e715d570b24ac124c30772b11923bd26ed670 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 27 Oct 2013 23:44:47 -0700
Subject: altos: Update quaternion tests to check vectors_to_rotation

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/test/Makefile             |   2 +-
 src/test/ao_flight_test.c     |   3 +-
 src/test/ao_quaternion_test.c | 121 ++++++++++++++++++++++++++++++++++++------
 src/test/plotmm               |  22 ++++++--
 src/test/run-mm               |  59 ++++++++++----------
 5 files changed, 158 insertions(+), 49 deletions(-)

(limited to 'src/test/Makefile')

diff --git a/src/test/Makefile b/src/test/Makefile
index f64a9531..686fde0c 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -5,7 +5,7 @@ PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noi
 	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test \
 	ao_ms5607_convert_test ao_quaternion_test
 
-INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h
+INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h ao_quaternion.h
 
 KALMAN=make-kalman 
 
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 7f18c80e..952a811a 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -128,6 +128,7 @@ int	ao_summary = 0;
 #define ao_rdf_set(rdf)
 #define ao_packet_slave_start()
 #define ao_packet_slave_stop()
+#define flush()
 
 enum ao_igniter {
 	ao_igniter_drogue = 0,
@@ -411,7 +412,7 @@ ao_insert(void)
 			       height,
 			       accel,
 #if TELEMEGA
-			       ao_orient,
+			       ao_sample_orient,
 /*
 			       ao_mpu6000_accel(ao_data_static.mpu6000.accel_x),
 			       ao_mpu6000_accel(ao_data_static.mpu6000.accel_y),
diff --git a/src/test/ao_quaternion_test.c b/src/test/ao_quaternion_test.c
index 0e4b5b07..b630f1d3 100644
--- a/src/test/ao_quaternion_test.c
+++ b/src/test/ao_quaternion_test.c
@@ -27,41 +27,128 @@
 
 #include "ao_quaternion.h"
 
+#if 0
 static void
 print_q(char *name, struct ao_quaternion *q)
 {
 	printf ("%8.8s: r%8.5f x%8.5f y%8.5f z%8.5f ", name,
 		q->r, q->x, q->y, q->z);
 }
+#endif
+
+#define STEPS	16
+
+#define DEG	(1.0f * 3.1415926535f / 180.0f)
+
+struct ao_rotation {
+	int	steps;
+	float	x, y, z;
+};
+
+static struct ao_rotation ao_path[] = {
+	{ .steps = 45, .x =  2*DEG, .y = 0, .z = 0 },
+
+	{ .steps = 45, .x = 0, .y = 2*DEG, .z = 0 },
+	
+	{ .steps = 45, .x = -2*DEG, .y = 0, .z = 0 },
+
+	{ .steps = 45, .x = 0, .y = -2*DEG, .z = 0 },
+};
+
+#define NUM_PATH	(sizeof ao_path / sizeof ao_path[0])
+
+static int close(float a, float b) {
+	return fabsf (a - b) < 1e-5;
+}
+
+static int check_quaternion(char *where, struct ao_quaternion *got, struct ao_quaternion *expect) {
+	if (!close (got->r, expect->r) ||
+	    !close (got->x, expect->x) ||
+	    !close (got->y, expect->y) ||
+	    !close (got->z, expect->z))
+	{
+		printf ("%s: got r%8.5f x%8.5f y%8.5f z%8.5f expect r%8.5f x%8.5f y%8.5f z%8.5f\n",
+			where,
+			got->r, got->x, got->y, got->z,
+			expect->r, expect->x, expect->y, expect->z);
+		return 1;
+	}
+	return 0;
+}
 
 int main(int argc, char **argv)
 {
 	struct ao_quaternion	position;
+	struct ao_quaternion 	position_expect;
 	struct ao_quaternion	rotation;
+	struct ao_quaternion	rotated;
 	struct ao_quaternion	little_rotation;
 	int			i;
+	int			p;
+	int			ret = 0;
 
-	/* unit x vector */
-	ao_quaternion_init_vector(&position, 1, 0, 0);
+	/* vector */
+	ao_quaternion_init_vector(&position, 1, 1, 1);
+	ao_quaternion_init_vector(&position_expect, -1, -1, 1);
 
 	/* zero rotation */
 	ao_quaternion_init_zero_rotation(&rotation);
 
-	/* π/16 rotation around Z axis */
-	ao_quaternion_init_rotation(&little_rotation, 0, 0, 1,
-				    sin((M_PI/16)/2),
-				    cos((M_PI/16)/2));
-	for (i = 0; i <= 16; i++) {
-		struct ao_quaternion	rotated;
-
-		ao_quaternion_rotate(&rotated, &position, &rotation);
-		print_q("position", &position);
-		print_q("rotated", &rotated);
-		print_q("rotation", &rotation);
-		printf ("\n");
-		ao_quaternion_multiply(&rotation, &rotation, &little_rotation);
-		ao_quaternion_normalize(&rotation, &rotation);
+#define dump() do {							\
+									\
+		ao_quaternion_rotate(&rotated, &position, &rotation);	\
+		print_q("rotated", &rotated);				\
+		print_q("rotation", &rotation);				\
+		printf ("\n");						\
+	} while (0)
+
+//	dump();
+
+	for (p = 0; p < NUM_PATH; p++) {
+		ao_quaternion_init_half_euler(&little_rotation,
+					      ao_path[p].x / 2.0f,
+					      ao_path[p].y / 2.0f,
+					      ao_path[p].z / 2.0f);
+//		printf ("\t\tx: %8.4f, y: %8.4f, z: %8.4f ", ao_path[p].x, ao_path[p].y, ao_path[p].z);
+//		print_q("step", &little_rotation);
+//		printf("\n");
+		for (i = 0; i < ao_path[p].steps; i++) {
+			ao_quaternion_multiply(&rotation, &little_rotation, &rotation);
+
+			ao_quaternion_normalize(&rotation, &rotation);
+
+//			dump();
+		}
 	}
-	return 0;
+
+	ao_quaternion_rotate(&rotated, &position, &rotation);
+
+	ret += check_quaternion("rotation", &rotated, &position_expect);
+
+	struct ao_quaternion	vertical;
+	struct ao_quaternion	angle;
+	struct ao_quaternion	rot;
+
+	ao_quaternion_init_vector(&vertical, 0, 0, 1);
+	ao_quaternion_init_vector(&angle, 0, 0, 1);
+
+	ao_quaternion_init_half_euler(&rot,
+				      M_PI * 3.0 / 8.0 , 0, 0);
+
+	ao_quaternion_rotate(&angle, &angle, &rot);
+
+	struct ao_quaternion	rot_compute;
+
+	ao_quaternion_vectors_to_rotation(&rot_compute, &vertical, &angle);
+
+	ret += check_quaternion("vector rotation", &rot_compute, &rot);
+
+	struct ao_quaternion	rotd;
+
+	ao_quaternion_rotate(&rotd, &vertical, &rot_compute);
+
+	ret += check_quaternion("vector rotated", &rotd, &angle);
+
+	return ret;
 }
 
diff --git a/src/test/plotmm b/src/test/plotmm
index 5f5bd2ca..bfe15f4c 100755
--- a/src/test/plotmm
+++ b/src/test/plotmm
@@ -1,3 +1,19 @@
+#!/bin/sh
+
+case $# in
+1)
+	file="$1"
+	title="$1"
+	;;
+2)
+	file="$1"
+	title="$2"
+	;;
+*)
+	echo "Usage: $0 <data-file> <title>"
+	exit 1
+esac
+
 gnuplot -persist << EOF
 set ylabel "altitude (m)"
 set y2label "angle (d)"
@@ -5,7 +21,7 @@ set xlabel "time (s)"
 set xtics border out nomirror
 set ytics border out nomirror
 set y2tics border out nomirror
-plot "$1" using 1:3 with lines axes x1y1 title "raw height",\
-"$1" using 1:9 with lines axes x1y2 title "angle",\
-"$1" using 1:11 with lines axes x1y2 title "qangle"
+set title "$title"
+plot "$file" using 1:3 with lines axes x1y1 title "raw height",\
+"$file" using 1:7 with lines axes x1y2 title "angle"
 EOF
diff --git a/src/test/run-mm b/src/test/run-mm
index 6f3d97a2..ae5e5f42 100755
--- a/src/test/run-mm
+++ b/src/test/run-mm
@@ -3,15 +3,20 @@
 DIR=~/misc/rockets/flights
 
 for i in "$@"; do
-case "$i" in
-    */*)
-    file="$i"
-    ;;
-    *)
-    file="$DIR/$i"
-    ;;
-esac
-./ao_flight_test_mm "$file" > run-out.mm
+    case "$i" in
+	*/*)
+	file="$i"
+	;;
+	*)
+	file="$DIR/$i"
+	;;
+    esac
+    base=`basename "$i" .eeprom`
+
+    ./ao_flight_test_mm "$file" > $base.plot
+
+    sh ./plotmm $base.plot `basename "$file"`
+done
 
 #./ao_flight_test_accel "$file" > run-out.accel
 #"run-out.accel" using 1:9 with lines lt 4 axes x1y1 title "accel height",\
@@ -21,21 +26,21 @@ esac
 #"run-out.accel" using 1:17 with lines lt 4 axes x1y1 title "accel main",\
 #
 
-gnuplot << EOF
-set ylabel "altitude (m)"
-set y2label "velocity (m/s), acceleration(m/s²)"
-set xlabel "time (s)"
-set xtics border out nomirror
-set ytics border out nomirror
-set y2tics border out nomirror
-set title "$i"
-plot "run-out.mm" using 1:3 with lines lw 2 lt 1 axes x1y1 title "raw height",\
-"run-out.mm" using 1:5 with lines lw 2 lt 1 axes x1y2 title "raw accel",\
-"run-out.mm" using 1:21 with lines lt 2 axes x1y1 title "mm height",\
-"run-out.mm" using 1:23 with lines lt 2 axes x1y2 title "mm speed",\
-"run-out.mm" using 1:25 with lines lt 2 axes x1y2 title "mm accel",\
-"run-out.mm" using 1:29 with lines lt 2 axes x1y1 title "mm drogue",\
-"run-out.mm" using 1:31 with lines lt 2 axes x1y1 title "mm main"
-pause mouse close
-EOF
-done
\ No newline at end of file
+#gnuplot << EOF
+#set ylabel "altitude (m)"
+#set y2label "velocity (m/s), acceleration(m/s²)"
+#set xlabel "time (s)"
+#set xtics border out nomirror
+#set ytics border out nomirror
+#set y2tics border out nomirror
+#set title "$i"
+#plot "run-out.mm" using 1:3 with lines lw 2 lt 1 axes x1y1 title "raw height",\
+#"run-out.mm" using 1:5 with lines lw 2 lt 1 axes x1y2 title "raw accel",\
+#"run-out.mm" using 1:21 with lines lt 2 axes x1y1 title "mm height",\
+#"run-out.mm" using 1:23 with lines lt 2 axes x1y2 title "mm speed",\
+#"run-out.mm" using 1:25 with lines lt 2 axes x1y2 title "mm accel",\
+#"run-out.mm" using 1:29 with lines lt 2 axes x1y1 title "mm drogue",\
+#"run-out.mm" using 1:31 with lines lt 2 axes x1y1 title "mm main"
+#pause mouse close
+#EOF
+#done
\ No newline at end of file
-- 
cgit v1.2.3