5 Commits

Author SHA1 Message Date
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
61f58a5963 fix 2023-12-10 13:07:05 +03:00
3 changed files with 13 additions and 2 deletions

View File

@@ -35,7 +35,7 @@ async def to_code(config):
cg.add(var.set_room(config[CONF_ROOM_KEY])) cg.add(var.set_room(config[CONF_ROOM_KEY]))
# cg.add(var.set_base_topic(config[CONF_BASE_TOPIC_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_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_ENABLED", True)
add_idf_sdkconfig_option("CONFIG_BT_BLUEDROID_ENABLED", False) add_idf_sdkconfig_option("CONFIG_BT_BLUEDROID_ENABLED", False)

View File

@@ -70,6 +70,10 @@ namespace esphome
roomsTopic = std::string(CHANNEL) + std::string("/rooms/") + _id; roomsTopic = std::string(CHANNEL) + std::string("/rooms/") + _id;
} }
void ESP32Presense::set_max_distance(float maxDistance) {
BleFingerprintCollection::maxDistance = maxDistance;
}
void ESP32Presense::setup() void ESP32Presense::setup()
{ {
BleFingerprintCollection::Setup(); BleFingerprintCollection::Setup();
@@ -108,13 +112,19 @@ namespace esphome
totalFpSeen++; totalFpSeen++;
} }
ESP_LOGD(TAG, "F %s", f->getAddress().toString());
if (f->hasReport()) { if (f->hasReport()) {
if (reportBuffer(f)) ESP_LOGD(TAG, "hasReport");
if (reportBuffer(f)) {
ESP_LOGD(TAG, "reportBuffer");
f->clearReport(); f->clearReport();
}
} }
if (this->reportDevice(f)) { if (this->reportDevice(f)) {
ESP_LOGD(TAG, "reportDevice");
totalFpReported++; totalFpReported++;
reported++; reported++;
} }

View File

@@ -34,6 +34,7 @@ namespace esphome
void set_room(std::string room); void set_room(std::string room);
bool reportBuffer(BleFingerprint *f); bool reportBuffer(BleFingerprint *f);
bool reportDevice(BleFingerprint *f); bool reportDevice(BleFingerprint *f);
void set_max_distance(float maxDistance);
//void set_base_topic(std::string base_topic) { base_topic_ = base_topic; } //void set_base_topic(std::string base_topic) { base_topic_ = base_topic; }
}; };
} // namespace esp32_nimble_tracker } // namespace esp32_nimble_tracker