security manager conflict commented

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal by Lancaster University

Files at this revision

API Documentation at this revision

Comitter:
LancasterUniversity
Date:
Wed Jul 13 12:18:49 2016 +0100
Parent:
68:9dd4fb5caf0a
Child:
70:ce33cdf741b5
Commit message:
Synchronized with git rev 862528bb
Author: James Devine
microbit-dal: minor spelling corrections

Courtesy of @gbaman

Changed in this revision

inc/drivers/MicroBitMultiButton.h Show annotated file Show diff for this revision Revisions of this file
inc/drivers/MicroBitRadio.h Show annotated file Show diff for this revision Revisions of this file
inc/types/ManagedString.h Show annotated file Show diff for this revision Revisions of this file
inc/types/MicroBitImage.h Show annotated file Show diff for this revision Revisions of this file
source/drivers/MicroBitMultiButton.cpp Show annotated file Show diff for this revision Revisions of this file
source/drivers/MicroBitRadio.cpp Show annotated file Show diff for this revision Revisions of this file
source/types/ManagedString.cpp Show annotated file Show diff for this revision Revisions of this file
source/types/MicroBitImage.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/inc/drivers/MicroBitMultiButton.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/drivers/MicroBitMultiButton.h	Wed Jul 13 12:18:49 2016 +0100
@@ -148,7 +148,7 @@
 
     /**
       * Changes the event configuration of this button to the given MicroBitButtonEventConfiguration.
-      * All subsequent events generated by this button will then be informed by this configuraiton.
+      * All subsequent events generated by this button will then be informed by this configuration.
       *
       * @param config The new configuration for this button. Legal values are MICROBIT_BUTTON_ALL_EVENTS or MICROBIT_BUTTON_SIMPLE_EVENTS.
       *
@@ -173,4 +173,4 @@
     void onButtonEvent(MicroBitEvent evt);
 };
 
-#endif
+#endif
\ No newline at end of file
--- a/inc/drivers/MicroBitRadio.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/drivers/MicroBitRadio.h	Wed Jul 13 12:18:49 2016 +0100
@@ -208,7 +208,7 @@
       *
       * @return The buffer containing the the packet. If no data is available, NULL is returned.
       *
-      * @note Once recv() has been called, it is the callers resposibility to
+      * @note Once recv() has been called, it is the callers responsibility to
       *       delete the buffer when appropriate.
       */
     FrameBuffer* recv();
@@ -224,4 +224,4 @@
     int send(FrameBuffer *buffer);
 };
 
-#endif
+#endif
\ No newline at end of file
--- a/inc/types/ManagedString.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/types/ManagedString.h	Wed Jul 13 12:18:49 2016 +0100
@@ -199,7 +199,7 @@
       *
       * Called when one ManagedString is assigned the value of another.
       *
-      * If the ManagedString being assigned is already refering to a character buffer,
+      * If the ManagedString being assigned is already referring to a character buffer,
       * decrement the reference count and free up the buffer as necessary.
       *
       * Then, update our character buffer to refer to that of the supplied ManagedString,
--- a/inc/types/MicroBitImage.h	Wed Jul 13 12:18:48 2016 +0100
+++ b/inc/types/MicroBitImage.h	Wed Jul 13 12:18:49 2016 +0100
@@ -247,7 +247,7 @@
     int setPixelValue(int16_t x , int16_t y, uint8_t value);
 
     /**
-      * Retreives the value of a given pixel.
+      * Retrieves the value of a given pixel.
       *
       * @param x The x co-ordinate of the pixel to read. Must be within the dimensions of the image.
       *
@@ -287,7 +287,7 @@
     /**
       * Pastes a given bitmap at the given co-ordinates.
       *
-      * Any pixels in the relvant area of this image are replaced.
+      * Any pixels in the relevant area of this image are replaced.
       *
       * @param image The MicroBitImage to paste.
       *
@@ -477,4 +477,4 @@
     MicroBitImage clone();
 };
 
-#endif
+#endif
\ No newline at end of file
--- a/source/drivers/MicroBitMultiButton.cpp	Wed Jul 13 12:18:48 2016 +0100
+++ b/source/drivers/MicroBitMultiButton.cpp	Wed Jul 13 12:18:49 2016 +0100
@@ -208,7 +208,7 @@
 
 /**
   * Changes the event configuration of this button to the given MicroBitButtonEventConfiguration.
-  * All subsequent events generated by this button will then be informed by this configuraiton.
+  * All subsequent events generated by this button will then be informed by this configuration.
   *
   * @param config The new configuration for this button. Legal values are MICROBIT_BUTTON_ALL_EVENTS or MICROBIT_BUTTON_SIMPLE_EVENTS.
   *
@@ -295,4 +295,4 @@
 int MicroBitMultiButton::isPressed()
 {
     return ((status & MICROBIT_MULTI_BUTTON_STATE_1) && (status & MICROBIT_MULTI_BUTTON_STATE_2));
-}
+}
\ No newline at end of file
--- a/source/drivers/MicroBitRadio.cpp	Wed Jul 13 12:18:48 2016 +0100
+++ b/source/drivers/MicroBitRadio.cpp	Wed Jul 13 12:18:49 2016 +0100
@@ -74,7 +74,7 @@
         {
             uint8_t sample = NRF_RADIO->RSSISAMPLE;
 
-            // Associate this packet's rssi value with the data just 
+            // Associate this packet's rssi value with the data just
             // transferred by DMA receive
             MicroBitRadio::instance->setRSSI(sample);
 
@@ -443,7 +443,7 @@
   *
   * @return The buffer containing the the packet. If no data is available, NULL is returned.
   *
-  * @note Once recv() has been called, it is the callers resposibility to
+  * @note Once recv() has been called, it is the callers responsibility to
   *       delete the buffer when appropriate.
   */
 FrameBuffer* MicroBitRadio::recv()
--- a/source/types/ManagedString.cpp	Wed Jul 13 12:18:48 2016 +0100
+++ b/source/types/ManagedString.cpp	Wed Jul 13 12:18:49 2016 +0100
@@ -306,7 +306,7 @@
   *
   * Called when one ManagedString is assigned the value of another.
   *
-  * If the ManagedString being assigned is already refering to a character buffer,
+  * If the ManagedString being assigned is already referring to a character buffer,
   * decrement the reference count and free up the buffer as necessary.
   *
   * Then, update our character buffer to refer to that of the supplied ManagedString,
@@ -471,7 +471,7 @@
   *
   * @param index The position of the character to return.
   *
-  * @return the character at posisiton index, zero if index is invalid.
+  * @return the character at position index, zero if index is invalid.
   *
   * @code
   * MicroBitDisplay display;
--- a/source/types/MicroBitImage.cpp	Wed Jul 13 12:18:48 2016 +0100
+++ b/source/types/MicroBitImage.cpp	Wed Jul 13 12:18:49 2016 +0100
@@ -396,7 +396,7 @@
 }
 
 /**
-  * Retreives the value of a given pixel.
+  * Retrieves the value of a given pixel.
   *
   * @param x The x co-ordinate of the pixel to read. Must be within the dimensions of the image.
   *
@@ -469,7 +469,7 @@
 /**
   * Pastes a given bitmap at the given co-ordinates.
   *
-  * Any pixels in the relvant area of this image are replaced.
+  * Any pixels in the relevant area of this image are replaced.
   *
   * @param image The MicroBitImage to paste.
   *
@@ -884,4 +884,4 @@
 MicroBitImage MicroBitImage::clone()
 {
     return MicroBitImage(getWidth(), getHeight(), getBitmap());
-}
+}
\ No newline at end of file