Diff: source/BlueNRGGap.cpp

Revision:

203:5b9c78101d45

Parent:

191:d22cc4715b0c

Parent:

201:a9bc2e8b01d7

Child:

212:8b5ff0f0186f

--- a/source/BlueNRGGap.cpp	Fri Nov 20 16:59:49 2015 +0100
+++ b/source/BlueNRGGap.cpp	Thu Dec 03 11:37:55 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){
@@ -1207,12 +1207,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);
@@ -1221,8 +1222,7 @@
     if(ret!=BLE_STATUS_SUCCESS) {
       return BLE_ERROR_UNSPECIFIED;
     }
-    
-    txPowerAdType = true;
+
     return BLE_ERROR_NONE;
 }