BLE Gateway: Added Discovery

Author: myhomeiot

components/ble_gateway/__init__.py

@@ -4,6 +4,7 @@
 from esphome import automation
 from esphome.const import (
     CONF_ID,
+    CONF_DISCOVERY,
     CONF_MAC_ADDRESS,
     CONF_TRIGGER_ID,
     CONF_ON_BLE_ADVERTISE,
@@ -27,6 +28,7 @@
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(BLEGateway),
+        cv.Optional(CONF_DISCOVERY, default=False): cv.boolean,
         cv.Optional(CONF_DEVICES): cv.All(
             cv.ensure_list(
                 {
@@ -49,6 +51,7 @@ async def to_code(config):
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
 
+    cg.add(var.set_discovery(config[CONF_DISCOVERY]))
     if config.get(CONF_DEVICES):
       cg.add(var.set_devices("".join(f"{str(conf[CONF_MAC_ADDRESS]).replace(':', '')}" for conf in config[CONF_DEVICES])))
 

components/ble_gateway/ble_gateway.cpp

@@ -52,13 +52,13 @@ std::string address_uint64_to_string(uint64_t address) {
 }
 
 void BLEGateway::dump_config() {
-  ESP_LOGCONFIG(TAG, "BLE Gateway (%d devices):", this->devices_.size());
+  ESP_LOGCONFIG(TAG, "BLE Gateway: Discovery %s, %d device(s) configured:", YESNO(this->discovery_), this->devices_.size());
   for (auto device : this->devices_)
     ESP_LOGCONFIG(TAG, "  MAC address: %s", address_uint64_to_string(device).c_str());
 }
 
 bool BLEGateway::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
-  if (std::find(this->devices_.begin(), this->devices_.end(), device.address_uint64()) != this->devices_.end()) {
+  if (this->discovery_ || std::find(this->devices_.begin(), this->devices_.end(), device.address_uint64()) != this->devices_.end()) {
     auto packet = scan_result_to_hci_packet_hex(device.get_scan_result());
     ESP_LOGD(TAG, "[%s] Packet %s", address_uint64_to_string(device.address_uint64()).c_str(), packet.c_str());
     this->callback_.call(device, packet);

components/ble_gateway/ble_gateway.h

@@ -17,9 +17,12 @@ class BLEGateway : public Component, public esp32_ble_tracker::ESPBTDeviceListen
   static std::string scan_result_to_hci_packet_hex(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &scan_result);
   void dump_config() override;
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  bool get_discovery() const { return this->discovery_; }
+  void set_discovery(bool discovery) { this->discovery_ = discovery; }
   void add_device(uint64_t device);
   void set_devices(std::string devices);
  protected:
+  bool discovery_{false};
   std::vector<uint64_t> devices_{};
   CallbackManager<void(const esp32_ble_tracker::ESPBTDevice &, std::string)> callback_{};
 };