projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
drivers
/
ao_ms5607.c
diff --git
a/src/drivers/ao_ms5607.c
b/src/drivers/ao_ms5607.c
index a468fee3392bd23b8d8211e6de898ad4ce0296dd..e2327bf4113bbe985ba2e49180171088e16ead3c 100644
(file)
--- a/
src/drivers/ao_ms5607.c
+++ b/
src/drivers/ao_ms5607.c
@@
-31,12
+31,12
@@
static uint8_t ms5607_configured;
static void
ao_ms5607_start(void) {
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) {
}
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
}
static void
@@
-74,7
+74,7
@@
ao_ms5607_crc(uint8_t *prom)
return n_rem;
}
return n_rem;
}
-static
int
+static
bool
ao_ms5607_prom_valid(uint8_t *prom)
{
uint8_t crc;
ao_ms5607_prom_valid(uint8_t *prom)
{
uint8_t crc;
@@
-87,13
+87,13
@@
ao_ms5607_prom_valid(uint8_t *prom)
if (*p++ + 1 > 1)
break;
if (i == 16)
if (*p++ + 1 > 1)
break;
if (i == 16)
- return
FALSE
;
+ return
false
;
crc = ao_ms5607_crc(prom);
if (crc != (prom[15] & 0xf))
crc = ao_ms5607_crc(prom);
if (crc != (prom[15] & 0xf))
- return
FALSE
;
+ return
false
;
- return
TRUE
;
+ return
true
;
}
static void
}
static void
@@
-164,7
+164,7
@@
ao_ms5607_get_sample(uint8_t cmd) {
ao_spi_put(AO_MS5607_SPI_INDEX);
#endif
ao_arch_block_interrupts();
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();
!ao_ms5607_done)
ao_sleep((void *) &ao_ms5607_done);
ao_arch_release_interrupts();