Skip to content

Commit 046132e

Browse files
committed
Allow BLESerivce to have instance
- remove Bluefruit::addService
1 parent dd57126 commit 046132e

File tree

4 files changed

+6
-23
lines changed

4 files changed

+6
-23
lines changed

libraries/Bluefruit52Lib/src/BLEService.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,8 @@ err_t BLEService::addToGatt(void)
8585
return ERROR_NONE;
8686
}
8787

88+
err_t BLEService::start(void)
89+
{
90+
return addToGatt();
91+
}
92+

libraries/Bluefruit52Lib/src/BLEService.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ class BLEService
5959
void setUuid(uint16_t uuid16);
6060
void setUuid(uint8_t const uuid128[]);
6161

62-
// Abstract Class
63-
virtual err_t start(void) = 0;
62+
virtual err_t start(void);
6463
};
6564

6665
#endif /* BLESERVICE_H_ */

libraries/Bluefruit52Lib/src/bluefruit.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -449,23 +449,6 @@ void AdafruitBluefruit::stopAdvertising(void)
449449
_stopConnLed(); // stop blinking
450450
}
451451

452-
err_t AdafruitBluefruit::addService(uint16_t uuid16)
453-
{
454-
BLEUuid uuid(uuid16);
455-
456-
uint16_t svc_handle;
457-
return sd_ble_gatts_service_add(BLE_GATTS_SRVC_TYPE_PRIMARY, &uuid._uuid, &svc_handle);
458-
}
459-
460-
err_t AdafruitBluefruit::addService(uint8_t const uuid128[])
461-
{
462-
BLEUuid uuid;
463-
uuid.set(uuid128);
464-
465-
uint16_t svc_handle;
466-
return sd_ble_gatts_service_add(BLE_GATTS_SRVC_TYPE_PRIMARY, &uuid._uuid, &svc_handle);
467-
}
468-
469452
err_t AdafruitBluefruit::_registerCharacteristic(BLECharacteristic* chars)
470453
{
471454
if ( _chars_count == BLE_MAX_CHARS ) return NRF_ERROR_NO_MEM;

libraries/Bluefruit52Lib/src/bluefruit.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ class AdafruitBluefruit
106106
/*------------------------------------------------------------------*/
107107
/*
108108
*------------------------------------------------------------------*/
109-
// Add service without using BLEService instance
110-
err_t addService(uint16_t uuid16);
111-
err_t addService(uint8_t const uuid128[]);
112-
113109
void disconnect(void);
114110
bool connected(void);
115111

0 commit comments

Comments
 (0)