From: Keith Packard Date: Mon, 2 May 2016 23:19:39 +0000 (-0700) Subject: altos: Make sure AO_MMA655X_INVERT is declared where needed X-Git-Tag: 1.6.3~2^2~6 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b540f6f5b034f33b8e1d1c3b91e2403a56479caa altos: Make sure AO_MMA655X_INVERT is declared where needed Add #define AO_MMA655X_INVERT 0 to existing products which didn't declare it at all. This will make sure the value is set correctly for each new board. Signed-off-by: Keith Packard --- diff --git a/src/easymega-v1.0/ao_pins.h b/src/easymega-v1.0/ao_pins.h index a5e55638..773e58d9 100644 --- a/src/easymega-v1.0/ao_pins.h +++ b/src/easymega-v1.0/ao_pins.h @@ -321,6 +321,7 @@ struct ao_adc { */ #define HAS_MMA655X 1 +#define AO_MMA655X_INVERT 0 #define AO_MMA655X_SPI_INDEX AO_SPI_1_PB3_PB4_PB5 #define AO_MMA655X_CS_PORT (&stm_gpioc) #define AO_MMA655X_CS_PIN 12 diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h index 8f75ad87..6ee0965d 100644 --- a/src/kernel/ao_data.h +++ b/src/kernel/ao_data.h @@ -269,6 +269,10 @@ typedef int16_t accel_t; #define AO_ACCEL_INVERT 4095 +#ifndef AO_MMA655X_INVERT +#error AO_MMA655X_INVERT not defined +#endif + #define ao_data_accel(packet) ((packet)->mma655x) #if AO_MMA655X_INVERT #define ao_data_accel_cook(packet) (AO_ACCEL_INVERT - (packet)->mma655x) diff --git a/src/telemega-v0.1/ao_pins.h b/src/telemega-v0.1/ao_pins.h index 7ccc6085..1815ef54 100644 --- a/src/telemega-v0.1/ao_pins.h +++ b/src/telemega-v0.1/ao_pins.h @@ -346,6 +346,7 @@ struct ao_adc { */ #define HAS_MMA655X 1 +#define AO_MMA655X_INVERT 0 #define AO_MMA655X_SPI_INDEX AO_SPI_1_PE13_PE14_PE15 #define AO_MMA655X_CS_PORT (&stm_gpiod) #define AO_MMA655X_CS_PIN 4 diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h index 664546c2..b81e59a9 100644 --- a/src/telemega-v1.0/ao_pins.h +++ b/src/telemega-v1.0/ao_pins.h @@ -348,6 +348,7 @@ struct ao_adc { */ #define HAS_MMA655X 1 +#define AO_MMA655X_INVERT 0 #define AO_MMA655X_SPI_INDEX AO_SPI_1_PE13_PE14_PE15 #define AO_MMA655X_CS_PORT (&stm_gpiod) #define AO_MMA655X_CS_PIN 4 diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h index 9095a350..242f0ab2 100644 --- a/src/telemega-v2.0/ao_pins.h +++ b/src/telemega-v2.0/ao_pins.h @@ -348,6 +348,7 @@ struct ao_adc { */ #define HAS_MMA655X 1 +#define AO_MMA655X_INVERT 0 #define AO_MMA655X_SPI_INDEX AO_SPI_1_PE13_PE14_PE15 #define AO_MMA655X_CS_PORT (&stm_gpiod) #define AO_MMA655X_CS_PIN 4