Wouter van Kleunen / X_NUCLEO_IDB0XA1

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.

Fork of X_NUCLEO_IDB0XA1 by ST

Files at this revision

API Documentation at this revision

Revision 201:a9bc2e8b01d7, committed 2015-12-03

Comitter:
Andrea Palmieri
Date:
Thu Dec 03 10:24:19 2015 +0100
Parent:
200:cf070598d231
Child:
202:caf4864292c1
Commit message:
Fix power level settings in setTxPower API

Signed-off-by: Andrea Palmieri <andrea.palmieri@st.com>

Changed in this revision

source/BlueNRGGap.cpp Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/BlueNRGGap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/BlueNRGGap.cpp	Tue Nov 24 08:18:35 2015 +0100
+++ b/source/BlueNRGGap.cpp	Thu Dec 03 10:24:19 2015 +0100
@@ -468,9 +468,9 @@
         }
       }
 
-      // If ADV Data Type is MANUFACTURER SPECIFIC, then the TxP is set implicitly
-      // (i.e., w/o calling setTxPower()
-      if(txPowerAdType || AdvData[1]==AD_TYPE_MANUFACTURER_SPECIFIC_DATA) {
+      // If ADV Data Type is SERVICE DATA or MANUFACTURER SPECIFIC DATA,
+      // we need to delete it to make the needed room in ADV payload
+      if(AdvData[1]==AD_TYPE_SERVICE_DATA || AdvData[1]==AD_TYPE_MANUFACTURER_SPECIFIC_DATA) {
         PRINTF("!!!calling aci_gap_delete_ad_type(AD_TYPE_TX_POWER_LEVEL)!!!\n");
         ret = aci_gap_delete_ad_type(AD_TYPE_TX_POWER_LEVEL);
         if (BLE_STATUS_SUCCESS!=ret){
@@ -1200,12 +1200,13 @@
     tBleStatus ret;
     
     int8_t enHighPower = 0;
-    int8_t paLevel = 0;    
-#ifdef DEBUG
+    int8_t paLevel = 0;
+
     int8_t dbmActuallySet = getHighPowerAndPALevelValue(txPower, enHighPower, paLevel);
-#else
+
+#ifndef DEBUG
     /* avoid compiler warnings about unused variables */
-    (void)txPower;
+    (void)dbmActuallySet;
 #endif
     
     PRINTF("txPower=%d, dbmActuallySet=%d\n\r", txPower, dbmActuallySet);
@@ -1214,8 +1215,7 @@
     if(ret!=BLE_STATUS_SUCCESS) {
       return BLE_ERROR_UNSPECIFIED;
     }
-    
-    txPowerAdType = true;
+
     return BLE_ERROR_NONE;
 }
 

--- a/x-nucleo-idb0xa1/BlueNRGGap.h	Tue Nov 24 08:18:35 2015 +0100
+++ b/x-nucleo-idb0xa1/BlueNRGGap.h	Thu Dec 03 10:24:19 2015 +0100
@@ -166,8 +166,6 @@
 
     uint8_t *local_name;
     uint8_t local_name_length;
-    
-    bool txPowerAdType;
 
     uint8_t servUuidlength;
     uint8_t servUuidData[UUID_BUFFER_SIZE];