projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3fb95b3
)
Revert "adxl375: Disable spi duplex"
author
Bdale Garbee
<bdale@gag.com>
Mon, 4 Apr 2022 07:14:36 +0000
(
01:14
-0600)
committer
Keith Packard
<keithp@keithp.com>
Mon, 4 Apr 2022 21:41:15 +0000
(14:41 -0700)
This reverts commit
21e6dad505677a6b2e19844638ea5b09038b04ae
.
src/drivers/ao_adxl375.c
patch
|
blob
|
history
diff --git
a/src/drivers/ao_adxl375.c
b/src/drivers/ao_adxl375.c
index f53fb59d7ad2147aa04eb2872bd779e706d7ad1a..b2d3178f9b7ef364e5d6ec00a5ccee2059a67e2b 100644
(file)
--- a/
src/drivers/ao_adxl375.c
+++ b/
src/drivers/ao_adxl375.c
@@
-48,17
+48,16
@@
ao_adxl375_stop(void) {
static uint8_t
ao_adxl375_reg_read(uint8_t addr)
{
static uint8_t
ao_adxl375_reg_read(uint8_t addr)
{
- uint8_t d[
1
];
+ uint8_t d[
2
];
d[0] = addr | AO_ADXL375_READ;
ao_adxl375_start();
d[0] = addr | AO_ADXL375_READ;
ao_adxl375_start();
- ao_spi_send(d, 1, AO_ADXL375_SPI_INDEX);
- ao_spi_recv(d, 1, AO_ADXL375_SPI_INDEX);
+ ao_spi_duplex(d, d, 2, AO_ADXL375_SPI_INDEX);
ao_adxl375_stop();
ao_adxl375_stop();
- PRINTD(DEBUG_LOW, "read %x = %x\n", addr, d[
0
]);
+ PRINTD(DEBUG_LOW, "read %x = %x\n", addr, d[
1
]);
- return d[
0
];
+ return d[
1
];
}
static void
}
static void
@@
-75,11
+74,11
@@
ao_adxl375_reg_write(uint8_t addr, uint8_t value)
#if DEBUG & DEBUG_LOW
d[0] = addr | AO_ADXL375_READ;
#if DEBUG & DEBUG_LOW
d[0] = addr | AO_ADXL375_READ;
+ d[1] = 0;
ao_adxl375_start();
ao_adxl375_start();
- ao_spi_send(d, 1, AO_ADXL375_SPI_INDEX);
- ao_spi_recv(d, 1, AO_ADXL375_SPI_INDEX);
+ ao_spi_duplex(d, d, 2, AO_ADXL375_SPI_INDEX);
ao_adxl375_stop();
ao_adxl375_stop();
- PRINTD(DEBUG_LOW, "readback %x
\n", d[0
]);
+ PRINTD(DEBUG_LOW, "readback %x
%x\n", d[0], d[1
]);
#endif
}
#endif
}
@@
-90,9
+89,9
@@
ao_adxl375_value(struct ao_adxl375_sample *value)
d[0] = AO_ADXL375_DATAX0 | AO_ADXL375_READ | AO_ADXL375_MULTI_BYTE;
ao_adxl375_start();
d[0] = AO_ADXL375_DATAX0 | AO_ADXL375_READ | AO_ADXL375_MULTI_BYTE;
ao_adxl375_start();
- ao_spi_send(d, 1, AO_ADXL375_SPI_INDEX);
- ao_spi_recv(value, 6, AO_ADXL375_SPI_INDEX);
+ ao_spi_duplex(d, d, 7, AO_ADXL375_SPI_INDEX);
ao_adxl375_stop();
ao_adxl375_stop();
+ memcpy(value, &d[1], 6);
}
struct ao_adxl375_total {
}
struct ao_adxl375_total {