security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
65:f7ebabf23e15
Parent:
56:1311cac15dda
--- a/inc/drivers/MicroBitAccelerometer.h	Wed Jul 13 12:18:43 2016 +0100
+++ b/inc/drivers/MicroBitAccelerometer.h	Wed Jul 13 12:18:45 2016 +0100
@@ -97,12 +97,13 @@
 #define MICROBIT_ACCELEROMETER_REST_TOLERANCE               200
 #define MICROBIT_ACCELEROMETER_TILT_TOLERANCE               200
 #define MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE           400
-#define MICROBIT_ACCELEROMETER_SHAKE_TOLERANCE              1000
+#define MICROBIT_ACCELEROMETER_SHAKE_TOLERANCE              400
 #define MICROBIT_ACCELEROMETER_3G_TOLERANCE                 3072
 #define MICROBIT_ACCELEROMETER_6G_TOLERANCE                 6144
 #define MICROBIT_ACCELEROMETER_8G_TOLERANCE                 8192
-#define MICROBIT_ACCELEROMETER_GESTURE_DAMPING              10
-#define MICROBIT_ACCELEROMETER_SHAKE_DAMPING                10
+#define MICROBIT_ACCELEROMETER_GESTURE_DAMPING              5
+#define MICROBIT_ACCELEROMETER_SHAKE_DAMPING                10 
+#define MICROBIT_ACCELEROMETER_SHAKE_RTX                    30
 
 #define MICROBIT_ACCELEROMETER_REST_THRESHOLD               (MICROBIT_ACCELEROMETER_REST_TOLERANCE * MICROBIT_ACCELEROMETER_REST_TOLERANCE)
 #define MICROBIT_ACCELEROMETER_FREEFALL_THRESHOLD           (MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE * MICROBIT_ACCELEROMETER_FREEFALL_TOLERANCE)
@@ -144,8 +145,9 @@
                 impulse_3,
                 impulse_6,
                 impulse_8,
-                count:4,
-                timer:4;
+                count:8;
+
+    uint16_t    timer;
 };
 
 /**