altos: Add SPI bus parameter to ao_spi_speed

[fw/altos] / src / drivers / ao_adxl375.c

diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c
index b2d3178f9b7ef364e5d6ec00a5ccee2059a67e2b..70bf92a5f1fb72e6a44d0f711de58623a711a222 100644 (file)
--- a/src/drivers/ao_adxl375.c
+++ b/src/drivers/ao_adxl375.c
@@ -18,7 +18,7 @@
 #define DEBUG_LOW      1
 #define DEBUG_HIGH     2
 
-#define DEBUG          3
+#define DEBUG          0
 
 #if DEBUG
 #define PRINTD(l, ...) do { if (DEBUG & (l)) { printf ("\r%5lu %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } } while(0)
@@ -26,7 +26,7 @@
 #define PRINTD(l,...)
 #endif
 
-#define AO_ADXL375_SPI_SPEED   ao_spi_speed(5000000)
+#define AO_ADXL375_SPI_SPEED   ao_spi_speed(AO_ADXL375_SPI_INDEX, 5000000)
 
 struct ao_adxl375_sample       ao_adxl375_current;
 
@@ -129,7 +129,7 @@ ao_adxl375_total_value(struct ao_adxl375_total *total, int samples)
 #define AO_ADXL375_DATA_FORMAT_SETTINGS(self_test) (                   \
                AO_ADXL375_DATA_FORMAT_FIXED |                          \
                (self_test << AO_ADXL375_DATA_FORMAT_SELF_TEST) |       \
-               (AO_ADXL375_DATA_FORMAT_SPI_4_WIRE << AO_ADXL375_DATA_FORMAT_SPI_4_WIRE) | \
+               (AO_ADXL375_DATA_FORMAT_SPI_4_WIRE << AO_ADXL375_DATA_FORMAT_SPI) | \
                (0 << AO_ADXL375_DATA_FORMAT_INT_INVERT) |              \
                (0 << AO_ADXL375_DATA_FORMAT_JUSTIFY))