From 8f8d67c94b15459c3f24b2162a82bd38fb4f0f2f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 8 Apr 2020 17:22:21 -0700 Subject: [PATCH] altos: Support bmx160-only configs Get z-axis accel from bmx160 data Signed-off-by: Keith Packard --- src/kernel/ao_data.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h index 56fada68..b28c76b7 100644 --- a/src/kernel/ao_data.h +++ b/src/kernel/ao_data.h @@ -135,6 +135,9 @@ struct ao_data { #endif #if HAS_BMX160 struct ao_bmx160_sample bmx160; +#if !HAS_ADXL375 + int16_t z_accel; +#endif #endif }; @@ -444,6 +447,19 @@ static inline float ao_convert_accel(int16_t sensor) #endif +#if !HAS_ACCEL && HAS_BMX160 + +#define HAS_ACCEL 1 + +typedef int16_t accel_t; + +#define ao_data_accel(packet) ((packet)->z_accel) +#define ao_data_accel_cook(packet) ((packet)->bmx160.acc_y) +#define ao_data_set_accel(packet, accel) ((packet)->z_accel = (accel)) +#define ao_data_accel_invert(a) (-(a)) + +#endif + #if !HAS_GYRO && HAS_BMX160 #define HAS_GYRO 1 -- 2.47.2