Revision 271:7dc6261c33e5, committed 2016-09-15

Comitter:

Vincent Coubard

Date:

Thu Sep 15 10:51:33 2016 +0100

Branch:

2819f05ab09fdabd46030bb6eab6b01aad1fa2db

Parent:

270:ca649990a830

Child:

272:4639da7705e1

Commit message:

Sync with 2819f05ab09fdabd46030bb6eab6b01aad1fa2db

2016-07-15 17:22:04+02:00: Andrea Palmieri
Update btleInit() prototype

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

Changed in this revision

--- a/source/BlueNRGDevice.cpp	Thu Sep 15 10:51:32 2016 +0100
+++ b/source/BlueNRGDevice.cpp	Thu Sep 15 10:51:33 2016 +0100
@@ -181,11 +181,9 @@
         	callback.call(&context);
         	return BLE_ERROR_ALREADY_INITIALIZED;
     	}
-	
-	/* ToDo: Clear memory contents, reset the SD, etc. */
+
 	// Init the BlueNRG/BlueNRG-MS stack
-	// By default, we set the device GAP role to PERIPHERAL
-	btleInit(BlueNRGGap::getInstance().getIsSetAddress(), GAP_PERIPHERAL_ROLE_IDB04A1);
+	btleInit();
 	
 	isInitialized = true;
 	BLE::InitializationCompleteCallbackContext context = {
@@ -468,4 +466,4 @@
 void BlueNRGDevice::enable_irq()
 {
     irq_.enable_irq();
-}
+}
\ No newline at end of file

--- a/source/platform/btle.cpp	Thu Sep 15 10:51:32 2016 +0100
+++ b/source/platform/btle.cpp	Thu Sep 15 10:51:33 2016 +0100
@@ -92,16 +92,12 @@
 /**************************************************************************/
 /*!
     @brief  Init the BTLE stack with the specified role
-    @param  isSetAddress boolean if address has been set
-    @param  role The device role
     @returns void
 */
 /**************************************************************************/
-void btleInit(bool isSetAddress, uint8_t role)
+void btleInit(void)
 {
     PRINTF("btleInit>>\n\r");
-    /* Avoid compiler warnings about unused variables. */
-    (void)isSetAddress;
 
     int ret;
     uint8_t  hwVersion;
@@ -136,30 +132,6 @@
                                         &stackMode);
     }
 
-    /* The Nucleo board must be configured as SERVER */
-    //check if isSetAddress is set then set address.
-#if 0
-    if(isSetAddress)
-    {
-        Gap::Address_t bleAddr;
-        Gap::AddressType_t addr_type;
-
-        BlueNRGGap::getInstance().getAddress(&addr_type, bleAddr);
-
-        ret = aci_hal_write_config_data(CONFIG_DATA_PUBADDR_OFFSET,
-                                        CONFIG_DATA_PUBADDR_LEN,
-                                        bleAddr);
-    } else {
-
-        const Gap::Address_t BLE_address_BE = {0xFD,0x66,0x05,0x13,0xBE,0xBA};
-        BlueNRGGap::getInstance().setAddress(BLEProtocol::AddressType::RANDOM_STATIC, BLE_address_BE);
-
-        ret = aci_hal_write_config_data(CONFIG_DATA_PUBADDR_OFFSET,
-                                        CONFIG_DATA_PUBADDR_LEN,
-                                        BLE_address_BE);
-    }
-#endif
-
     ret = aci_gatt_init();
     if(ret != BLE_STATUS_SUCCESS){
         PRINTF("GATT_Init failed.\n");
@@ -172,7 +144,8 @@
                                    &dev_name_char_handle,
                                    &appearance_char_handle);
     } else {
-        ret = aci_gap_init_IDB04A1(role, &service_handle, &dev_name_char_handle, &appearance_char_handle);
+        // IDB04A1 is configured as peripheral by default
+        ret = aci_gap_init_IDB04A1(GAP_PERIPHERAL_ROLE_IDB04A1, &service_handle, &dev_name_char_handle, &appearance_char_handle);
     }
 
     // read the default static address and inject it into the GAP object
@@ -211,12 +184,8 @@
                             strlen(name), (tHalUint8 *)name);*/
 
     // update the peripheral preferred conenction parameters handle
-    // if the device is configured as a peripheral
     // This value is hardcoded at the moment.
-    if ((role & GAP_PERIPHERAL_ROLE_IDB05A1) || (role & GAP_PERIPHERAL_ROLE_IDB04A1) ||
-        (bnrg_expansion_board == IDB05A1 /* role is ignored in this configuration ... */)) {
-        g_preferred_connection_parameters_char_handle = 10;
-    }
+    g_preferred_connection_parameters_char_handle = 10;
 
 
 #ifdef AST_FOR_MBED_OS

--- a/x-nucleo-idb0xa1/platform/btle.h	Thu Sep 15 10:51:32 2016 +0100
+++ b/x-nucleo-idb0xa1/platform/btle.h	Thu Sep 15 10:51:33 2016 +0100
@@ -39,7 +39,7 @@
 extern uint16_t g_device_name_char_handle;
 extern uint16_t g_preferred_connection_parameters_char_handle;
 
-void btleInit(bool isSetAddress, uint8_t role);
+void btleInit(void);
 void SPI_Poll(void);
 void User_Process(void);
 void setConnectable(void);