X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_data.h;h=502df6c9e55afd5441fe48b7557218a23887fc2a;hb=a5a7df405c242593cbc828d5b66bbfc141a35947;hp=d28730a8af6cc29232dad17496d8b85e0c06f14d;hpb=dd73c9b441f7672fb9982c4caeb5178df30f5d2b;p=fw%2Faltos

diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index d28730a8..502df6c9 100644
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -26,20 +26,24 @@
 #include <ao_mpu6000.h>
 #endif
 
+#if HAS_HMC5883
+#include <ao_hmc5883.h>
+#endif
+
 struct ao_data {
 	uint16_t			tick;
 #if HAS_ADC
 	struct ao_adc			adc;
 #endif
-#if HAS_ACCEL_REF
-	uint16_t			accel_ref;
-#endif
 #if HAS_MS5607
 	struct ao_ms5607_sample		ms5607;
 #endif
 #if HAS_MPU6000
 	struct ao_mpu6000_sample	mpu6000;
 #endif
+#if HAS_HMC5883
+	struct ao_hmc5883_sample	hmc5883;
+#endif
 };
 
 #define ao_data_ring_next(n)	(((n) + 1) & (AO_DATA_RING - 1))
@@ -82,7 +86,7 @@ typedef int16_t alt_t;
  * ao_data_accel_invert	- flip rocket ends for positive acceleration
  */
 
-#if HAS_MPU6000
+#if HAS_MPU6000 && !HAS_HIGHG_ACCEL
 
 typedef int16_t accel_t;
 
@@ -96,7 +100,7 @@ typedef int16_t accel_t;
 
 typedef int16_t accel_t;
 #define ao_data_accel(packet)			((packet)->adc.accel)
-#define ao_data_set_accel(packet, accel)	((packet)->adc.accel = (accel))
+#define ao_data_set_accel(packet, a)		((packet)->adc.accel = (a))
 #define ao_data_accel_invert(a)			(0x7fff -(a))
 
 /*
@@ -181,9 +185,9 @@ typedef int16_t accel_t;
  */
 #if HAS_ACCEL_REF
 #define ao_data_accel_sample(packet) \
-	((uint16_t) ((((uint32_t) (packet)->adc.accel << 16) / ((packet)->accel_ref << 1))) >> 1)
+	((uint16_t) ((((uint32_t) (packet)->adc.accel << 16) / ((packet)->adc.accel_ref << 1))) >> 1)
 #else
-#define ao_data_accel(packet) ((packet)->adc.accel)
+#define ao_data_accel_sample(packet) ((packet)->adc.accel)
 #endif /* HAS_ACCEL_REF */
 
 #endif	/* else some other pressure sensor */