security manager conflict commented 2

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Revision:
36:6837feb07da4
Parent:
35:8ce23bc1af38
Child:
37:b624ae5e94a5
--- a/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:14 2016 +0100
+++ b/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:15 2016 +0100
@@ -342,6 +342,16 @@
     int getAnalogPeriod();
 
     /**
+      * Configures the pull of this pin.
+      *
+      * @param pull one of the mbed pull configurations: PullUp, PullDown, PullNone, OpenDrain
+      *
+      * @return MICROBIT_NOT_SUPPORTED if the current pin configuration is anything other
+      *         than a digital input, otherwise MICROBIT_OK.
+      */
+    int setPull(PinMode pull);
+
+    /**
       * Configures the events generated by this MicroBitPin instance.
       *
       * MICROBIT_PIN_EVENT_ON_EDGE - Configures this pin to a digital input, and generates events whenever a rise/fall is detected on this pin. (MICROBIT_PIN_EVT_RISE, MICROBIT_PIN_EVT_FALL)