X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=6098699edf4b1735a8a0ede41fd163722ba809aa;hp=5259b2650c4c4ed4746025c0e5380b744dff42a9;hb=3d5db24708b37d86eac187169e2553a408dfeb83;hpb=d0b4e926ecececa7499a301b6135189be119512e

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 5259b265..6098699e 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -21,8 +21,8 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static __xdata 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;
 
 static void
 ao_ms5607_start(void) {
@@ -111,7 +111,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 +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,7 +174,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);
@@ -207,24 +208,24 @@ __xdata struct ao_task ao_ms5607_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));
 }