Merge remote-tracking branch 'origin/telemini'

[fw/altos] / src / core / ao_data.h

diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index b0f086f867285cf111d865b48bd0a684d0fd41d6..339afe69882602e3730ff66543236b9f17e644b7 100644 (file)
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -101,7 +101,7 @@ extern volatile __data uint8_t              ao_data_count;
  * signaled by the timer tick
  */
 #define AO_DATA_WAIT() do {                            \
-               ao_sleep((void *) &ao_data_count);      \
+               ao_sleep(DATA_TO_XDATA ((void *) &ao_data_count));      \
        } while (0)
 
 #endif /* AO_DATA_RING */
@@ -272,7 +272,11 @@ typedef int16_t accel_t;
 /* MMA655X is hooked up so that positive values represent negative acceleration */
 
 #define ao_data_accel(packet)                  ((packet)->mma655x)
+#if AO_MMA655X_INVERT
+#define ao_data_accel_cook(packet)             (4095 - (packet)->mma655x)
+#else
 #define ao_data_accel_cook(packet)             ((packet)->mma655x)
+#endif
 #define ao_data_set_accel(packet, accel)       ((packet)->mma655x = (accel))
 #define ao_data_accel_invert(accel)            (4095 - (accel))