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 26:493daf8966fd, committed 2016-07-13

Comitter:
LancasterUniversity
Date:
Wed Jul 13 12:18:03 2016 +0100
Parent:
25:27299423d813
Child:
27:2f494ead23de
Commit message:
Synchronized with git rev c844e610
Author: James Devine
microbit-dal: fixed a warning in MicroBitBLEManager.cpp

Changed in this revision

inc/bluetooth/ExternalEvents.h Show annotated file Show diff for this revision Revisions of this file
source/bluetooth/MicroBitBLEManager.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/inc/bluetooth/ExternalEvents.h	Wed Jul 13 12:17:58 2016 +0100
+++ b/inc/bluetooth/ExternalEvents.h	Wed Jul 13 12:18:03 2016 +0100
@@ -31,7 +31,7 @@
   */
 
 #define MICROBIT_ID_BLE             1000
-#define MICROBIT_ID_BLE_UART        1001
+#define MICROBIT_ID_BLE_UART        1200
 
 #define MICROBIT_BLE_EVT_CONNECTED      1
 #define MICROBIT_BLE_EVT_DISCONNECTED   2

--- a/source/bluetooth/MicroBitBLEManager.cpp	Wed Jul 13 12:17:58 2016 +0100
+++ b/source/bluetooth/MicroBitBLEManager.cpp	Wed Jul 13 12:18:03 2016 +0100
@@ -110,7 +110,7 @@
 static void bleDisconnectionCallback(const Gap::DisconnectionCallbackParams_t *reason)
 {
     MicroBitEvent(MICROBIT_ID_BLE,MICROBIT_BLE_EVT_DISCONNECTED);
-    
+
     storeSystemAttributes(reason->handle);
 
     if (manager)
@@ -120,7 +120,7 @@
 /**
   * Callback when a BLE connection is established.
   */
-static void bleConnectionCallback(const Gap::ConnectionCallbackParams_t *params)
+static void bleConnectionCallback(const Gap::ConnectionCallbackParams_t*)
 {
     MicroBitEvent(MICROBIT_ID_BLE,MICROBIT_BLE_EVT_CONNECTED);
 }
@@ -277,7 +277,7 @@
     // automatically restart advertising after a device disconnects.
     ble->gap().onDisconnection(bleDisconnectionCallback);
     ble->gattServer().onSysAttrMissing(bleSysAttrMissingCallback);
-    
+
     // generate an event when a Bluetooth connection is established
     ble->gap().onConnection(bleConnectionCallback);