From: Keith Packard Date: Thu, 7 Apr 2022 05:14:32 +0000 (-0700) Subject: altos: Fix ADXL375 SPI mode definitions and usage X-Git-Tag: 1.9.12~1^2~17^2~8 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b930b52922a1bbb34cb3fda67c2e9b4695a7330f 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 --- diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c index b2d3178f..6f998fed 100644 --- 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 fe448fd0..32fe0fac 100644 --- 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