9 Commits

Author SHA1 Message Date
d021d7c29d remove log 2023-12-10 13:47:33 +03:00
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
34089f1add fix 2023-12-10 13:20:21 +03:00
4c710f7a0a fix 2023-12-10 13:18:48 +03:00
b766c0ce04 fix 2023-12-10 13:16:42 +03:00
32fe442cce fix 2023-12-10 13:08:31 +03:00
3 changed files with 9 additions and 7 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

@@ -35,7 +35,7 @@ async def to_code(config):
cg.add(var.set_room(config[CONF_ROOM_KEY]))
# cg.add(var.set_base_topic(config[CONF_BASE_TOPIC_KEY]))
# cg.add(var.set_addresses(config[CONF_MAC_KEY]))
# cg.add(var.set_max_distance(config[CONF_MAX_DISTANCE]))
cg.add(var.set_max_distance(config[CONF_MAX_DISTANCE]))
add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
add_idf_sdkconfig_option("CONFIG_BT_BLUEDROID_ENABLED", False)

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()
@@ -113,8 +114,9 @@ namespace esphome
}
if (f->hasReport()) {
if (reportBuffer(f))
if (reportBuffer(f)) {
f->clearReport();
}
}