Update ArduinoJSON, esp-nimble-cpp, Arduino Core, ESP-IDF (#448)

* ArduinoJSON 7.1.0

* Update nimble and arduino core

* Update nuki_ble
This commit is contained in:
iranl
2024-08-11 11:20:31 +02:00
committed by GitHub
parent 4af90cbc79
commit 9d55c2173d
216 changed files with 6437 additions and 5705 deletions

View File

@@ -95,18 +95,15 @@ void PresenceDetection::buildCsv(const std::shared_ptr<PdDevice>& device)
_csv[_csvIndex] = ';';
++_csvIndex;
if(device->hasRssi)
{
char rssiStr[20] = {0};
itoa(device->rssi, rssiStr, 10);
char rssiStr[20] = {0};
itoa(device->rssi, rssiStr, 10);
int i=0;
while(rssiStr[i] != 0x00 && i < 20)
{
_csv[_csvIndex] = rssiStr[i];
++_csvIndex;
++i;
}
int j=0;
while(rssiStr[j] != 0x00 && j < 20)
{
_csv[_csvIndex] = rssiStr[j];
++_csvIndex;
++j;
}
_csv[_csvIndex] = '\n';
@@ -144,11 +141,7 @@ void PresenceDetection::onResult(NimBLEAdvertisedDevice *device)
if(found)
{
it->second->timestamp = esp_timer_get_time() / 1000;
if(device->haveRSSI())
{
it->second->hasRssi = true;
it->second->rssi = device->getRSSI();
}
it->second->rssi = device->getRSSI();
}
}
@@ -164,11 +157,7 @@ void PresenceDetection::onResult(NimBLEAdvertisedDevice *device)
++i;
}
if(device->haveRSSI())
{
pdDevice->hasRssi = true;
pdDevice->rssi = device->getRSSI();
}
pdDevice->rssi = device->getRSSI();
std::string nameStr = "-";
if(device->haveName())