mirror of
https://github.com/esphome/esphome.git
synced 2026-11-16 01:55:59 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19cf856cdc | ||
|
|
7fe9029d33 | ||
|
|
35e833848c | ||
|
|
fc233f89e5 | ||
|
|
fc84e2a7a3 |
No files matched your search
@@ -206,6 +206,7 @@ void BK72xxBLETracker::dump_config() {
|
||||
this->scan_duration_ / 1000, ble_units_to_ms(this->scan_interval_), this->scan_interval_,
|
||||
ble_units_to_ms(this->scan_window_), this->scan_window_, this->scan_active_ ? "ACTIVE" : "PASSIVE",
|
||||
this->scan_active_configured_ ? "ACTIVE" : "PASSIVE", YESNO(this->scan_continuous_));
|
||||
this->dispatcher_.dump_child_configs();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -35,6 +35,7 @@ from esphome.const import (
|
||||
CONF_ACTIVE,
|
||||
CONF_CONTINUOUS,
|
||||
CONF_DURATION,
|
||||
CONF_ID,
|
||||
CONF_INTERVAL,
|
||||
KEY_TARGET_PLATFORM,
|
||||
)
|
||||
@@ -193,6 +194,11 @@ def new_ble_device_component(
|
||||
return cg.new_bus_component(register_ble_device, config, *args)
|
||||
|
||||
|
||||
async def new_ble_device(config: ConfigType, *args: Any) -> cg.MockObj:
|
||||
"""Construct a listener that is not a Component and attach it to the BLE hub."""
|
||||
return await register_ble_device(cg.new_Pvariable(config[CONF_ID], *args), config)
|
||||
|
||||
|
||||
# ---- shared validation / codegen helpers (platform-neutral) ----
|
||||
|
||||
|
||||
|
||||
@@ -323,6 +323,8 @@ class ESPBTDeviceListener {
|
||||
/// Called at the end of each scan duration period.
|
||||
virtual void on_scan_end() {}
|
||||
virtual bool parse_device(const ESPBTDevice &device) = 0;
|
||||
/// Called from the tracker's dump_config(); not dump_config() so Component listeners don't print twice.
|
||||
virtual void dump_child_config() {}
|
||||
};
|
||||
|
||||
} // namespace esphome::ble_device_base
|
||||
@@ -58,6 +58,13 @@ class AdvDispatcher {
|
||||
bool raw_only, const char *log_unclaimed_tag);
|
||||
/// Fire listeners' on_scan_end and reset the per-scan discovered-log dedup.
|
||||
void on_scan_end();
|
||||
/// Print each listener's dump_child_config(); called from the tracker's dump_config().
|
||||
void dump_child_configs() {
|
||||
#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
|
||||
for (auto *listener : this->listeners_)
|
||||
listener->dump_child_config();
|
||||
#endif
|
||||
}
|
||||
|
||||
protected:
|
||||
RawAdvertisementCallback raw_callback_{};
|
||||
|
||||
@@ -485,6 +485,14 @@ void ESP32BLETracker::dump_config() {
|
||||
if (this->scan_start_fail_count_) {
|
||||
ESP_LOGCONFIG(TAG, " Scan Start Fail Count: %d", this->scan_start_fail_count_);
|
||||
}
|
||||
#ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
|
||||
for (auto *listener : this->listeners_)
|
||||
listener->dump_child_config();
|
||||
#endif
|
||||
#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
|
||||
for (auto *listener : this->neutral_listeners_)
|
||||
listener->dump_child_config();
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef USE_ESP32_BLE_DEVICE
|
||||
|
||||
@@ -134,6 +134,7 @@ void LN882HBLETracker::dump_config() {
|
||||
this->scan_duration_ / 1000, this->scan_interval_ * BLE_SCAN_UNIT_MS, this->scan_interval_,
|
||||
this->scan_window_ * BLE_SCAN_UNIT_MS, this->scan_window_, this->scan_active_ ? "ACTIVE" : "PASSIVE",
|
||||
YESNO(this->scan_continuous_));
|
||||
this->dispatcher_.dump_child_configs();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -134,6 +134,7 @@ void RP2BLETracker::dump_config() {
|
||||
this->scan_window_ * BLE_SCAN_UNIT_MS, this->scan_window_,
|
||||
this->scan_active_ ? LOG_STR_LITERAL("ACTIVE") : LOG_STR_LITERAL("PASSIVE"),
|
||||
YESNO(this->scan_continuous_));
|
||||
this->dispatcher_.dump_child_configs();
|
||||
}
|
||||
|
||||
// Core spec advertising report event types (BTstack headers stay out of this
|
||||
|
||||
@@ -20,9 +20,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_cgd1_ns = cg.esphome_ns.namespace("xiaomi_cgd1")
|
||||
XiaomiCGD1 = xiaomi_cgd1_ns.class_(
|
||||
"XiaomiCGD1", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
)
|
||||
XiaomiCGD1 = xiaomi_cgd1_ns.class_("XiaomiCGD1", xiaomi_ble.XiaomiEncryptedDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_cgd1"),
|
||||
@@ -51,14 +49,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_cgd1 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_cgd1");
|
||||
|
||||
void XiaomiCGD1::dump_config() {
|
||||
void XiaomiCGD1::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi CGD1");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_cgd1 {
|
||||
|
||||
class XiaomiCGD1 : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiCGD1 : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -20,9 +20,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_cgdk2_ns = cg.esphome_ns.namespace("xiaomi_cgdk2")
|
||||
XiaomiCGDK2 = xiaomi_cgdk2_ns.class_(
|
||||
"XiaomiCGDK2", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
)
|
||||
XiaomiCGDK2 = xiaomi_cgdk2_ns.class_("XiaomiCGDK2", xiaomi_ble.XiaomiEncryptedDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_cgdk2"),
|
||||
@@ -51,14 +49,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_cgdk2 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_cgdk2");
|
||||
|
||||
void XiaomiCGDK2::dump_config() {
|
||||
void XiaomiCGDK2::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi CGDK2");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_cgdk2 {
|
||||
|
||||
class XiaomiCGDK2 final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiCGDK2 final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -20,9 +20,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_cgg1_ns = cg.esphome_ns.namespace("xiaomi_cgg1")
|
||||
XiaomiCGG1 = xiaomi_cgg1_ns.class_(
|
||||
"XiaomiCGG1", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
)
|
||||
XiaomiCGG1 = xiaomi_cgg1_ns.class_("XiaomiCGG1", xiaomi_ble.XiaomiEncryptedDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_cgg1"),
|
||||
@@ -51,14 +49,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ namespace esphome::xiaomi_cgg1 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_cgg1");
|
||||
|
||||
void XiaomiCGG1::dump_config() {
|
||||
void XiaomiCGG1::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi CGG1");
|
||||
// The bindkey is optional on the CGG1; without one it stays all zero
|
||||
if (std::any_of(std::begin(this->bindkey_), std::end(this->bindkey_), [](uint8_t b) { return b != 0; }))
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_cgg1 {
|
||||
|
||||
class XiaomiCGG1 final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiCGG1 final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -25,7 +25,6 @@ xiaomi_cgpr1_ns = cg.esphome_ns.namespace("xiaomi_cgpr1")
|
||||
XiaomiCGPR1 = xiaomi_cgpr1_ns.class_(
|
||||
"XiaomiCGPR1",
|
||||
binary_sensor.BinarySensor,
|
||||
cg.Component,
|
||||
xiaomi_ble.XiaomiEncryptedDevice,
|
||||
)
|
||||
|
||||
@@ -58,14 +57,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await binary_sensor.new_binary_sensor(config)
|
||||
await cg.register_component(var, config)
|
||||
await ble_device_base.register_ble_device(var, config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_cgpr1 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_cgpr1");
|
||||
|
||||
void XiaomiCGPR1::dump_config() {
|
||||
void XiaomiCGPR1::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi CGPR1");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_BINARY_SENSOR(" ", "Motion", this);
|
||||
|
||||
@@ -1,21 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_cgpr1 {
|
||||
|
||||
class XiaomiCGPR1 final : public Component,
|
||||
public binary_sensor::BinarySensorInitiallyOff,
|
||||
public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiCGPR1 final : public binary_sensor::BinarySensorInitiallyOff, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(battery_level)
|
||||
SUB_SENSOR(illuminance)
|
||||
SUB_SENSOR(idle_time)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -22,9 +22,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_gcls002_ns = cg.esphome_ns.namespace("xiaomi_gcls002")
|
||||
XiaomiGCLS002 = xiaomi_gcls002_ns.class_(
|
||||
"XiaomiGCLS002", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiGCLS002 = xiaomi_gcls002_ns.class_("XiaomiGCLS002", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_gcls002"),
|
||||
@@ -57,14 +55,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
state_class=STATE_CLASS_MEASUREMENT,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_gcls002 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_gcls002");
|
||||
|
||||
void XiaomiGCLS002::dump_config() {
|
||||
void XiaomiGCLS002::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi GCLS002");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Moisture", this->moisture_sensor_);
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_gcls002 {
|
||||
|
||||
class XiaomiGCLS002 final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiGCLS002 final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(moisture)
|
||||
SUB_SENSOR(conductivity)
|
||||
SUB_SENSOR(illuminance)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -25,9 +25,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_hhccjcy01_ns = cg.esphome_ns.namespace("xiaomi_hhccjcy01")
|
||||
XiaomiHHCCJCY01 = xiaomi_hhccjcy01_ns.class_(
|
||||
"XiaomiHHCCJCY01", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiHHCCJCY01 = xiaomi_hhccjcy01_ns.class_("XiaomiHHCCJCY01", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_hhccjcy01"),
|
||||
@@ -67,14 +65,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_hhccjcy01 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_hhccjcy01");
|
||||
|
||||
void XiaomiHHCCJCY01::dump_config() {
|
||||
void XiaomiHHCCJCY01::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi HHCCJCY01");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Moisture", this->moisture_sensor_);
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_hhccjcy01 {
|
||||
|
||||
class XiaomiHHCCJCY01 final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiHHCCJCY01 final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(moisture)
|
||||
SUB_SENSOR(conductivity)
|
||||
@@ -14,7 +13,7 @@ class XiaomiHHCCJCY01 final : public Component, public xiaomi_ble::XiaomiDevice
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -26,7 +26,7 @@ AUTO_LOAD = ["ble_device_base"]
|
||||
|
||||
xiaomi_hhccjcy10_ns = cg.esphome_ns.namespace("xiaomi_hhccjcy10")
|
||||
XiaomiHHCCJCY10 = xiaomi_hhccjcy10_ns.class_(
|
||||
"XiaomiHHCCJCY10", ble_device_base.ESPBTDeviceListener, cg.Component
|
||||
"XiaomiHHCCJCY10", ble_device_base.ESPBTDeviceListener
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -67,14 +67,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ namespace esphome::xiaomi_hhccjcy10 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_hhccjcy10");
|
||||
|
||||
void XiaomiHHCCJCY10::dump_config() {
|
||||
void XiaomiHHCCJCY10::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi HHCCJCY10");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Moisture", this->moisture_sensor_);
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/ble_device_base/ble_device.h"
|
||||
|
||||
namespace esphome::xiaomi_hhccjcy10 {
|
||||
|
||||
class XiaomiHHCCJCY10 final : public Component, public ble_device_base::ESPBTDeviceListener {
|
||||
class XiaomiHHCCJCY10 final : public ble_device_base::ESPBTDeviceListener {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(moisture)
|
||||
SUB_SENSOR(conductivity)
|
||||
@@ -18,7 +17,7 @@ class XiaomiHHCCJCY10 final : public Component, public ble_device_base::ESPBTDev
|
||||
|
||||
bool parse_device(const ble_device_base::ESPBTDevice &device) override;
|
||||
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
uint64_t address_;
|
||||
|
||||
@@ -17,7 +17,7 @@ AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_hhccpot002_ns = cg.esphome_ns.namespace("xiaomi_hhccpot002")
|
||||
XiaomiHHCCPOT002 = xiaomi_hhccpot002_ns.class_(
|
||||
"XiaomiHHCCPOT002", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
"XiaomiHHCCPOT002", xiaomi_ble.XiaomiDevice
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -39,14 +39,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
state_class=STATE_CLASS_MEASUREMENT,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_hhccpot002 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_hhccpot002");
|
||||
|
||||
void XiaomiHHCCPOT002::dump_config() {
|
||||
void XiaomiHHCCPOT002::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi HHCCPOT002");
|
||||
LOG_SENSOR(" ", "Moisture", this->moisture_sensor_);
|
||||
LOG_SENSOR(" ", "Conductivity", this->conductivity_sensor_);
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_hhccpot002 {
|
||||
|
||||
class XiaomiHHCCPOT002 final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiHHCCPOT002 final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(moisture)
|
||||
SUB_SENSOR(conductivity)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -22,9 +22,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_jqjcy01ym_ns = cg.esphome_ns.namespace("xiaomi_jqjcy01ym")
|
||||
XiaomiJQJCY01YM = xiaomi_jqjcy01ym_ns.class_(
|
||||
"XiaomiJQJCY01YM", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiJQJCY01YM = xiaomi_jqjcy01ym_ns.class_("XiaomiJQJCY01YM", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_jqjcy01ym"),
|
||||
@@ -58,14 +56,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_jqjcy01ym {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_jqjcy01ym");
|
||||
|
||||
void XiaomiJQJCY01YM::dump_config() {
|
||||
void XiaomiJQJCY01YM::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi JQJCY01YM");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Humidity", this->humidity_sensor_);
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_jqjcy01ym {
|
||||
|
||||
class XiaomiJQJCY01YM final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiJQJCY01YM final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(formaldehyde)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -19,9 +19,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_lywsd02_ns = cg.esphome_ns.namespace("xiaomi_lywsd02")
|
||||
XiaomiLYWSD02 = xiaomi_lywsd02_ns.class_(
|
||||
"XiaomiLYWSD02", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiLYWSD02 = xiaomi_lywsd02_ns.class_("XiaomiLYWSD02", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_lywsd02"),
|
||||
@@ -49,14 +47,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_lywsd02 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_lywsd02");
|
||||
|
||||
void XiaomiLYWSD02::dump_config() {
|
||||
void XiaomiLYWSD02::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi LYWSD02");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Humidity", this->humidity_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_lywsd02 {
|
||||
|
||||
class XiaomiLYWSD02 final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiLYWSD02 final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -22,7 +22,7 @@ CODEOWNERS = ["@juanluss31"]
|
||||
|
||||
xiaomi_lywsd02mmc_ns = cg.esphome_ns.namespace("xiaomi_lywsd02mmc")
|
||||
XiaomiLYWSD02MMC = xiaomi_lywsd02mmc_ns.class_(
|
||||
"XiaomiLYWSD02MMC", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
"XiaomiLYWSD02MMC", xiaomi_ble.XiaomiEncryptedDevice
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -52,14 +52,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_lywsd02mmc {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_lywsd02mmc");
|
||||
|
||||
void XiaomiLYWSD02MMC::dump_config() {
|
||||
void XiaomiLYWSD02MMC::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi LYWSD02MMC");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_lywsd02mmc {
|
||||
|
||||
class XiaomiLYWSD02MMC final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiLYWSD02MMC final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -23,7 +23,7 @@ AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_lywsd03mmc_ns = cg.esphome_ns.namespace("xiaomi_lywsd03mmc")
|
||||
XiaomiLYWSD03MMC = xiaomi_lywsd03mmc_ns.class_(
|
||||
"XiaomiLYWSD03MMC", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
"XiaomiLYWSD03MMC", xiaomi_ble.XiaomiEncryptedDevice
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -53,14 +53,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace esphome::xiaomi_lywsd03mmc {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_lywsd03mmc");
|
||||
|
||||
void XiaomiLYWSD03MMC::dump_config() {
|
||||
void XiaomiLYWSD03MMC::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi LYWSD03MMC");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_lywsd03mmc {
|
||||
|
||||
class XiaomiLYWSD03MMC final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiLYWSD03MMC final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -19,9 +19,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_lywsdcgq_ns = cg.esphome_ns.namespace("xiaomi_lywsdcgq")
|
||||
XiaomiLYWSDCGQ = xiaomi_lywsdcgq_ns.class_(
|
||||
"XiaomiLYWSDCGQ", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiLYWSDCGQ = xiaomi_lywsdcgq_ns.class_("XiaomiLYWSDCGQ", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_lywsdcgq"),
|
||||
@@ -49,14 +47,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_lywsdcgq {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_lywsdcgq");
|
||||
|
||||
void XiaomiLYWSDCGQ::dump_config() {
|
||||
void XiaomiLYWSDCGQ::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi LYWSDCGQ");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Humidity", this->humidity_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_lywsdcgq {
|
||||
|
||||
class XiaomiLYWSDCGQ final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiLYWSDCGQ final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -21,7 +21,6 @@ xiaomi_mccgq02hl_ns = cg.esphome_ns.namespace("xiaomi_mccgq02hl")
|
||||
XiaomiMCCGQ02HL = xiaomi_mccgq02hl_ns.class_(
|
||||
"XiaomiMCCGQ02HL",
|
||||
binary_sensor.BinarySensor,
|
||||
cg.Component,
|
||||
ble_device_base.ESPBTDeviceListener,
|
||||
)
|
||||
|
||||
@@ -46,14 +45,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await binary_sensor.new_binary_sensor(config)
|
||||
await cg.register_component(var, config)
|
||||
await ble_device_base.register_ble_device(var, config)
|
||||
|
||||
cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
|
||||
|
||||
@@ -32,7 +32,7 @@ static constexpr uint16_t OBJ_DOOR_ALT = 0x1019;
|
||||
static constexpr uint16_t OBJ_BATTERY = 0x100A;
|
||||
static constexpr uint16_t OBJ_BATTERY_ALT = 0x4803;
|
||||
|
||||
void XiaomiMCCGQ02HL::dump_config() {
|
||||
void XiaomiMCCGQ02HL::dump_child_config() {
|
||||
uint8_t mac[MAC_ADDRESS_SIZE];
|
||||
ble_device_base::uint64_to_mac_msb_first(this->address_, mac);
|
||||
char mac_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/core/optional.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||
@@ -15,8 +14,7 @@ namespace esphome::xiaomi_mccgq02hl {
|
||||
// Self-contained on purpose: xiaomi_ble's parse_xiaomi_header() does not know
|
||||
// this product id and parse_xiaomi_value() does not know the door object, so
|
||||
// this class does its own header and object parsing and decryption.
|
||||
class XiaomiMCCGQ02HL final : public Component,
|
||||
public binary_sensor::BinarySensorInitiallyOff,
|
||||
class XiaomiMCCGQ02HL final : public binary_sensor::BinarySensorInitiallyOff,
|
||||
public ble_device_base::ESPBTDeviceListener {
|
||||
SUB_BINARY_SENSOR(light)
|
||||
SUB_SENSOR(battery_level)
|
||||
@@ -26,7 +24,7 @@ class XiaomiMCCGQ02HL final : public Component,
|
||||
void set_bindkey(const char *bindkey);
|
||||
|
||||
bool parse_device(const ble_device_base::ESPBTDevice &device) override;
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
struct Reading {
|
||||
|
||||
@@ -19,9 +19,7 @@ from esphome.types import ConfigType
|
||||
AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_mhoc303_ns = cg.esphome_ns.namespace("xiaomi_mhoc303")
|
||||
XiaomiMHOC303 = xiaomi_mhoc303_ns.class_(
|
||||
"XiaomiMHOC303", xiaomi_ble.XiaomiDevice, cg.Component
|
||||
)
|
||||
XiaomiMHOC303 = xiaomi_mhoc303_ns.class_("XiaomiMHOC303", xiaomi_ble.XiaomiDevice)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
ble_device_base.rename_legacy_hub_id("xiaomi_mhoc303"),
|
||||
@@ -49,14 +47,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_mhoc303 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_mhoc303");
|
||||
|
||||
void XiaomiMHOC303::dump_config() {
|
||||
void XiaomiMHOC303::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi MHOC303");
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
LOG_SENSOR(" ", "Humidity", this->humidity_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_mhoc303 {
|
||||
|
||||
class XiaomiMHOC303 final : public Component, public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiMHOC303 final : public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -22,7 +22,7 @@ AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
|
||||
|
||||
xiaomi_mhoc401_ns = cg.esphome_ns.namespace("xiaomi_mhoc401")
|
||||
XiaomiMHOC401 = xiaomi_mhoc401_ns.class_(
|
||||
"XiaomiMHOC401", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
"XiaomiMHOC401", xiaomi_ble.XiaomiEncryptedDevice
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -52,14 +52,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace esphome::xiaomi_mhoc401 {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_mhoc401");
|
||||
|
||||
void XiaomiMHOC401::dump_config() {
|
||||
void XiaomiMHOC401::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi MHOC401");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_mhoc401 {
|
||||
|
||||
class XiaomiMHOC401 final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiMHOC401 final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -19,7 +19,7 @@ AUTO_LOAD = ["ble_device_base"]
|
||||
|
||||
xiaomi_miscale_ns = cg.esphome_ns.namespace("xiaomi_miscale")
|
||||
XiaomiMiscale = xiaomi_miscale_ns.class_(
|
||||
"XiaomiMiscale", ble_device_base.ESPBTDeviceListener, cg.Component
|
||||
"XiaomiMiscale", ble_device_base.ESPBTDeviceListener
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -43,14 +43,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
state_class=STATE_CLASS_MEASUREMENT,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
|
||||
cg.add(var.set_clear_impedance(config[CONF_CLEAR_IMPEDANCE]))
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace esphome::xiaomi_miscale {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_miscale");
|
||||
|
||||
void XiaomiMiscale::dump_config() {
|
||||
void XiaomiMiscale::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi Miscale");
|
||||
LOG_SENSOR(" ", "Weight", this->weight_sensor_);
|
||||
LOG_SENSOR(" ", "Impedance", this->impedance_sensor_);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/ble_device_base/ble_device.h"
|
||||
|
||||
@@ -14,7 +13,7 @@ struct ParseResult {
|
||||
optional<float> impedance;
|
||||
};
|
||||
|
||||
class XiaomiMiscale final : public Component, public ble_device_base::ESPBTDeviceListener {
|
||||
class XiaomiMiscale final : public ble_device_base::ESPBTDeviceListener {
|
||||
SUB_SENSOR(weight)
|
||||
SUB_SENSOR(impedance)
|
||||
|
||||
@@ -22,7 +21,7 @@ class XiaomiMiscale final : public Component, public ble_device_base::ESPBTDevic
|
||||
void set_address(uint64_t address) { address_ = address; };
|
||||
|
||||
bool parse_device(const ble_device_base::ESPBTDevice &device) override;
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
void set_clear_impedance(bool clear_impedance) { clear_impedance_ = clear_impedance; }
|
||||
|
||||
protected:
|
||||
|
||||
@@ -27,7 +27,6 @@ xiaomi_mjyd02yla_ns = cg.esphome_ns.namespace("xiaomi_mjyd02yla")
|
||||
XiaomiMJYD02YLA = xiaomi_mjyd02yla_ns.class_(
|
||||
"XiaomiMJYD02YLA",
|
||||
binary_sensor.BinarySensor,
|
||||
cg.Component,
|
||||
xiaomi_ble.XiaomiEncryptedDevice,
|
||||
)
|
||||
|
||||
@@ -64,14 +63,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await binary_sensor.new_binary_sensor(config)
|
||||
await cg.register_component(var, config)
|
||||
await ble_device_base.register_ble_device(var, config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_mjyd02yla {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_mjyd02yla");
|
||||
|
||||
void XiaomiMJYD02YLA::dump_config() {
|
||||
void XiaomiMJYD02YLA::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi MJYD02YL-A");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_BINARY_SENSOR(" ", "Motion", this);
|
||||
|
||||
@@ -1,22 +1,19 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_mjyd02yla {
|
||||
|
||||
class XiaomiMJYD02YLA final : public Component,
|
||||
public binary_sensor::BinarySensorInitiallyOff,
|
||||
public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiMJYD02YLA final : public binary_sensor::BinarySensorInitiallyOff, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(idle_time)
|
||||
SUB_SENSOR(battery_level)
|
||||
SUB_SENSOR(illuminance)
|
||||
SUB_BINARY_SENSOR(light)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -20,7 +20,6 @@ XiaomiWX08ZM = xiaomi_wx08zm_ns.class_(
|
||||
"XiaomiWX08ZM",
|
||||
binary_sensor.BinarySensor,
|
||||
xiaomi_ble.XiaomiDevice,
|
||||
cg.Component,
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -44,14 +43,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await binary_sensor.new_binary_sensor(config)
|
||||
await cg.register_component(var, config)
|
||||
await ble_device_base.register_ble_device(var, config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
@@ -5,7 +5,7 @@ namespace esphome::xiaomi_wx08zm {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_wx08zm");
|
||||
|
||||
void XiaomiWX08ZM::dump_config() {
|
||||
void XiaomiWX08ZM::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi WX08ZM");
|
||||
LOG_BINARY_SENSOR(" ", "Mosquito Repellent", this);
|
||||
LOG_SENSOR(" ", "Tablet Resource", this->tablet_sensor_);
|
||||
|
||||
@@ -1,20 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/binary_sensor/binary_sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_wx08zm {
|
||||
|
||||
class XiaomiWX08ZM final : public Component,
|
||||
public binary_sensor::BinarySensorInitiallyOff,
|
||||
public xiaomi_ble::XiaomiDevice {
|
||||
class XiaomiWX08ZM final : public binary_sensor::BinarySensorInitiallyOff, public xiaomi_ble::XiaomiDevice {
|
||||
SUB_SENSOR(tablet)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -22,7 +22,7 @@ CODEOWNERS = ["@medusalix"]
|
||||
|
||||
xiaomi_xmwsdj04mmc_ns = cg.esphome_ns.namespace("xiaomi_xmwsdj04mmc")
|
||||
XiaomiXMWSDJ04MMC = xiaomi_xmwsdj04mmc_ns.class_(
|
||||
"XiaomiXMWSDJ04MMC", xiaomi_ble.XiaomiEncryptedDevice, cg.Component
|
||||
"XiaomiXMWSDJ04MMC", xiaomi_ble.XiaomiEncryptedDevice
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.All(
|
||||
@@ -52,14 +52,12 @@ CONFIG_SCHEMA = cv.All(
|
||||
entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
).extend(ble_device_base.BLE_DEVICE_SCHEMA),
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config: ConfigType) -> None:
|
||||
var = await ble_device_base.new_ble_device_component(config)
|
||||
var = await ble_device_base.new_ble_device(config)
|
||||
|
||||
xiaomi_ble.setup_xiaomi_device(var, config)
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ namespace esphome::xiaomi_xmwsdj04mmc {
|
||||
|
||||
ESPHOME_LOG_TAG(TAG, "xiaomi_xmwsdj04mmc");
|
||||
|
||||
void XiaomiXMWSDJ04MMC::dump_config() {
|
||||
void XiaomiXMWSDJ04MMC::dump_child_config() {
|
||||
ESP_LOGCONFIG(TAG, "Xiaomi XMWSDJ04MMC");
|
||||
this->dump_bindkey_(TAG);
|
||||
LOG_SENSOR(" ", "Temperature", this->temperature_sensor_);
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
#pragma once
|
||||
|
||||
#include "esphome/core/component.h"
|
||||
#include "esphome/components/sensor/sensor.h"
|
||||
#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
|
||||
|
||||
namespace esphome::xiaomi_xmwsdj04mmc {
|
||||
|
||||
class XiaomiXMWSDJ04MMC final : public Component, public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
class XiaomiXMWSDJ04MMC final : public xiaomi_ble::XiaomiEncryptedDevice {
|
||||
SUB_SENSOR(temperature)
|
||||
SUB_SENSOR(humidity)
|
||||
SUB_SENSOR(battery_level)
|
||||
|
||||
public:
|
||||
void dump_config() override;
|
||||
void dump_child_config() override;
|
||||
|
||||
protected:
|
||||
void publish_result(const xiaomi_ble::XiaomiParseResult &res) override;
|
||||
|
||||
@@ -41,7 +41,9 @@ class CountingListener : public ESPBTDeviceListener {
|
||||
this->parsed++;
|
||||
return true; // claimed: keeps the discovered log quiet
|
||||
}
|
||||
void dump_child_config() override { this->dumped++; }
|
||||
int parsed{0};
|
||||
int dumped{0};
|
||||
};
|
||||
|
||||
class ScanResponseMergerTest : public ::testing::Test {
|
||||
@@ -189,5 +191,13 @@ TEST_F(ScanResponseMergerTest, PartialBindIsTreatedAsUnbound) {
|
||||
EXPECT_TRUE(this->raw_.frames.empty());
|
||||
}
|
||||
|
||||
TEST_F(ScanResponseMergerTest, DumpChildConfigsReachesEveryListener) {
|
||||
CountingListener second;
|
||||
this->dispatcher_.register_listener(&second);
|
||||
this->dispatcher_.dump_child_configs();
|
||||
EXPECT_EQ(this->listener_.dumped, 1);
|
||||
EXPECT_EQ(second.dumped, 1);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace esphome::ble_device_base::testing
|
||||
Reference in new issue
Block a user