Revision 16:8aeb0c44869b, committed 2014-08-07

Comitter:

hemddabral

Date:

Thu Aug 07 09:33:27 2014 +0000

Parent:

15:9e6ebe2152ac

Child:

17:63059fcb8db2

Child:

18:6d5f4c638f6a

Commit message:

changes done: (1) DEBUG macro moved to Utils (2) Advertising interval implementation done;

Changed in this revision

--- a/BlueNRGGap.cpp	Wed Aug 06 11:05:48 2014 +0000
+++ b/BlueNRGGap.cpp	Thu Aug 07 09:33:27 2014 +0000
@@ -26,7 +26,7 @@
 uint8_t servUuidlength = 0;
 uint8_t* servUuidData = NULL;
 
-Serial pc1(USBTX, USBRX); // tx, rx. For obtaining logs on terminal
+uint32_t advtInterval = 0;
 
 /**************************************************************************/
 /*!
@@ -86,10 +86,10 @@
                 case GapAdvertisingData::INCOMPLETE_LIST_16BIT_SERVICE_IDS:  /**< Incomplete list of 16-bit Service IDs */
                 break;
                 case GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS:    /**< Complete list of 16-bit Service IDs */
-                    pc1.printf("Advertising type: COMPLETE_LIST_16BIT_SERVICE_IDS\n");
+                    DEBUG("Advertising type: COMPLETE_LIST_16BIT_SERVICE_IDS\n");
                     servUuidlength = load.getLengthAtIndex(index)-1;
                     servUuidData = load.getDataAtIndex(index);
-                    pc1.printf("servUuidlength=%d\n", servUuidlength);
+                    DEBUG("servUuidlength=%d\n", servUuidlength);
                     break;
                 case GapAdvertisingData::INCOMPLETE_LIST_32BIT_SERVICE_IDS:  /**< Incomplete list of 32-bit Service IDs (not relevant for Bluetooth 4.0) */
                 break;
@@ -102,11 +102,11 @@
                 case GapAdvertisingData::SHORTENED_LOCAL_NAME:               /**< Shortened Local Name */
                 break;
                 case GapAdvertisingData::COMPLETE_LOCAL_NAME:                /**< Complete Local Name */
-                    pc1.printf("Advertising type: COMPLETE_LOCAL_NAME\n");
+                    DEBUG("Advertising type: COMPLETE_LOCAL_NAME\n");
                     const char *device_name = NULL;
                     device_name = (const char*)load.getDataAtIndex(index);  // to be set later when startAdvertising() is called
-                    pc1.printf("input: device_name= %s...\n", device_name);
-                    pc1.printf("input: device_name length= %d...\n", load.getLengthAtIndex(index)-1);                                              
+                    DEBUG("input: device_name= %s...\n", device_name);
+                    DEBUG("input: device_name length= %d...\n", load.getLengthAtIndex(index)-1);                                              
                     char *namePtr = new char[load.getLengthAtIndex(index)];
                     namePtr[0] = AD_TYPE_COMPLETE_LOCAL_NAME;
                     strcpy(namePtr+1, device_name);
@@ -115,19 +115,19 @@
                     // also set device name in GAP service 
                     aci_gatt_update_char_value(g_gap_service_handle, g_device_name_char_handle, 0, local_name_length, (tHalUint8 *)local_name);
                     
-                    pc1.printf("setting name to: %s...\n", namePtr+1);
-                    pc1.printf("name string length: %d...\n", local_name_length+1);    // This includes 'AD_TYPE_COMPLETE_LOCAL_NAME' byte                
-                    pc1.printf("device_name length=%d", local_name_length);                                    
+                    DEBUG("setting name to: %s...\n", namePtr+1);
+                    DEBUG("name string length: %d...\n", local_name_length+1);    // This includes 'AD_TYPE_COMPLETE_LOCAL_NAME' byte                
+                    DEBUG("device_name length=%d", local_name_length);                                    
                     break;
                 
                 case GapAdvertisingData::TX_POWER_LEVEL:                     /**< TX Power Level (in dBm) */
-                    pc1.printf("Advertising type: TX_POWER_LEVEL\n");
+                    DEBUG("Advertising type: TX_POWER_LEVEL\n");
                     int8_t dbm = load.getInt8AtIndex(index);
                     int8_t enHighPower = 0;
                     int8_t paLevel = 0;
                     int8_t dbmActuallySet = getHighPowerAndPALevelValue(dbm, enHighPower, paLevel);
-                    pc1.printf("dbm=%d, dbmActuallySet=%d\n", dbm, dbmActuallySet);
-                    pc1.printf("enHighPower=%d, paLevel=%d\n", enHighPower, paLevel);
+                    DEBUG("dbm=%d, dbmActuallySet=%d\n", dbm, dbmActuallySet);
+                    DEBUG("enHighPower=%d, paLevel=%d\n", enHighPower, paLevel);
                     aci_hal_set_tx_power_level(enHighPower, paLevel);
                     break;
                 case GapAdvertisingData::DEVICE_ID:                          /**< Device ID */
@@ -141,14 +141,16 @@
                     Tested with GapAdvertisingData::GENERIC_PHONE. 
                     for other appearances BLE Scanner android app is not behaving properly 
                     */
-                    pc1.printf("Advertising type: APPEARANCE\n");
+                    DEBUG("Advertising type: APPEARANCE\n");
                     const char *deviceAppearance = NULL;
                     deviceAppearance = (const char*)load.getDataAtIndex(index);  // to be set later when startAdvertising() is called
-                    pc1.printf("input: deviceAppearance= 0x%x 0x%x..., strlen(deviceAppearance)=%d\n", deviceAppearance[1], deviceAppearance[0], load.getLengthAtIndex(index)-1);         /**< \ref Appearance */
+                    DEBUG("input: deviceAppearance= 0x%x 0x%x..., strlen(deviceAppearance)=%d\n", deviceAppearance[1], deviceAppearance[0], load.getLengthAtIndex(index)-1);         /**< \ref Appearance */
                     aci_gatt_update_char_value(g_gap_service_handle, g_appearance_char_handle, 0, 2, (tHalUint8 *)deviceAppearance);
                     break;
                 case GapAdvertisingData::ADVERTISING_INTERVAL:               /**< Advertising Interval */
                 // taken care of in startAdvertising(params)
+                    advtInterval = load.getUint16AtIndex(index);
+                    DEBUG("advtInterval=%d\n", advtInterval);
                 break;
                 case GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA:        /**< Manufacturer Specific Data */                                
                 break;
@@ -233,10 +235,10 @@
                         Local_Name_Length, local_name, service_uuid_length, service_uuid_list, Slave_conn_intvl_min, Slave_conn_intvl_max);*/
   /*LINK_LAYER.H DESCRIBES THE ADVERTISING TYPES*/ 
                                 
-        
+  advtInterval = params.getInterval(); // set advtInterval in case it is not already set by user application    
   ret = aci_gap_set_discoverable(params.getAdvertisingType(), // Advertising_Event_Type                                
                                 0,   // Adv_Interval_Min
-                                params.getInterval(),   // Adv_Interval_Max
+                                advtInterval,   // Adv_Interval_Max
                                 RANDOM_ADDR, // Address_Type <hdd> It seems there is some problem with RANDOM_ADDRESS. <problem_desc> When RANDOM_ADDRESS is selected device name is not being handled properly, i.e. wrong device name is seen by android app </problem_desc>
                                 NO_WHITE_LIST_USE,  // Adv_Filter_Policy
                                 local_name_length, // Local_Name_Length

--- a/btle/inc/btle.h	Wed Aug 06 11:05:48 2014 +0000
+++ b/btle/inc/btle.h	Thu Aug 07 09:33:27 2014 +0000
@@ -31,7 +31,6 @@
 #include "gatt_service.h"
 #include <stdio.h>
 #include <string.h>
- 
 
 void btle_init(void);
 void User_Process(void);

--- a/utils/inc/Utils.h	Wed Aug 06 11:05:48 2014 +0000
+++ b/utils/inc/Utils.h	Thu Aug 07 09:33:27 2014 +0000
@@ -15,12 +15,24 @@
  */
  
  #include "hal_types.h"
+ #include "mbed.h"
  
  // utility functions
  
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
+#define NEED_CONSOLE_OUTPUT 1 /* Set this if you need debug messages on the console;
+                               * it will have an impact on code-size and power consumption. */
+ 
+#if NEED_CONSOLE_OUTPUT
+extern Serial  pc;
+#define DEBUG(...) { pc.printf(__VA_ARGS__); }
+#else
+#define DEBUG(...) /* nothing */
+#endif /* #if NEED_CONSOLE_OUTPUT */
+
+
 
 double getHighPowerAndPALevelValue(int8_t dBMLevel, int8_t& EN_HIGH_POWER, int8_t& PA_LEVEL);
 

--- a/utils/src/Utils.cpp	Wed Aug 06 11:05:48 2014 +0000
+++ b/utils/src/Utils.cpp	Thu Aug 07 09:33:27 2014 +0000
@@ -16,6 +16,10 @@
  
  #include "Utils.h"
  
+ #if NEED_CONSOLE_OUTPUT
+Serial  pc(USBTX, USBRX);
+#endif /* #if NEED_CONSOLE_OUTPUT */
+ 
  /**************************************************************************/
 /*!
     @brief  sets values of EN_HIGH_POWER and PA_LEVEL corresponding to dBMLevel of tx power