security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
38:1a9e8e5e23f2
Parent:
1:8aa5cdb4ab67
Child:
39:112df23f039f
--- a/inc/drivers/MicroBitAccelerometer.h	Wed Jul 13 12:18:16 2016 +0100
+++ b/inc/drivers/MicroBitAccelerometer.h	Wed Jul 13 12:18:17 2016 +0100
@@ -155,8 +155,12 @@
                 x:1,
                 y:1,
                 z:1,
+                unused,
+                impulse_3,
+                impulse_6,
+                impulse_8,
                 count:4,
-                timer:8;
+                timer:4;
 };
 
 /**
@@ -176,6 +180,7 @@
     MicroBitI2C&    i2c;                // The I2C interface to use.
     float           roll;               // Roll of the device, in radians.
     uint8_t         sigma;              // the number of ticks that the instantaneous gesture has been stable.
+    uint8_t         impulseSigma;       // the number of ticks since an impulse event has been generated.
     BasicGesture    lastGesture;        // the last, stable gesture recorded.
     BasicGesture    currentGesture;     // the instantaneous, unfiltered gesture detected.
     ShakeHistory    shake;              // State information needed to detect shake events.
@@ -464,4 +469,4 @@
     BasicGesture instantaneousPosture();
 };
 
-#endif
+#endif
\ No newline at end of file