security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
31:87789e55bac7
Parent:
1:8aa5cdb4ab67
Child:
32:ece16b5987dd
--- a/inc/types/MicroBitEvent.h	Wed Jul 13 12:18:08 2016 +0100
+++ b/inc/types/MicroBitEvent.h	Wed Jul 13 12:18:10 2016 +0100
@@ -52,7 +52,7 @@
 
     uint16_t source;         // ID of the MicroBit Component that generated the event e.g. MICROBIT_ID_BUTTON_A.
     uint16_t value;          // Component specific code indicating the cause of the event.
-    uint32_t timestamp;      // Time at which the event was generated. ms since power on.
+    uint64_t timestamp;      // Time at which the event was generated. us since power on.
 
     /**
       * Constructor.
@@ -103,4 +103,4 @@
     MicroBitEventQueueItem(MicroBitEvent evt);
 };
 
-#endif
+#endif
\ No newline at end of file