Skip to content

Commit f218209

Browse files
authored
sets BLEScanResults by reference (#8759)
1 parent a8622c4 commit f218209

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Diff for: libraries/BLE/examples/Beacon_Scanner/Beacon_Scanner.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ void setup()
111111
void loop()
112112
{
113113
// put your main code here, to run repeatedly:
114-
BLEScanResults foundDevices = pBLEScan->start(scanTime, false);
114+
BLEScanResults *foundDevices = pBLEScan->start(scanTime, false);
115115
Serial.print("Devices found: ");
116-
Serial.println(foundDevices.getCount());
116+
Serial.println(foundDevices->getCount());
117117
Serial.println("Scan done!");
118118
pBLEScan->clearResults(); // delete results fromBLEScan buffer to release memory
119119
delay(2000);

Diff for: libraries/BLE/examples/Scan/Scan.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ void setup() {
3131

3232
void loop() {
3333
// put your main code here, to run repeatedly:
34-
BLEScanResults foundDevices = pBLEScan->start(scanTime, false);
34+
BLEScanResults *foundDevices = pBLEScan->start(scanTime, false);
3535
Serial.print("Devices found: ");
36-
Serial.println(foundDevices.getCount());
36+
Serial.println(foundDevices->getCount());
3737
Serial.println("Scan done!");
3838
pBLEScan->clearResults(); // delete results fromBLEScan buffer to release memory
3939
delay(2000);

Diff for: libraries/BLE/src/BLEScan.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,11 @@ bool BLEScan::start(uint32_t duration, void (*scanCompleteCB)(BLEScanResults), b
426426
* @param [in] duration The duration in seconds for which to scan.
427427
* @return The BLEScanResults.
428428
*/
429-
BLEScanResults BLEScan::start(uint32_t duration, bool is_continue) {
429+
BLEScanResults* BLEScan::start(uint32_t duration, bool is_continue) {
430430
if(start(duration, nullptr, is_continue)) {
431431
m_semaphoreScanEnd.wait("start"); // Wait for the semaphore to release.
432432
}
433-
return m_scanResults;
433+
return &m_scanResults;
434434
} // start
435435

436436

@@ -500,8 +500,8 @@ BLEAdvertisedDevice BLEScanResults::getDevice(uint32_t i) {
500500
return dev;
501501
}
502502

503-
BLEScanResults BLEScan::getResults() {
504-
return m_scanResults;
503+
BLEScanResults* BLEScan::getResults() {
504+
return &m_scanResults;
505505
}
506506

507507
void BLEScan::clearResults() {

Diff for: libraries/BLE/src/BLEScan.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ class BLEScan {
7171
void setInterval(uint16_t intervalMSecs);
7272
void setWindow(uint16_t windowMSecs);
7373
bool start(uint32_t duration, void (*scanCompleteCB)(BLEScanResults), bool is_continue = false);
74-
BLEScanResults start(uint32_t duration, bool is_continue = false);
74+
BLEScanResults* start(uint32_t duration, bool is_continue = false);
7575
void stop();
7676
void erase(BLEAddress address);
77-
BLEScanResults getResults();
77+
BLEScanResults* getResults();
7878
void clearResults();
7979

8080
#ifdef SOC_BLE_50_SUPPORTED

0 commit comments

Comments
 (0)