Wendy Warne / microbit-dal

updates

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal-eddystone by Martin Woolley

Files at this revision

API Documentation at this revision

Revision 45:23b71960fe6c, committed 2016-07-13

Comitter:
LancasterUniversity
Date:
Wed Jul 13 12:18:24 2016 +0100
Parent:
44:bb4aa1985f37
Child:
46:c5bb7af0a3f0
Commit message:
Synchronized with git rev e9353806

Changed in this revision

inc/drivers/MicroBitPin.h Show annotated file Show diff for this revision Revisions of this file
source/drivers/MicroBitCompass.cpp Show annotated file Show diff for this revision Revisions of this file
source/drivers/MicroBitPin.cpp Show annotated file Show diff for this revision Revisions of this file
source/drivers/MicroBitThermometer.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:23 2016 +0100
+++ b/inc/drivers/MicroBitPin.h	Wed Jul 13 12:18:24 2016 +0100
@@ -72,10 +72,8 @@
 enum PinCapability{
     PIN_CAPABILITY_DIGITAL = 0x01,
     PIN_CAPABILITY_ANALOG = 0x02,
-    PIN_CAPABILITY_TOUCH = 0x04,
     PIN_CAPABILITY_AD = PIN_CAPABILITY_DIGITAL | PIN_CAPABILITY_ANALOG,
-    PIN_CAPABILITY_ALL = PIN_CAPABILITY_DIGITAL | PIN_CAPABILITY_ANALOG | PIN_CAPABILITY_TOUCH
-
+    PIN_CAPABILITY_ALL = PIN_CAPABILITY_DIGITAL | PIN_CAPABILITY_ANALOG
 };
 
 /**
@@ -117,7 +115,7 @@
       * @param name the mbed PinName for this MicroBitPin instance.
       *
       * @param capability the capabilities this MicroBitPin instance should have.
-      *                   (PIN_CAPABILITY_DIGITAL, PIN_CAPABILITY_ANALOG, PIN_CAPABILITY_TOUCH, PIN_CAPABILITY_AD, PIN_CAPABILITY_ALL)
+      *                   (PIN_CAPABILITY_DIGITAL, PIN_CAPABILITY_ANALOG, PIN_CAPABILITY_AD, PIN_CAPABILITY_ALL)
       *
       * @code
       * MicroBitPin P0(MICROBIT_ID_IO_P0, MICROBIT_PIN_P0, PIN_CAPABILITY_ALL);

--- a/source/drivers/MicroBitCompass.cpp	Wed Jul 13 12:18:23 2016 +0100
+++ b/source/drivers/MicroBitCompass.cpp	Wed Jul 13 12:18:24 2016 +0100
@@ -55,7 +55,7 @@
 
     if(this->storage != NULL)
     {
-        KeyValuePair *calibrationData =  storage->get("compassCal");
+        KeyValuePair *calibrationData =  storage->get(ManagedString("compassCal"));
 
         if(calibrationData != NULL)
         {

--- a/source/drivers/MicroBitPin.cpp	Wed Jul 13 12:18:23 2016 +0100
+++ b/source/drivers/MicroBitPin.cpp	Wed Jul 13 12:18:24 2016 +0100
@@ -43,7 +43,7 @@
   * @param name the mbed PinName for this MicroBitPin instance.
   *
   * @param capability the capabilities this MicroBitPin instance should have.
-  *                   (PIN_CAPABILITY_DIGITAL, PIN_CAPABILITY_ANALOG, PIN_CAPABILITY_TOUCH, PIN_CAPABILITY_AD, PIN_CAPABILITY_ALL)
+  *                   (PIN_CAPABILITY_DIGITAL, PIN_CAPABILITY_ANALOG, PIN_CAPABILITY_AD, PIN_CAPABILITY_ALL)
   *
   * @code
   * MicroBitPin P0(MICROBIT_ID_IO_P0, MICROBIT_PIN_P0, PIN_CAPABILITY_ALL);
@@ -332,7 +332,7 @@
 int MicroBitPin::isTouched()
 {
     //check if this pin has a touch mode...
-    if(!(PIN_CAPABILITY_TOUCH & capability))
+    if(!(PIN_CAPABILITY_DIGITAL & capability))
         return MICROBIT_NOT_SUPPORTED;
 
     // Move into a touch input state if necessary.

--- a/source/drivers/MicroBitThermometer.cpp	Wed Jul 13 12:18:23 2016 +0100
+++ b/source/drivers/MicroBitThermometer.cpp	Wed Jul 13 12:18:24 2016 +0100
@@ -71,7 +71,7 @@
     this->sampleTime = 0;
     this->offset = 0;
 
-    KeyValuePair *tempCalibration =  storage->get("tempCal");
+    KeyValuePair *tempCalibration =  storage->get(ManagedString("tempCal"));
 
     if(tempCalibration != NULL)
     {