Skip to content

Change allocation of default services and characteristics #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2020
Merged

Change allocation of default services and characteristics #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions src/utility/GATT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,12 @@
#include "GATT.h"

GATTClass::GATTClass() :
_genericAccessService("1800"),
_deviceNameCharacteristic("2a00", BLERead, 20),
_appearanceCharacteristic("2a01", BLERead, 2),
_genericAttributeService("1801"),
_servicesChangedCharacteristic("2a05", BLEIndicate, 4)
_genericAccessService(NULL),
_deviceNameCharacteristic(NULL),
_appearanceCharacteristic(NULL),
_genericAttributeService(NULL),
_servicesChangedCharacteristic(NULL)
{
_genericAccessService.retain();
_genericAttributeService.retain();

_genericAccessService.addCharacteristic(&_deviceNameCharacteristic);
_genericAccessService.addCharacteristic(&_appearanceCharacteristic);

_genericAttributeService.addCharacteristic(&_servicesChangedCharacteristic);
}

GATTClass::~GATTClass()
Expand All @@ -50,13 +43,29 @@ GATTClass::~GATTClass()

void GATTClass::begin()
{
_genericAccessService = new BLELocalService("1800");
_deviceNameCharacteristic = new BLELocalCharacteristic("2a00", BLERead, 20);
_appearanceCharacteristic = new BLELocalCharacteristic("2a01", BLERead, 2);
_genericAttributeService = new BLELocalService("1801");
_servicesChangedCharacteristic = new BLELocalCharacteristic("2a05", BLEIndicate, 4);

_genericAccessService->retain();
_deviceNameCharacteristic->retain();
_appearanceCharacteristic->retain();
_genericAttributeService->retain();
_servicesChangedCharacteristic->retain();

_genericAccessService->addCharacteristic(_deviceNameCharacteristic);
_genericAccessService->addCharacteristic(_appearanceCharacteristic);
_genericAttributeService->addCharacteristic(_servicesChangedCharacteristic);

setDeviceName("Arduino");
setAppearance(0x000);

clearAttributes();

addService(&_genericAccessService);
addService(&_genericAttributeService);
addService(_genericAccessService);
addService(_genericAttributeService);
}

void GATTClass::end()
Expand All @@ -66,12 +75,12 @@ void GATTClass::end()

void GATTClass::setDeviceName(const char* deviceName)
{
_deviceNameCharacteristic.writeValue(deviceName);
_deviceNameCharacteristic->writeValue(deviceName);
}

void GATTClass::setAppearance(uint16_t appearance)
{
_appearanceCharacteristic.writeValue((uint8_t*)&appearance, sizeof(appearance));
_appearanceCharacteristic->writeValue((uint8_t*)&appearance, sizeof(appearance));
}

void GATTClass::addService(BLEService& service)
Expand Down
10 changes: 5 additions & 5 deletions src/utility/GATT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ class GATTClass {
private:
BLELinkedList<BLELocalAttribute*> _attributes;

BLELocalService _genericAccessService;
BLELocalCharacteristic _deviceNameCharacteristic;
BLELocalCharacteristic _appearanceCharacteristic;
BLELocalService _genericAttributeService;
BLELocalCharacteristic _servicesChangedCharacteristic;
BLELocalService* _genericAccessService;
BLELocalCharacteristic* _deviceNameCharacteristic;
BLELocalCharacteristic* _appearanceCharacteristic;
BLELocalService* _genericAttributeService;
BLELocalCharacteristic* _servicesChangedCharacteristic;
};

extern GATTClass GATT;
Expand Down