From 6d55d03587e9f71a7e8320a6b36fde25edc63b28 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 22 Nov 2019 17:18:58 -0800 Subject: [PATCH] altos: TeleMetrum v3.0 has ADXL375 and Max-8Q Replacce the mma655x driver with the adxl375 driver Signed-off-by: Keith Packard --- src/telemetrum-v3.0/Makefile | 4 ++-- src/telemetrum-v3.0/ao_pins.h | 17 +++++++++-------- src/telemetrum-v3.0/ao_telemetrum.c | 10 ++-------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/telemetrum-v3.0/Makefile b/src/telemetrum-v3.0/Makefile index fb379aa7..68a540c4 100644 --- a/src/telemetrum-v3.0/Makefile +++ b/src/telemetrum-v3.0/Makefile @@ -18,7 +18,7 @@ INC = \ ao_kalman.h \ ao_product.h \ ao_ms5607.h \ - ao_mma655x.h \ + ao_adxl375.h \ ao_cc1200_CC1200.h \ ao_profile.h \ ao_task.h \ @@ -64,7 +64,7 @@ ALTOS_SRC = \ ao_fec_rx.c \ ao_data.c \ ao_ms5607.c \ - ao_mma655x.c \ + ao_adxl375.c \ ao_adc_stm.c \ ao_beep_stm.c \ ao_storage.c \ diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h index f4ccc9f3..68bec1be 100644 --- a/src/telemetrum-v3.0/ao_pins.h +++ b/src/telemetrum-v3.0/ao_pins.h @@ -277,15 +277,16 @@ struct ao_adc { #define HAS_HIGHG_ACCEL 1 -/* - * mma655x - */ +/* ADXL375 */ + +#define HAS_ADXL375 1 +#define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3) +#define AO_ADXL375_CS_PORT (&stm_gpiob) +#define AO_ADXL375_CS_PIN 9 +#define AO_ADXL375_SPI_SPEED AO_SPI_SPEED_4MHz -#define HAS_MMA655X 1 -#define AO_MMA655X_SPI_INDEX AO_SPI_1_PB3_PB4_PB5 -#define AO_MMA655X_CS_PORT (&stm_gpiob) -#define AO_MMA655X_CS_PIN 9 -#define AO_MMA655X_INVERT 1 +#define AO_ADXL375_AXIS x +#define AO_ADXL375_INVERT 1 #define NUM_CMDS 16 diff --git a/src/telemetrum-v3.0/ao_telemetrum.c b/src/telemetrum-v3.0/ao_telemetrum.c index d75f339d..148e1f70 100644 --- a/src/telemetrum-v3.0/ao_telemetrum.c +++ b/src/telemetrum-v3.0/ao_telemetrum.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -52,17 +52,11 @@ main(void) ao_exti_init(); ao_adc_init(); -#if HAS_BEEP ao_beep_init(); -#endif ao_cmd_init(); -#if HAS_MS5607 ao_ms5607_init(); -#endif -#if HAS_MMA655X - ao_mma655x_init(); -#endif + ao_adxl375_init(); ao_eeprom_init(); -- 2.30.2