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

white space diffs.

master
Rohit Grover 2014-10-06 10:41:23 +01:00
parent 2f9ca20cb3
commit 8d7351c5f3
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nRF51Gap.cpp
View File

@ -304,7 +304,7 @@ uint16_t nRF51Gap::getConnectionHandle(void)
@endcode
*/
/**************************************************************************/
ble_error_t nRF51Gap::setAddress(addr_type_t type, const uint8_t address[6])
ble_error_t nRF51Gap::setAddress(addr_type_t type, const uint8_t address[BLE_GAP_ADDR_LEN])
{
if (type > ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) {
return BLE_ERROR_PARAM_OUT_OF_RANGE;
@ -312,12 +312,9 @@ ble_error_t nRF51Gap::setAddress(addr_type_t type, const uint8_t address[6])
ble_gap_addr_t dev_addr;
dev_addr.addr_type = type;
memcpy(dev_addr.addr, address, 6);
ASSERT_INT(ERROR_NONE,
sd_ble_gap_address_set(BLE_GAP_ADDR_CYCLE_MODE_NONE, &dev_addr),
BLE_ERROR_PARAM_OUT_OF_RANGE);
memcpy(dev_addr.addr, address, BLE_GAP_ADDR_LEN);
ASSERT_INT(ERROR_NONE, sd_ble_gap_address_set(BLE_GAP_ADDR_CYCLE_MODE_NONE, &dev_addr), BLE_ERROR_PARAM_OUT_OF_RANGE);
return BLE_ERROR_NONE;
}

6
nRF51Gap.h
View File

@ -39,10 +39,8 @@ public:
}
/* Functions that must be implemented from Gap */
virtual ble_error_t setAddress(addr_type_t type,
const uint8_t address[6]);
virtual ble_error_t setAdvertisingData(const GapAdvertisingData &,
const GapAdvertisingData &);
virtual ble_error_t setAddress(addr_type_t type, const uint8_t address[BLE_GAP_ADDR_LEN]);
virtual ble_error_t setAdvertisingData(const GapAdvertisingData &, const GapAdvertisingData &);
virtual ble_error_t startAdvertising(const GapAdvertisingParams &);
virtual ble_error_t stopAdvertising(void);
virtual ble_error_t disconnect(DisconnectionReason_t reason);