Goran Mahovlic / nRF51822_BLE_MIDI

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   BLE_MIDI

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 449:fd09f590751b, committed 2015-11-02

Comitter:
rgrover1
Date:
Mon Nov 02 09:05:09 2015 +0000
Parent:
448:1ed5645452e8
Child:
450:e718f00626f2
Commit message:
Synchronized with git rev eab6631c
Author: Jean-Philippe Brucker
Update S110 detection macros again

The mbed SDK actually prefixes all labels from targets.py with "TARGET_".
Update our detection macros accordingly.

Changed in this revision

LICENSE Show annotated file Show diff for this revision Revisions of this file
source/btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
source/btle/btle_discovery.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGap.h Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGattClient.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGattClient.h Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGattServer.cpp Show annotated file Show diff for this revision Revisions of this file
source/nordic-sdk/components/softdevice/s130/include/ble_gap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/LICENSE	Mon Nov 02 09:05:09 2015 +0000
+++ b/LICENSE	Mon Nov 02 09:05:09 2015 +0000
@@ -1,6 +1,6 @@
 Many of the files in this module have been inherited from the Nordic SDK for
-nRF51822; they come with a BSD-like license offered by Nordic for use in mbed.
-Some other files come from the mbed SDK, and are licensed under Apache-2.0.
+nRF51822; they come with a BSD-like license offered by Nordic for use with mbed.
+Others come from the mbed SDK, and are licensed under Apache-2.0.
 Unless specifically indicated otherwise in a file, files are licensed
 under the Apache 2.0 license, as can be found in: apache-2.0.txt.
 The BSD-like Nordic license can be found in BSD-3clause-Nordic.txt
\ No newline at end of file

--- a/source/btle/btle.cpp	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/btle/btle.cpp	Mon Nov 02 09:05:09 2015 +0000
@@ -133,7 +133,7 @@
 
     dm_ble_evt_handler(p_ble_evt);
 
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
     bleGattcEventHandler(p_ble_evt);
 #endif
 
@@ -141,7 +141,7 @@
     switch (p_ble_evt->header.evt_id) {
         case BLE_GAP_EVT_CONNECTED: {
             Gap::Handle_t handle = p_ble_evt->evt.gap_evt.conn_handle;
-#if defined(MCU_NRF51_16K_S110) || defined(MCU_NRF51_32K_S110)
+#if defined(TARGET_MCU_NRF51_16K_S110) || defined(TARGET_MCU_NRF51_32K_S110)
             /* Only peripheral role is supported by S110 */
             Gap::Role_t role = Gap::PERIPHERAL;
 #else

--- a/source/btle/btle_discovery.cpp	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/btle/btle_discovery.cpp	Mon Nov 02 09:05:09 2015 +0000
@@ -17,7 +17,7 @@
 #include "nRF5xServiceDiscovery.h"
 #include "nRF5xGattClient.h"
 
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
 void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
 {
     nRF5xServiceDiscovery &sdSingleton = nRF5xGattClient::getInstance().discovery;

--- a/source/nRF5xGap.h	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/nRF5xGap.h	Mon Nov 02 09:05:09 2015 +0000
@@ -81,7 +81,7 @@
     }
 
 /* Observer role is not supported by S110, return BLE_ERROR_NOT_IMPLEMENTED */
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
     virtual ble_error_t startRadioScan(const GapScanningParams &scanningParams) {
         ble_gap_scan_params_t scanParams = {
             .active      = scanningParams.getActiveScanning(), /**< If 1, perform active scanning (scan requests). */

--- a/source/nRF5xGattClient.cpp	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/nRF5xGattClient.cpp	Mon Nov 02 09:05:09 2015 +0000
@@ -22,7 +22,7 @@
     return nRFGattClientSingleton;
 }
 
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
 ble_error_t
 nRF5xGattClient::launchServiceDiscovery(Gap::Handle_t                               connectionHandle,
                                         ServiceDiscovery::ServiceCallback_t         sc,

--- a/source/nRF5xGattClient.h	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/nRF5xGattClient.h	Mon Nov 02 09:05:09 2015 +0000
@@ -29,7 +29,7 @@
      * When using S110, all Gatt client features will return
      * BLE_ERROR_NOT_IMPLEMENTED
      */
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
 
     /**
      * Launch service discovery. Once launched, service discovery will remain

--- a/source/nRF5xGattServer.cpp	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/nRF5xGattServer.cpp	Mon Nov 02 09:05:09 2015 +0000
@@ -45,6 +45,7 @@
 /**************************************************************************/
 ble_error_t nRF5xGattServer::addService(GattService &service)
 {
+    /* ToDo: Make sure we don't overflow the array, etc. */
     /* ToDo: Make sure this service UUID doesn't already exist (?) */
     /* ToDo: Basic validation */
 
@@ -62,10 +63,7 @@
 
     /* Add characteristics to the service */
     for (uint8_t i = 0; i < service.getCharacteristicCount(); i++) {
-		if (characteristicCount >= BLE_TOTAL_CHARACTERISTICS) {
-			return BLE_ERROR_NO_MEM;
-		}
-		GattCharacteristic *p_char = service.getCharacteristic(i);
+        GattCharacteristic *p_char = service.getCharacteristic(i);
 
         /* Skip any incompletely defined, read-only characteristics. */
         if ((p_char->getValueAttribute().getValuePtr() == NULL) &&
@@ -110,12 +108,9 @@
         characteristicCount++;
 
         /* Add optional descriptors if any */
+        /* ToDo: Make sure we don't overflow the array */
         for (uint8_t j = 0; j < p_char->getDescriptorCount(); j++) {
-    		if (descriptorCount >= BLE_TOTAL_DESCRIPTORS) {
-    			return BLE_ERROR_NO_MEM;
-    		}
-
-			GattAttribute *p_desc = p_char->getDescriptor(j);
+            GattAttribute *p_desc = p_char->getDescriptor(j);
             /* skip the user-description-descriptor here; this has already been handled when adding the characteristic (above). */
             if (p_desc->getUUID() == BLE_UUID_DESCRIPTOR_CHAR_USER_DESC) {
                 continue;

--- a/source/nordic-sdk/components/softdevice/s130/include/ble_gap.h	Mon Nov 02 09:05:09 2015 +0000
+++ b/source/nordic-sdk/components/softdevice/s130/include/ble_gap.h	Mon Nov 02 09:05:09 2015 +0000
@@ -547,7 +547,7 @@
 {
   ble_gap_addr_t        peer_addr;              /**< Bluetooth address of the peer device. */
   ble_gap_addr_t        own_addr;               /**< Bluetooth address of the local device used during connection setup. */
-#if !defined(MCU_NRF51_16K_S110) && !defined(MCU_NRF51_32K_S110)
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
   uint8_t               role;                   /**< BLE role for this connection, see @ref BLE_GAP_ROLES */
 #endif
   uint8_t               irk_match :1;           /**< If 1, peer device's address resolved using an IRK. */