Skip to content

Commit 2907701

Browse files
committed
[Breaking] Rename callback setters to setCallbacks, taking a reference only
1 parent a3f9a6e commit 2907701

29 files changed

Lines changed: 88 additions & 136 deletions

examples/ANCS/ANCS.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ void setup() {
120120
NimBLEDevice::setPower(9);
121121

122122
NimBLEServer* pServer = NimBLEDevice::createServer();
123-
pServer->setCallbacks(&serverCallbacks);
123+
pServer->setCallbacks(serverCallbacks);
124124
pServer->advertiseOnDisconnect(true);
125125

126126
NimBLEAdvertising* pAdvertising = pServer->getAdvertising();

examples/Bluetooth_5/NimBLE_extended_client/NimBLE_extended_client.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ bool connectToServer() {
5757
NimBLEClient* pClient = nullptr;
5858

5959
pClient = NimBLEDevice::createClient();
60-
pClient->setClientCallbacks(&clientCallbacks, false);
60+
pClient->setCallbacks(clientCallbacks);
6161

6262
/**
6363
* Set the PHY's to use for this connection. This is a bitmask that represents the PHY's:

examples/Bluetooth_5/NimBLE_extended_server/NimBLE_extended_server.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void setup() {
8989

9090
/** Create the server and add the services/characteristics/descriptors */
9191
NimBLEServer* pServer = NimBLEDevice::createServer();
92-
pServer->setCallbacks(&serverCallbacks);
92+
pServer->setCallbacks(serverCallbacks);
9393

9494
NimBLEService* pService = pServer->createService(SERVICE_UUID);
9595
NimBLECharacteristic* pCharacteristic =
@@ -125,7 +125,7 @@ void setup() {
125125
NimBLEExtAdvertising* pAdvertising = NimBLEDevice::getAdvertising();
126126

127127
/** Set the callbacks for advertising events */
128-
pAdvertising->setCallbacks(&advertisingCallbacks);
128+
pAdvertising->setCallbacks(advertisingCallbacks);
129129

130130
/**
131131
* NimBLEExtAdvertising::setInstanceData takes the instance ID and

examples/Bluetooth_5/NimBLE_multi_advertiser/NimBLE_multi_advertiser.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void setup() {
107107

108108
/** Create a server for our legacy advertiser */
109109
NimBLEServer* pServer = NimBLEDevice::createServer();
110-
pServer->setCallbacks(&serverCallbacks);
110+
pServer->setCallbacks(serverCallbacks);
111111

112112
NimBLEService* pService = pServer->createService(SERVICE_UUID);
113113
NimBLECharacteristic* pCharacteristic =
@@ -155,7 +155,7 @@ void setup() {
155155
NimBLEExtAdvertising* pAdvertising = NimBLEDevice::getAdvertising();
156156

157157
/** Set the callbacks to handle advertising events */
158-
pAdvertising->setCallbacks(&advCallbacks);
158+
pAdvertising->setCallbacks(advCallbacks);
159159

160160
/**
161161
* Set instance data.

examples/L2CAP/L2CAP_Client/L2CAP_Client.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void loop() {
106106
if (!theClient) {
107107
theClient = NimBLEDevice::createClient();
108108
theClient->setConnectionParams(6, 6, 0, 42);
109-
theClient->setClientCallbacks(&clientCallbacks);
109+
theClient->setCallbacks(clientCallbacks);
110110
if (!theClient->connect(theDevice)) {
111111
Serial.println("Error: Could not connect to device");
112112
return;

examples/L2CAP/L2CAP_Server/L2CAP_Server.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void setup() {
6565
auto channel = cocServer->createService(L2CAP_CHANNEL, L2CAP_MTU, &l2capCallbacks);
6666

6767
auto server = NimBLEDevice::createServer();
68-
server->setCallbacks(&gattCallbacks);
68+
server->setCallbacks(gattCallbacks);
6969

7070
auto service = server->createService(SERVICE_UUID);
7171
auto characteristic = service->createCharacteristic(CHARACTERISTIC_UUID, NIMBLE_PROPERTY::READ);

examples/NimBLE_Async_Client/NimBLE_Async_Client.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ScanCallbacks : public NimBLEScanCallbacks {
4040
}
4141
}
4242

43-
pClient->setClientCallbacks(&clientCallbacks, false);
43+
pClient->setCallbacks(clientCallbacks);
4444
if (!pClient->connect(true, true, false)) { // delete attributes, async connect, no MTU exchange
4545
NimBLEDevice::deleteClient(pClient);
4646
Serial.printf("Failed to connect\n");

examples/NimBLE_Client/NimBLE_Client.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool connectToServer() {
122122

123123
Serial.printf("New client created\n");
124124

125-
pClient->setClientCallbacks(&clientCallbacks, false);
125+
pClient->setCallbacks(clientCallbacks);
126126
/**
127127
* Set initial connection parameters:
128128
* These settings are safe for 3 clients to connect reliably, can go faster if you have less

examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void setup() {
4343

4444
if (device->isAdvertisingService(serviceUuid)) {
4545
NimBLEClient* pClient = NimBLEDevice::createClient();
46-
pClient->setClientCallbacks(&clientCallbacks, false);
46+
pClient->setCallbacks(clientCallbacks);
4747

4848
if (pClient->connect(&device)) {
4949
pClient->secureConnection();

examples/NimBLE_Server/NimBLE_Server.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void setup(void) {
147147
// NimBLEDevice::setSecurityAuth(BLE_SM_PAIR_AUTHREQ_BOND | BLE_SM_PAIR_AUTHREQ_MITM | BLE_SM_PAIR_AUTHREQ_SC);
148148

149149
pServer = NimBLEDevice::createServer();
150-
pServer->setCallbacks(&serverCallbacks);
150+
pServer->setCallbacks(serverCallbacks);
151151

152152
NimBLEService* pDeadService = pServer->createService("DEAD");
153153
NimBLECharacteristic* pBeefCharacteristic =
@@ -159,7 +159,7 @@ void setup(void) {
159159
);
160160

161161
pBeefCharacteristic->setValue("Burger");
162-
pBeefCharacteristic->setCallbacks(&chrCallbacks);
162+
pBeefCharacteristic->setCallbacks(chrCallbacks);
163163

164164
/**
165165
* 2902 and 2904 descriptors are a special case, when createDescriptor is called with
@@ -169,22 +169,22 @@ void setup(void) {
169169
*/
170170
NimBLE2904* pBeef2904 = pBeefCharacteristic->create2904();
171171
pBeef2904->setFormat(NimBLE2904::FORMAT_UTF8);
172-
pBeef2904->setCallbacks(&dscCallbacks);
172+
pBeef2904->setCallbacks(dscCallbacks);
173173

174174
NimBLEService* pBaadService = pServer->createService("BAAD");
175175
NimBLECharacteristic* pFoodCharacteristic =
176176
pBaadService->createCharacteristic("F00D", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::NOTIFY);
177177

178178
pFoodCharacteristic->setValue("Fries");
179-
pFoodCharacteristic->setCallbacks(&chrCallbacks);
179+
pFoodCharacteristic->setCallbacks(chrCallbacks);
180180

181181
/** Custom descriptor: Arguments are UUID, Properties, max length of the value in bytes */
182182
NimBLEDescriptor* pC01Ddsc =
183183
pFoodCharacteristic->createDescriptor("C01D",
184184
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_ENC,
185185
20);
186186
pC01Ddsc->setValue("Send it back!");
187-
pC01Ddsc->setCallbacks(&dscCallbacks);
187+
pC01Ddsc->setCallbacks(dscCallbacks);
188188

189189
/** Create an advertising instance and add the services to the advertised data */
190190
NimBLEAdvertising* pAdvertising = NimBLEDevice::getAdvertising();

0 commit comments

Comments
 (0)