Schoumi/nrf51822
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reorganized the division of helper functions between SD and NordicSD once again.

Browse source
This commit is contained in:
Rohit Grover 2015-05-06 11:48:24 +01:00
parent 2f40cc9e7a
commit 993a277c07
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
btle/btle_discovery.h
View file

@ -116,12 +116,26 @@ public:
printf("end of service discovery\r\n");
}
void terminateCharacteristicDiscovery(void) {
cDiscoveryActive = false;
sDiscoveryActive = true;
serviceIndex++; /* Progress service index to keep discovery alive. */
}
void resetDiscoveredServices(void) {
numServices = 0;
serviceIndex = 0;
memset(services, 0, sizeof(DiscoveredService) * BLE_DB_DISCOVERY_MAX_SRV);
}
protected:
void resetDiscoveredCharacteristics(void) {
numCharacteristics = 0;
characteristicIndex = 0;
memset(characteristics, 0, sizeof(DiscoveredCharacteristic) * BLE_DB_DISCOVERY_MAX_CHAR_PER_SRV);
}
public:
void serviceDiscoveryStarted(Gap::Handle_t connectionHandle) {
connHandle = connectionHandle;
resetDiscoveredServices();
@ -129,6 +143,14 @@ public:
cDiscoveryActive = false;
}
protected:
void characteristicDiscoveryStarted(Gap::Handle_t connectionHandle) {
connHandle = connectionHandle;
resetDiscoveredCharacteristics();
cDiscoveryActive = true;
sDiscoveryActive = false;
}
protected:
ServiceDiscovery() {
/* empty */
@ -157,26 +179,6 @@ public:
public:
ble_error_t launchCharacteristicDiscovery(Gap::Handle_t connectionHandle, Gap::Handle_t startHandle, Gap::Handle_t endHandle);
void terminateCharacteristicDiscovery(void) {
cDiscoveryActive = false;
sDiscoveryActive = true;
serviceIndex++; /* Progress service index to keep discovery alive. */
}
private:
void characteristicDiscoveryStarted(Gap::Handle_t connectionHandle) {
connHandle = connectionHandle;
resetDiscoveredCharacteristics();
cDiscoveryActive = true;
sDiscoveryActive = false;
}
void resetDiscoveredCharacteristics(void) {
numCharacteristics = 0;
characteristicIndex = 0;
memset(characteristics, 0, sizeof(DiscoveredCharacteristic) * BLE_DB_DISCOVERY_MAX_CHAR_PER_SRV);
}
public:
void progressCharacteristicDiscovery() {
while (cDiscoveryActive && (characteristicIndex < numCharacteristics)) {