X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_data.h;h=dda5de4c6638bc62161619c677f4a877c345c5b9;hp=3918f4e04e4b9cf6931fcb5aaa85ad50695bc083;hb=345e3c37a1cf619392b54589bb91b4caf7844810;hpb=8c92656576aff3ceab5bead3c835d96c36098fe7 diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h index 3918f4e0..dda5de4c 100644 --- a/src/kernel/ao_data.h +++ b/src/kernel/ao_data.h @@ -382,6 +382,7 @@ typedef int16_t angle_t; /* in degrees */ /* X axis is aligned in the other board axis (across) */ /* Z axis is aligned perpendicular to the board (through) */ +#ifndef ao_data_along #define ao_data_along(packet) ((packet)->mpu9250.accel_y) #define ao_data_across(packet) ((packet)->mpu9250.accel_x) #define ao_data_through(packet) ((packet)->mpu9250.accel_z) @@ -389,6 +390,7 @@ typedef int16_t angle_t; /* in degrees */ #define ao_data_roll(packet) ((packet)->mpu9250.gyro_y) #define ao_data_pitch(packet) ((packet)->mpu9250.gyro_x) #define ao_data_yaw(packet) ((packet)->mpu9250.gyro_z) +#endif static inline float ao_convert_gyro(float sensor) { @@ -425,9 +427,11 @@ typedef int16_t ao_mag_t; /* in raw sample units */ * sensors. Also, the Z axis is flipped in sign. */ +#ifndef ao_data_mag_along #define ao_data_mag_along(packet) ((packet)->mpu9250.mag_x) #define ao_data_mag_across(packet) ((packet)->mpu9250.mag_y) #define ao_data_mag_through(packet) ((packet)->mpu9250.mag_z) +#endif #endif