X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=58ab91973ce0b63b5a51c0e6b053a1b903d10fa8;hb=7b275ddfe20f54857d7d1abb98607c406b678090;hp=4b4403a731efa2711d6e69c0ae3a666c34f3666a;hpb=56911f27376b0fe91a464e369bb8aa1531b3c7dc;p=fw%2Faltos

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 4b4403a7..58ab9197 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -22,7 +22,7 @@
 #if HAS_MS5607 || HAS_MS5611
 
 static __xdata struct ao_ms5607_prom	ms5607_prom;
-static uint8_t	  		ms5607_configured;
+static __xdata uint8_t	  		ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
@@ -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
@@ -223,8 +224,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));
 }