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

bring in the latest changes for BLE::init() where we allow <object, member> tuples for init callback.

master
Rohit Grover 2015-11-03 12:40:34 +00:00
parent 95706f05ed
commit 6b763c8709
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/nRF5xn.cpp
View File

@ -77,12 +77,14 @@ const char *nRF5xn::getVersion(void)
return versionString;
}
ble_error_t nRF5xn::init(BLE::InstanceID_t instanceID, BLE::InitializationCompleteCallback_t callback)
ble_error_t nRF5xn::init(BLE::InstanceID_t instanceID, FunctionPointerWithContext<BLE::InitializationCompleteCallbackContext *> callback)
{
if (initialized) {
if (callback) {
callback(BLE::Instance(instanceID), BLE_ERROR_ALREADY_INITIALIZED);
}
BLE::InitializationCompleteCallbackContext context = {
BLE::Instance(instanceID),
BLE_ERROR_ALREADY_INITIALIZED
};
callback.call(&context);
return BLE_ERROR_ALREADY_INITIALIZED;
}
@ -92,9 +94,11 @@ ble_error_t nRF5xn::init(BLE::InstanceID_t instanceID, BLE::InitializationComple
btle_init();
initialized = true;
if (callback) {
callback(BLE::Instance(instanceID), BLE_ERROR_NONE);
}
BLE::InitializationCompleteCallbackContext context = {
BLE::Instance(instanceID),
BLE_ERROR_NONE
};
callback.call(&context);
return BLE_ERROR_NONE;
}

2
source/nRF5xn.h
View File

@ -34,7 +34,7 @@ public:
nRF5xn(void);
virtual ~nRF5xn(void);
virtual ble_error_t init(BLE::InstanceID_t instanceID, BLE::InitializationCompleteCallback_t);
virtual ble_error_t init(BLE::InstanceID_t instanceID, FunctionPointerWithContext<BLE::InitializationCompleteCallbackContext *> callback);
virtual bool hasInitialized(void) const {
return initialized;
}