Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arduino Core 3 (#407)

Browse Source 
* Add and remove libs and components for Arduino Core 3

* Arduino Core 3

* Add back Solo1

* Change ESP32-S3 to 4MB build

* Update README.md

* Fix retain and number of retries

* Fix rolling log

* Fix defaults

* Fix BleScanner on Solo1

* Export settings

* Import settings

* Fix HA Battery voltage

* Change submodule

* Update espMqttClient and AsyncTCP

* Webserial and MQTT/Network reconnecting

* Update nuki_ble

---------

Co-authored-by: iranl <iranl@github.com>
This commit is contained in:
iranl
2024-07-05 18:45:39 +02:00
committed by GitHub
parent 193ebb5f91
commit 6b0100fd61
236 changed files with 16390 additions and 9740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/BleScanner/src/BleScanner.cpp
View File

@@ -24,12 +24,19 @@ void Scanner::initialize(const std::string& deviceName, const bool wantDuplicate
if (!BLEDevice::getInitialized()) {
if (wantDuplicates) {
// reduce memory footprint, cache is not used anyway
#ifdef CONFIG_BTDM_BLE_SCAN_DUPL
NimBLEDevice::setScanDuplicateCacheSize(10);
#endif
}
BLEDevice::init(deviceName);
}
bleScan = BLEDevice::getScan();
#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
bleScan->setAdvertisedDeviceCallbacks(this, wantDuplicates);
#else
bleScan->setScanCallbacks(this, wantDuplicates);
#endif
bleScan->setInterval(interval);
bleScan->setWindow(window);
bleScan->setActiveScan(false);
@@ -47,7 +54,11 @@ void Scanner::update() {
log_w("Ble scanner max results not 0. Be aware of memory issue due to unbridled growth of results vector");
}
#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
bool result = bleScan->start(scanDuration, nullptr, false);
#else
bool result = bleScan->start(scanDuration * 1000, false);
#endif
// if (!result) {
// scanErrors++;
// if (scanErrors % 100 == 0) {
@@ -87,4 +98,4 @@ void Scanner::onResult(NimBLEAdvertisedDevice* advertisedDevice) {
}
}
} // namespace BleScanner
} // namespace BleScanner