Skip to content

Commit 0391eca

Browse files
committed
remove Bluefruit::connPaired() and BLEConnection::paired()
1 parent cb1a454 commit 0391eca

File tree

8 files changed

+3
-17
lines changed

8 files changed

+3
-17
lines changed

libraries/Bluefruit52Lib/examples/Peripheral/hid_camerashutter/hid_camerashutter.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void loop()
114114
{
115115
BLEConnection* connection = Bluefruit.Connection(conn_hdl);
116116

117-
if ( connection && connection->connected() && connection->paired() )
117+
if ( connection && connection->connected() && connection->secured() )
118118
{
119119
// Turn on red LED when we start sending data
120120
digitalWrite(LED_RED, 1);

libraries/Bluefruit52Lib/keywords.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ disconnect KEYWORD2
6969
setConnInterval KEYWORD2
7070
setConnIntervalMS KEYWORD2
7171
connHandle KEYWORD2
72-
connPaired KEYWORD2
7372
connInterval KEYWORD2
7473
requestPairing KEYWORD2
7574
clearBonds KEYWORD2

libraries/Bluefruit52Lib/src/BLEConnection.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@ bool BLEConnection::connected(void)
8383
return _connected;
8484
}
8585

86-
bool BLEConnection::paired (void)
87-
{
88-
return secured();
89-
}
90-
9186
bool BLEConnection::bonded(void)
9287
{
9388
return _bonded;

libraries/Bluefruit52Lib/src/BLEConnection.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class BLEConnection
7474

7575
uint16_t handle(void);
7676
bool connected(void);
77-
bool paired(void); // todo removed
7877
bool bonded(void);
7978
bool secured(void);
8079

libraries/Bluefruit52Lib/src/BLEGatt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void BLEGatt::_eventHandler(ble_evt_t* evt)
140140
chr->_eventHandler(evt);
141141

142142
// Save CCCD if paired
143-
if ( conn->paired() && (evt_id == BLE_GATTS_EVT_WRITE) && (req_handle == chr->handles().cccd_handle) )
143+
if ( conn->secured() && (evt_id == BLE_GATTS_EVT_WRITE) && (req_handle == chr->handles().cccd_handle) )
144144
{
145145
conn->saveCccd();
146146
}

libraries/Bluefruit52Lib/src/bluefruit.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,12 +618,6 @@ uint16_t AdafruitBluefruit::connHandle(void)
618618
return _conn_hdl;
619619
}
620620

621-
bool AdafruitBluefruit::connPaired(uint16_t conn_hdl)
622-
{
623-
BLEConnection* conn = Bluefruit.Connection(conn_hdl);
624-
return conn && conn->paired();
625-
}
626-
627621
uint16_t AdafruitBluefruit::getMaxMtu(uint8_t role)
628622
{
629623
return (role == BLE_GAP_ROLE_PERIPH) ? _sd_cfg.prph.mtu_max : _sd_cfg.central.mtu_max;

libraries/Bluefruit52Lib/src/bluefruit.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ class AdafruitBluefruit
166166
uint16_t connHandle (void);
167167

168168
// Alias to BLEConnection API()
169-
bool connPaired (uint16_t conn_hdl);
170169
bool disconnect (uint16_t conn_hdl);
171170

172171
uint16_t getMaxMtu(uint8_t role);

libraries/Bluefruit52Lib/src/services/BLEDfu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static void bledfu_control_wr_authorize_cb(uint16_t conn_hdl, BLECharacteristic*
137137
// Get Bond Data or using Address if not bonded
138138
peer_data->addr = conn->getPeerAddr();
139139

140-
if ( conn->paired() )
140+
if ( conn->secured() )
141141
{
142142
bond_keys_t bkeys;
143143
if ( conn->loadBondKey(&bkeys) )

0 commit comments

Comments
 (0)