X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_adxl375.c;h=9e5666cc5d6dcb83ea11697e676ba3b544555f01;hb=c1708f3fa4ff412da8817ba0fa58d05fe7ef44f5;hp=c7cf78af7d8f7940c985a10c2171630a6c606d77;hpb=341157c7415fcf879696c9d8167722a0c5ff264c;p=fw%2Faltos

diff --git a/src/drivers/ao_adxl375.c b/src/drivers/ao_adxl375.c
index c7cf78af..9e5666cc 100644
--- a/src/drivers/ao_adxl375.c
+++ b/src/drivers/ao_adxl375.c
@@ -21,7 +21,7 @@
 #define DEBUG		0
 
 #if DEBUG
-#define PRINTD(l, ...) do { if (DEBUG & (l)) { printf ("\r%5u %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } } while(0)
+#define PRINTD(l, ...) do { if (DEBUG & (l)) { printf ("\r%5lu %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); flush(); } } while(0)
 #else
 #define PRINTD(l,...)
 #endif
@@ -55,7 +55,7 @@ ao_adxl375_reg_read(uint8_t addr)
 	ao_spi_duplex(d, d, 2, AO_ADXL375_SPI_INDEX);
 	ao_adxl375_stop();
 
-	PRINTD(DEBUG_LOW, "read %x = %x\n", addr, d);
+	PRINTD(DEBUG_LOW, "read %x = %x\n", addr, d[1]);
 
 	return d[1];
 }
@@ -73,7 +73,7 @@ ao_adxl375_reg_write(uint8_t addr, uint8_t value)
 	ao_adxl375_stop();
 
 #if DEBUG & DEBUG_LOW
-	d[0] = addr | AO_ADXL375_READ
+	d[0] = addr | AO_ADXL375_READ;
 	d[1] = 0;
 	ao_adxl375_start();
 	ao_spi_duplex(d, d, 2, AO_ADXL375_SPI_INDEX);
@@ -105,7 +105,7 @@ struct ao_adxl375_total {
 
 #define MIN_LSB_G	18.4
 #define MAX_LSB_G	22.6
-#define SELF_TEST_MIN_G	6.0
+#define SELF_TEST_MIN_G	5.0
 #define SELF_TEST_MAX_G	6.8
 
 #define MIN_SELF_TEST	((int32_t) (MIN_LSB_G * SELF_TEST_MIN_G * AO_ADXL375_SELF_TEST_SAMPLES + 0.5))
@@ -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))