altos: Fix ADXL375 SPI mode definitions and usage

3-wire mode is 1, 4-wire mode is 0. Fortunately, I also messed up the
shift value, so the 1 got shifted on top of one of the fixed-value bits.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c
index b2d3178f9b7ef364e5d6ec00a5ccee2059a67e2b..6f998fedb7de38abc50cb4278b9682f96a7f6080 100644 (file)
--- a/src/drivers/ao_adxl375.c
+++ b/src/drivers/ao_adxl375.c
@@ -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))
 

diff --git a/src/drivers/ao_adxl375.h b/src/drivers/ao_adxl375.h
index fe448fd0e27857d06592188d5aa38548ca5b6348..32fe0fac30247948e710c3d9b8fcaaf080ea64d9 100644 (file)
--- a/src/drivers/ao_adxl375.h
+++ b/src/drivers/ao_adxl375.h
@@ -72,8 +72,8 @@
 # define AO_ADXL375_DATA_FORMAT_FIXED          0x0b    /* these bits must be set to 1 */
 # define AO_ADXL375_DATA_FORMAT_SELF_TEST      7
 # define AO_ADXL375_DATA_FORMAT_SPI            6
-# define  AO_ADXL375_DATA_FORMAT_SPI_3_WIRE            0
-# define  AO_ADXL375_DATA_FORMAT_SPI_4_WIRE            1
+# define  AO_ADXL375_DATA_FORMAT_SPI_3_WIRE            1
+# define  AO_ADXL375_DATA_FORMAT_SPI_4_WIRE            0
 # define AO_ADXL375_DATA_FORMAT_INT_INVERT     5
 # define AO_ADXL375_DATA_FORMAT_JUSTIFY                2
 #define AO_ADXL375_DATAX0              0x32