4 Commits

Author SHA1 Message Date
ae7e408b4e fix 2023-12-10 13:38:37 +03:00
7b3b746a1b fix 2023-12-10 13:37:46 +03:00
37989e25ae fix 2023-12-10 13:30:58 +03:00
922dbf98b9 fix 2023-12-10 13:21:11 +03:00
2 changed files with 7 additions and 6 deletions

View File

@@ -443,17 +443,17 @@ bool BleFingerprint::fill(JsonObject *doc) {
(*doc)["rssi@1m"] = get1mRssi();
(*doc)["rssi"] = rssi;
if (isnormal(raw)) (*doc)["raw"] = serialized(std::string(raw, 2));
if (isnormal(dist)) (*doc)["distance"] = serialized(std::string(dist, 2));
if (isnormal(vari)) (*doc)["var"] = serialized(std::string(vari, 2));
if (isnormal(raw)) (*doc)["raw"] = serialized(std::to_string(raw));
if (isnormal(dist)) (*doc)["distance"] = serialized(std::to_string(dist));
if (isnormal(vari)) (*doc)["var"] = serialized(std::to_string(vari));
if (close) (*doc)["close"] = true;
(*doc)["int"] = (millis() - firstSeenMillis) / seenCount;
if (mv) (*doc)["mV"] = mv;
if (battery != 0xFF) (*doc)["batt"] = battery;
if (temp) (*doc)["temp"] = serialized(std::string(temp, 1));
if (humidity) (*doc)["rh"] = serialized(std::string(humidity, 1));
if (temp) (*doc)["temp"] = serialized(std::to_string(temp));
if (humidity) (*doc)["rh"] = serialized(std::to_string(humidity));
return true;
}

View File

@@ -78,6 +78,7 @@ namespace esphome
{
BleFingerprintCollection::Setup();
xTaskCreatePinnedToCore(scanTask, "scanTask", SCAN_TASK_STACK_SIZE, nullptr, 1, &scanTaskHandle, CONFIG_BT_NIMBLE_PINNED_TO_CORE);
publishDevices = true;
}
void ESP32Presense::loop()
@@ -112,7 +113,7 @@ namespace esphome
totalFpSeen++;
}
ESP_LOGD(TAG, "F %s", f->getAddress().toString());
ESP_LOGD(TAG, "F %s", f->getAddress().toString().c_str());
if (f->hasReport()) {
ESP_LOGD(TAG, "hasReport");