Merge remote-tracking branch 'origin/telemini'

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

Conflicts:
	src/core/ao_telemetry.c
	src/core/ao_telemetry.h

Added both Mini and Metrum telemetry defines

5 files changed, 176 insertions, 34 deletions

diff --git a/src/drivers/ao_74hc165.c b/src/drivers/ao_74hc165.c
index f24fce37..143f4e3f 100644
--- a/src/drivers/ao_74hc165.c
+++ b/src/drivers/ao_74hc165.c
@@ -27,12 +27,12 @@ uint8_t
 ao_74hc165_read(void)
 {
 	static __xdata state;
-	ao_mutex_get(&ao_spi_mutex);
-	ao_spi_set_speed(AO_SPI_SPEED_FAST);
+	ao_spi_get(AO_74HC165_SPI_BUS);
+	ao_spi_set_speed(AO_74HC165_SPI_BUS, AO_SPI_SPEED_FAST);
 	AO_74HC165_CS = 1;
 	ao_spi_recv(&state, 1, AO_74HC165_SPI_BUS);
 	AO_74HC165_CS = 0;
-	ao_mutex_put(&ao_spi_mutex);
+	ao_spi_put(AO_74HC165_SPI_BUS);
 	return state;
 }
 
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8f1dcbe1..58ab9197 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -21,8 +21,8 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static struct ao_ms5607_prom	ms5607_prom;
-static uint8_t	  		ms5607_configured;
+static __xdata struct ao_ms5607_prom	ms5607_prom;
+static __xdata uint8_t	  		ms5607_configured;
 
 static void
 ao_ms5607_start(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);
 
@@ -140,7 +140,8 @@ ao_ms5607_get_sample(uint8_t cmd) {
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
 	ao_arch_block_interrupts();
-	while (!ao_ms5607_done)
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+	       !ao_ms5607_done)
 		ao_sleep((void *) &ao_ms5607_done);
 	ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
@@ -173,16 +174,20 @@ 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);
 }
 
+#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 +196,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();
 	}
 }
 
@@ -216,11 +221,11 @@ 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);
-	printf ("Temperature: %8u %8d\n", ao_ms5607_current.temp, value.temp);
+	printf ("Pressure:    %8lu %8ld\n", ao_ms5607_current.pres, value.pres);
+	printf ("Temperature: %8lu %8ld\n", ao_ms5607_current.temp, value.temp);
 	printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
 }
 
diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index b2f98a59..206efd64 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);
@@ -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
new file mode 100644
index 00000000..f3a48c46
--- /dev/null
+++ b/src/drivers/ao_ms5607_convert_8051.c
@@ -0,0 +1,136 @@
+/*
+ * 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>
+#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(__xdata struct ao_ms5607_sample *sample,
+		  __xdata struct ao_ms5607_value *value)
+{
+	__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); */
+	ao_mul64_32_32(&a, dT, ms5607_prom.tempsens);
+	ao_rshift64(&a, &a, 23);
+	TEMP = 2000 + a.low;
+	/* */
+
+	/* 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.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) {
+		__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; */
+		ao_minus64(&OFF, &OFF, &OFF2);
+		/**/
+
+		/* SENS -= SENS2; */
+		ao_minus64(&SENS, &SENS, &SENS2);
+		/**/
+	}
+
+	/* 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;
+}
diff --git a/src/drivers/ao_pca9922.c b/src/drivers/ao_pca9922.c
index fe070b88..d376b968 100644
--- a/src/drivers/ao_pca9922.c
+++ b/src/drivers/ao_pca9922.c
@@ -30,12 +30,12 @@ ao_led_apply(void)
 	/* Don't try the SPI bus during initialization */
 	if (!ao_cur_task)
 		return;
-	ao_mutex_get(&ao_spi_mutex);
-	ao_spi_set_speed(AO_SPI_SPEED_FAST);
+	ao_spi_get(AO_PCA9922_SPI_BUS);
+	ao_spi_set_speed(AO_PCA9922_SPI_BUS,AO_SPI_SPEED_FAST);
 	AO_PCA9922_CS = 1;
 	ao_spi_send(&ao_led_state, 1, AO_PCA9922_SPI_BUS);
 	AO_PCA9922_CS = 0;
-	ao_mutex_put(&ao_spi_mutex);
+	ao_spi_put(AO_PCA9922_SPI_BUS);
 }
 
 void