X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=4bfc17db8016f1adaeb0f7d2cc2eaf842e7f30c8;hp=ce0bcf4bcfb79e6a123e00a62c78d7d315c47f01;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hpb=282f0451dd141db3304ab73e4020a849e59721eb

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index ce0bcf4b..4bfc17db 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,19 +22,21 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static struct ao_ms5607_prom	ms5607_prom;
-static uint8_t	  		ms5607_configured;
+__xdata struct ao_ms5607_prom	ao_ms5607_prom;
+static __xdata uint8_t	  	ms5607_configured;
+
+#ifndef AO_MS5607_SPI_SPEED
+#define AO_MS5607_SPI_SPEED	AO_SPI_SPEED_FAST
+#endif
 
 static void
 ao_ms5607_start(void) {
-	ao_spi_get(AO_MS5607_SPI_INDEX,AO_SPI_SPEED_FAST);
-	ao_gpio_set(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, 0);
+	ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);
 }
 
 static void
 ao_ms5607_stop(void) {
-	ao_gpio_set(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, 1);
-	ao_spi_put(AO_MS5607_SPI_INDEX);
+	ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX);
 }
 
 static void
@@ -54,10 +57,11 @@ ao_ms5607_crc(uint8_t *prom)
 	uint8_t 	cnt;
 	uint16_t	n_rem = 0;
 	uint8_t		n_bit;
+	uint8_t		*p = prom;
 
 	prom[15] = 0;
 	for (cnt = 0; cnt < 16; cnt++) {
-		n_rem ^= prom[cnt];
+		n_rem ^= *p++;
 		for (n_bit = 8; n_bit > 0; n_bit--) {
 			if (n_rem & 0x8000)
 				n_rem = (n_rem << 1) ^ 0x3000;
@@ -70,14 +74,35 @@ ao_ms5607_crc(uint8_t *prom)
 	return n_rem;
 }
 
+static int
+ao_ms5607_prom_valid(uint8_t *prom)
+{
+	uint8_t	crc;
+	int	i;
+	uint8_t *p;
+
+	/* Look for a value other than 0x0000 or 0xffff */
+	p = prom;
+	for (i = 0; i < 16; i++)
+		if (*p++ + 1 > 1)
+			break;
+	if (i == 16)
+		return FALSE;
+
+	crc = ao_ms5607_crc(prom);
+	if (crc != (prom[15] & 0xf))
+		return FALSE;
+
+	return TRUE;
+}
+
 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;
 
-	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();
@@ -86,22 +111,19 @@ ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
 		ao_ms5607_stop();
 		r++;
 	}
-	crc = ao_ms5607_crc((uint8_t *) prom);
-	if (crc != (((uint8_t *) prom)[15] & 0xf)) {
-#if HAS_TASK
-		printf ("MS5607 PROM CRC error (computed %x actual %x)\n",
-			crc, (((uint8_t *) prom)[15] & 0xf));
-		flush();
-#endif
+
+	if (!ao_ms5607_prom_valid((uint8_t *) prom))
 		ao_panic(AO_PANIC_SELF_TEST_MS5607);
-	}
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 	/* Byte swap */
 	r = (uint16_t *) prom;
 	for (addr = 0; addr < 8; addr++) {
-		uint16_t	t = *r;
-		*r++ = (t << 8) | (t >> 8);
+		uint8_t		*t = (uint8_t *) r;
+		uint8_t	a = t[0];
+		t[0] = t[1];
+		t[1] = a;
+		r++;
 	}
 #endif
 }
@@ -113,24 +135,23 @@ ao_ms5607_setup(void)
 		return;
 	ms5607_configured = 1;
 	ao_ms5607_reset();
-	ao_ms5607_prom_read(&ms5607_prom);
+	ao_ms5607_prom_read(&ao_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;
-	uint32_t loops;
+	__xdata uint8_t	reply[3];
+	__xdata uint8_t read;
 
 	ao_ms5607_done = 0;
 
@@ -142,15 +163,11 @@ ao_ms5607_get_sample(uint8_t cmd) {
 #if AO_MS5607_PRIVATE_PINS
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
-//	loops = 0;
-	cli();
-	while (!ao_ms5607_done) {
-//		loops++;
+	ao_arch_block_interrupts();
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+	       !ao_ms5607_done)
 		ao_sleep((void *) &ao_ms5607_done);
-	}
-	sei();
-//	if (loops > 1)
-//		printf ("ms5607 loops %d\n", loops);
+	ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
 	stm_gpio_set(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, 1);
 #else
@@ -166,55 +183,81 @@ ao_ms5607_get_sample(uint8_t cmd) {
 	return ((uint32_t) reply[0] << 16) | ((uint32_t) reply[1] << 8) | (uint32_t) reply[2];
 }
 
+#ifndef AO_MS5607_BARO_OVERSAMPLE
+#define AO_MS5607_BARO_OVERSAMPLE	2048
+#endif
+
+#ifndef AO_MS5607_TEMP_OVERSAMPLE
+#define AO_MS5607_TEMP_OVERSAMPLE	AO_MS5607_BARO_OVERSAMPLE
+#endif
+
+#define token_paster(x,y)	x ## y
+#define token_evaluator(x,y)	token_paster(x,y)
+
+#define AO_CONVERT_D1	token_evaluator(AO_MS5607_CONVERT_D1_, AO_MS5607_BARO_OVERSAMPLE)
+#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_MS5607_CONVERT_D1_2048);
-	sample->temp = ao_ms5607_get_sample(AO_MS5607_CONVERT_D2_2048);
+	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;
+#ifndef HAS_MS5607_TASK
+#define HAS_MS5607_TASK HAS_TASK
+#endif
+
+__xdata struct ao_ms5607_sample	ao_ms5607_current;
 
+#if HAS_MS5607_TASK
 static void
 ao_ms5607(void)
 {
+	struct ao_ms5607_sample	sample;
 	ao_ms5607_setup();
 	for (;;)
 	{
-		ao_ms5607_sample(&ao_ms5607_current);
-		ao_arch_critical(
-			AO_DATA_PRESENT(AO_DATA_MS5607);
-			AO_DATA_WAIT();
-			);
+		ao_ms5607_sample(&sample);
+		ao_arch_block_interrupts();
+		ao_ms5607_current = sample;
+		AO_DATA_PRESENT(AO_DATA_MS5607);
+		AO_DATA_WAIT();
+		ao_arch_release_interrupts();
 	}
 }
 
 __xdata struct ao_task ao_ms5607_task;
+#endif
 
+#if HAS_TASK
 void
 ao_ms5607_info(void)
 {
-	printf ("ms5607 reserved: %u\n", ms5607_prom.reserved);
-	printf ("ms5607 sens: %u\n", ms5607_prom.sens);
-	printf ("ms5607 off: %u\n", ms5607_prom.off);
-	printf ("ms5607 tcs: %u\n", ms5607_prom.tcs);
-	printf ("ms5607 tco: %u\n", ms5607_prom.tco);
-	printf ("ms5607 tref: %u\n", ms5607_prom.tref);
-	printf ("ms5607 tempsens: %u\n", ms5607_prom.tempsens);
-	printf ("ms5607 crc: %u\n", ms5607_prom.crc);
+	printf ("ms5607 reserved: %u\n", ao_ms5607_prom.reserved);
+	printf ("ms5607 sens: %u\n", ao_ms5607_prom.sens);
+	printf ("ms5607 off: %u\n", ao_ms5607_prom.off);
+	printf ("ms5607 tcs: %u\n", ao_ms5607_prom.tcs);
+	printf ("ms5607 tco: %u\n", ao_ms5607_prom.tco);
+	printf ("ms5607 tref: %u\n", ao_ms5607_prom.tref);
+	printf ("ms5607 tempsens: %u\n", ao_ms5607_prom.tempsens);
+	printf ("ms5607 crc: %u\n", ao_ms5607_prom.crc);
 }
 
 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));
 }
 
@@ -232,6 +275,8 @@ ao_ms5607_init(void)
 
 #if HAS_TASK
 	ao_cmd_register(&ao_ms5607_cmds[0]);
+#endif
+#if HAS_MS5607_TASK
 	ao_add_task(&ao_ms5607_task, ao_ms5607, "ms5607");
 #endif
 
@@ -241,17 +286,9 @@ ao_ms5607_init(void)
 	 */
 	ao_exti_setup(AO_MS5607_MISO_PORT,
 		      AO_MS5607_MISO_PIN,
-		      AO_EXTI_MODE_RISING,
+		      AO_EXTI_MODE_RISING|
+		      AO_EXTI_PIN_NOCONFIGURE,
 		      ao_ms5607_isr);
-
-#ifdef STM_MODER_ALTERNATE
-	/* Reset the pin from INPUT to ALTERNATE so that SPI works
-	 * This needs an abstraction at some point...
-	 */
-	stm_moder_set(AO_MS5607_MISO_PORT,
-		      AO_MS5607_MISO_PIN,
-		      STM_MODER_ALTERNATE);
-#endif
 }
 
 #endif