X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=17fe853bc1d336a76cb4f838e7c5289c0cfa6c3e;hb=ca1bc20735a170a77066f5f37e0ad728899a3989;hp=f79c315a2a683df13c01636dc979625fb4e64fbd;hpb=34bb17bc1a3d8a1c95b5e57f059e7a1747e17a03;p=fw%2Faltos

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index f79c315a..17fe853b 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -24,13 +24,13 @@ static uint8_t	  		ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
-	ao_spi_get(AO_MS5607_SPI_INDEX);
-	stm_gpio_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, 0);
+	ao_spi_get(AO_MS5607_SPI_INDEX,AO_SPI_SPEED_FAST);
+	stm_gpio_set(AO_MS5607_CS_GPIO, AO_MS5607_CS, 0);
 }
 
 static void
 ao_ms5607_stop(void) {
-	stm_gpio_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
+	stm_gpio_set(AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 }
 
@@ -118,6 +118,7 @@ static uint8_t	ao_ms5607_done;
 static void
 ao_ms5607_isr(void)
 {
+	ao_exti_disable(AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
 	ao_ms5607_done = 1;
 	ao_wakeup(&ao_ms5607_done);
 }
@@ -132,12 +133,11 @@ ao_ms5607_get_sample(uint8_t cmd) {
 
 	ao_ms5607_start();
 	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
-	ao_exti_enable(&AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
+	ao_exti_enable(AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
 	cli();
 	while (!ao_ms5607_done)
 		ao_sleep(&ao_ms5607_done);
 	sei();
-	ao_exti_disable(&AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
 	ao_ms5607_stop();
 
 	ao_ms5607_start();
@@ -195,6 +195,7 @@ ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value
 }
 
 struct ao_ms5607_sample	ao_ms5607_current;
+uint8_t ao_ms5607_valid;
 
 static void
 ao_ms5607(void)
@@ -202,10 +203,11 @@ ao_ms5607(void)
 	ao_ms5607_setup();
 	for (;;)
 	{
-		struct ao_ms5607_sample	ao_ms5607_next;
+		static struct ao_ms5607_sample	ao_ms5607_next;
 		ao_ms5607_sample(&ao_ms5607_next);
 		ao_arch_critical(
 			ao_ms5607_current = ao_ms5607_next;
+			ao_ms5607_valid = 1;
 			);
 		ao_delay(0);
 	}
@@ -213,12 +215,9 @@ ao_ms5607(void)
 
 __xdata struct ao_task ao_ms5607_task;
 
-static void
-ao_ms5607_dump(void)
+void
+ao_ms5607_info(void)
 {
-	struct ao_ms5607_sample	sample;
-	struct ao_ms5607_value value;
-
 	printf ("ms5607 reserved: %u\n", ms5607_prom.reserved);
 	printf ("ms5607 sens: %u\n", ms5607_prom.sens);
 	printf ("ms5607 off: %u\n", ms5607_prom.off);
@@ -227,6 +226,13 @@ ao_ms5607_dump(void)
 	printf ("ms5607 tref: %u\n", ms5607_prom.tref);
 	printf ("ms5607 tempsens: %u\n", ms5607_prom.tempsens);
 	printf ("ms5607 crc: %u\n", ms5607_prom.crc);
+}
+
+static void
+ao_ms5607_dump(void)
+{
+	struct ao_ms5607_sample	sample;
+	struct ao_ms5607_value value;
 
 	sample = ao_ms5607_current;
 	ao_ms5607_convert(&sample, &value);
@@ -236,7 +242,7 @@ ao_ms5607_dump(void)
 }
 
 __code struct ao_cmds ao_ms5607_cmds[] = {
-	{ ao_ms5607_dump,	"p\0Display MS5607 data" },
+	{ ao_ms5607_dump,	"B\0Display MS5607 data" },
 	{ 0, NULL },
 };
 
@@ -244,6 +250,7 @@ void
 ao_ms5607_init(void)
 {
 	ms5607_configured = 0;
+	ao_ms5607_valid = 0;
 	ao_cmd_register(&ao_ms5607_cmds[0]);
 	ao_spi_init_cs(AO_MS5607_CS_GPIO, (1 << AO_MS5607_CS));
 
@@ -253,7 +260,7 @@ ao_ms5607_init(void)
 	 * conversion is complete, the MS5607 will raise this
 	 * pin as a signal
 	 */
-	ao_exti_setup(&AO_MS5607_MISO_GPIO,
+	ao_exti_setup(AO_MS5607_MISO_GPIO,
 		      AO_MS5607_MISO,
 		      AO_EXTI_MODE_RISING,
 		      ao_ms5607_isr);
@@ -261,7 +268,7 @@ ao_ms5607_init(void)
 	/* Reset the pin from INPUT to ALTERNATE so that SPI works
 	 * This needs an abstraction at some point...
 	 */
-	stm_moder_set(&AO_MS5607_MISO_GPIO,
+	stm_moder_set(AO_MS5607_MISO_GPIO,
 		      AO_MS5607_MISO,
 		      STM_MODER_ALTERNATE);
 }