Diff: ble_uart.cpp

Revision:

20:5c49ca82a9a1

Parent:

19:c190dd954ff1

--- a/ble_uart.cpp	Mon Oct 17 16:33:24 2016 +0000
+++ b/ble_uart.cpp	Tue Oct 18 10:44:14 2016 +0000
@@ -132,7 +132,7 @@
  * @param  none
  * @retval none
  */
-void ble_init(uint8_t *device_name)
+void ble_init(void)
 {    
     ble.init();
     ble.onConnection(ble_connectionCallback);
@@ -145,7 +145,7 @@
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
-                                     (const uint8_t *)device_name, sizeof(device_name) - 1);
+                                     (const uint8_t *)BLE_DEVICE_NAME, sizeof(BLE_DEVICE_NAME) - 1);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
                                      (const uint8_t *)UARTServiceUUID_reversed, sizeof(UARTServiceUUID_reversed));
  
@@ -155,8 +155,6 @@
     /* Setup advertising */
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
-    
-    //TODO need to add device_namein payload
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME,
                                      (const uint8_t *)BLE_DEVICE_NAME, sizeof(BLE_DEVICE_NAME) - 1);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::INCOMPLETE_LIST_128BIT_SERVICE_IDS,