X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=914e0c1b3c7b620ca40c23ee82f88c9ac5b5576e;hb=fed48732828c85ae56106cd72c5aeaaad47c552f;hp=7c1acdd199236dd83063277c816a8f52aef60566;hpb=312f6194a4bc75473cb0d61a6d58b66fb1f7c068;p=fw%2Faltos

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 7c1acdd1..914e0c1b 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,12 +22,16 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static __xdata struct ao_ms5607_prom	ms5607_prom;
-static __xdata 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_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX, AO_SPI_SPEED_FAST);
+	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
@@ -111,7 +116,7 @@ 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 __xdata volatile uint8_t	ao_ms5607_done;
@@ -140,7 +145,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
@@ -185,17 +191,23 @@ ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample)
 #include "ao_ms5607_convert.c"
 #endif
 
-#if HAS_TASK
+#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_ms5607_sample(&sample);
 		ao_arch_block_interrupts();
+		ao_ms5607_current = sample;
 		AO_DATA_PRESENT(AO_DATA_MS5607);
 		AO_DATA_WAIT();
 		ao_arch_release_interrupts();
@@ -203,18 +215,20 @@ ao_ms5607(void)
 }
 
 __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
@@ -223,8 +237,8 @@ ao_ms5607_dump(void)
 	__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));
 }
 
@@ -242,6 +256,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