Schoumi
/
BLE_API
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no need to save defaults; they are implicit.

master
Rohit Grover 2014-12-01 10:57:36 +00:00
parent bb041bbb10
commit 19f5054adf
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
services/URIBeaconConfigService.h
View File

@ -90,9 +90,6 @@ public:
strcpy(reinterpret_cast<char *>(uriData), uriDataIn);
configureGAP();
if (initSucceeded) {
saveDefaults();
}
GattCharacteristic *charTable[] = {&lockedStateChar, &uriDataChar, &flagsChar, &txPowerLevelsChar, &beaconPeriodChar, &resetChar};
GattService beaconControlService(URIBeacon2ControlServiceUUID, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));
@ -308,20 +305,13 @@ private:
ble.setAdvertisingPayload();
}
/* Preserve the defaults to be able to reset() upon request. */
void saveDefaults(void) {
memcpy(defaultURIData, uriData, MAX_SIZE_URI_DATA_CHAR_VALUE);
defaultFlags = flags;
defaultEffectiveTxPower = effectiveTxPower;
defaultBeaconPeriod = beaconPeriod;
}
void resetDefaults(void) {
memcpy(uriData, defaultURIData, MAX_SIZE_URI_DATA_CHAR_VALUE);
memset(uriData, 0, MAX_SIZE_URI_DATA_CHAR_VALUE);
uriDataLength = 0;
memset(powerLevels, 0, sizeof(powerLevels));
flags = defaultFlags;
effectiveTxPower = defaultEffectiveTxPower;
beaconPeriod = defaultBeaconPeriod;
flags = 0;
effectiveTxPower = 0;
beaconPeriod = 0;
updateGATT();
}
@ -377,11 +367,6 @@ private:
uint16_t beaconPeriod;
bool resetFlag;
uint8_t defaultURIData[MAX_SIZE_URI_DATA_CHAR_VALUE];
uint8_t defaultFlags;
int8_t defaultEffectiveTxPower;
uint16_t defaultBeaconPeriod;
GattCharacteristic lockedStateChar;
GattCharacteristic uriDataChar;
GattCharacteristic flagsChar;