X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdrivers%2Fao_ms5607.c;h=c5e733a46e6bf4dacca71dd40ba9e581cd745d90;hb=ea0ab578e4e745f4ee94c2551834e105152fdba1;hp=162141115c01c5f7e7f2abbab541bc9b5622b486;hpb=ee7a54b3215ffa1eb38f16a151c0740b14b60857;p=fw%2Faltos diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c index 16214111..c5e733a4 100644 --- a/src/drivers/ao_ms5607.c +++ b/src/drivers/ao_ms5607.c @@ -25,9 +25,7 @@ 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) { @@ -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 */ @@ -259,7 +263,6 @@ ao_ms5607_dump(void) struct ao_ms5607_value value; #if !HAS_MS5607_TASK - ao_ms5607_info(); ao_ms5607_sample(&ao_ms5607_current); #endif ao_ms5607_convert(&ao_ms5607_current, &value);