X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.c;h=c5e733a46e6bf4dacca71dd40ba9e581cd745d90;hb=4891f212ab13941cbe89471114dc1e5cf0f8affb;hp=a468fee3392bd23b8d8211e6de898ad4ce0296dd;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;p=fw%2Faltos

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index a468fee3..c5e733a4 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -25,18 +25,16 @@
 struct ao_ms5607_prom	ao_ms5607_prom;
 static uint8_t	  	ms5607_configured;
 
-#ifndef AO_MS5607_SPI_SPEED
-#define AO_MS5607_SPI_SPEED	AO_SPI_SPEED_FAST
-#endif
+#define AO_MS5607_SPI_SPEED	ao_spi_speed(20000000)
 
 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_MS5607_SPI_SPEED);
+	ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);
 }
 
 static void
 ao_ms5607_stop(void) {
-	ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX);
+	ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX);
 }
 
 static void
@@ -74,7 +72,7 @@ ao_ms5607_crc(uint8_t *prom)
 	return n_rem;
 }
 
-static int
+static bool
 ao_ms5607_prom_valid(uint8_t *prom)
 {
 	uint8_t	crc;
@@ -87,13 +85,13 @@ ao_ms5607_prom_valid(uint8_t *prom)
 		if (*p++ + 1 > 1)
 			break;
 	if (i == 16)
-		return FALSE;
+		return false;
 
 	crc = ao_ms5607_crc(prom);
 	if (crc != (prom[15] & 0xf))
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 static void
@@ -112,8 +110,14 @@ ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
 		r++;
 	}
 
-	if (!ao_ms5607_prom_valid((uint8_t *) prom))
+
+	if (!ao_ms5607_prom_valid((uint8_t *) prom)) {
+#if HAS_SENSOR_ERRORS
+		AO_SENSOR_ERROR(AO_DATA_MS5607);
+#else
 		ao_panic(AO_PANIC_SELF_TEST_MS5607);
+#endif
+	}
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 	/* Byte swap */
@@ -164,7 +168,7 @@ ao_ms5607_get_sample(uint8_t cmd) {
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
 	ao_arch_block_interrupts();
-	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN) &&
 	       !ao_ms5607_done)
 		ao_sleep((void *) &ao_ms5607_done);
 	ao_arch_release_interrupts();
@@ -240,6 +244,9 @@ struct ao_task ao_ms5607_task;
 void
 ao_ms5607_info(void)
 {
+#if !HAS_MS5607_TASK
+	ao_ms5607_setup();
+#endif
 	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);
@@ -255,6 +262,9 @@ ao_ms5607_dump(void)
 {
 	struct ao_ms5607_value value;
 
+#if !HAS_MS5607_TASK
+	ao_ms5607_sample(&ao_ms5607_current);
+#endif
 	ao_ms5607_convert(&ao_ms5607_current, &value);
 	printf ("Pressure:    %8lu %8ld\n", ao_ms5607_current.pres, value.pres);
 	printf ("Temperature: %8lu %8ld\n", ao_ms5607_current.temp, value.temp);