projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: add more text to TeleLaunch manual, be less sloppy with dBm assertions
[fw/altos]
/
src
/
drivers
/
ao_mma655x.c
diff --git
a/src/drivers/ao_mma655x.c
b/src/drivers/ao_mma655x.c
index a48c1db20cec31606910d5446d69e30ad7c3eb36..b0217368692fb7939ce391663aa815f4aa46132b 100644
(file)
--- a/
src/drivers/ao_mma655x.c
+++ b/
src/drivers/ao_mma655x.c
@@
-34,7
+34,6
@@
static void
ao_mma655x_start(void) {
ao_spi_get_bit(AO_MMA655X_CS_PORT,
AO_MMA655X_CS_PIN,
ao_mma655x_start(void) {
ao_spi_get_bit(AO_MMA655X_CS_PORT,
AO_MMA655X_CS_PIN,
- AO_MMA655X_CS,
AO_MMA655X_SPI_INDEX,
AO_SPI_SPEED_FAST);
}
AO_MMA655X_SPI_INDEX,
AO_SPI_SPEED_FAST);
}
@@
-43,19
+42,18
@@
static void
ao_mma655x_stop(void) {
ao_spi_put_bit(AO_MMA655X_CS_PORT,
AO_MMA655X_CS_PIN,
ao_mma655x_stop(void) {
ao_spi_put_bit(AO_MMA655X_CS_PORT,
AO_MMA655X_CS_PIN,
- AO_MMA655X_CS,
AO_MMA655X_SPI_INDEX);
}
static void
ao_mma655x_restart(void) {
uint8_t i;
AO_MMA655X_SPI_INDEX);
}
static void
ao_mma655x_restart(void) {
uint8_t i;
- ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN,
AO_MMA655X_CS,
1);
+ ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 1);
/* Emperical testing on STM32L151 at 32MHz for this delay amount */
for (i = 0; i < 10; i++)
ao_arch_nop();
/* Emperical testing on STM32L151 at 32MHz for this delay amount */
for (i = 0; i < 10; i++)
ao_arch_nop();
- ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN,
AO_MMA655X_CS,
0);
+ ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 0);
}
static uint8_t
}
static uint8_t
@@
-234,7
+232,7
@@
ao_mma655x_setup(void)
ao_delay(AO_ST_DELAY);
}
if (tries == AO_ST_TRIES)
ao_delay(AO_ST_DELAY);
}
if (tries == AO_ST_TRIES)
-
ao_sensor_errors = 1
;
+
AO_SENSOR_ERROR(AO_DATA_MMA655X)
;
ao_mma655x_reg_write(AO_MMA655X_DEVCFG,
DEVCFG_VALUE | (1 << AO_MMA655X_DEVCFG_ENDINIT));
ao_mma655x_reg_write(AO_MMA655X_DEVCFG,
DEVCFG_VALUE | (1 << AO_MMA655X_DEVCFG_ENDINIT));