Compare commits

...
Author SHA1 Message Date
J. Nick Koston 3a4d27147d Merge remote-tracking branch 'origin/dev' into HEAD 2026-11-14 08:38:42 -06:00
J. Nick Koston 0ad4435ae6 [vbus] Name the listener hook dump_child_config 2026-10-30 10:06:16 -10:00
J. Nick Koston 0044f30ff5 Note the dump buffering trade-off in the PR description 2026-10-30 08:22:17 -10:00
J. Nick Koston 55f52a1df5 Merge dev into vbus-entities-drop-component 2026-10-30 08:19:54 -10:00
J. Nick Koston 141105e36c [vbus] Check the binary sensor listener's wildcard source in the dump test 2026-10-30 08:10:13 -10:00
J. Nick Koston f131f788f8 [vbus] Print each listener's own config dump from the hub
Restores the dev dump output (model name, sensors, custom filters) and
drops the hub's code-only listener lines.
2026-10-30 08:01:49 -10:00
J. Nick Koston 66e9eeaf6a [vbus] Build a custom sensor entry in the component test 2026-10-29 20:53:38 -10:00
J. Nick Koston 57abf9dda4 [vbus] Keep the listener filter format strings in flash 2026-10-29 20:50:34 -10:00
J. Nick Koston 1d7c6aa184 [vbus] Print each listener's filter in the hub's config dump
The custom entries' source, dest and command were only shown by their own
dump_config(); the hub now prints one line per listener instead.
2026-10-29 20:49:14 -10:00
J. Nick Koston 5b1c5ec217 Update PR description 2026-10-29 20:43:11 -10:00
J. Nick Koston 298a36f43f Update PR description 2026-10-29 20:41:41 -10:00
J. Nick Koston ad71d262ce [vbus] Drop the dump_config-only Component base from the sensors
The DeltaSol and custom sensor and binary sensor listeners only used
Component to print a config dump. Drop the base, the dump_config()
overrides, register_component and COMPONENT_SCHEMA.
2026-10-29 20:29:27 -10:00
11 changed files with 166 additions and 84 deletions

No files matched your search

@@ -28,14 +28,14 @@ from .. import (
vbus_ns,
)
DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusBSensor", cg.Component)
DeltaSol_BS_2009 = vbus_ns.class_("DeltaSolBS2009BSensor", cg.Component)
DeltaSol_BS2 = vbus_ns.class_("DeltaSolBS2BSensor", cg.Component)
DeltaSol_C = vbus_ns.class_("DeltaSolCBSensor", cg.Component)
DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2BSensor", cg.Component)
DeltaSol_CS4 = vbus_ns.class_("DeltaSolCS4BSensor", cg.Component)
DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusBSensor", cg.Component)
VBusCustom = vbus_ns.class_("VBusCustomBSensor", cg.Component)
DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusBSensor")
DeltaSol_BS_2009 = vbus_ns.class_("DeltaSolBS2009BSensor")
DeltaSol_BS2 = vbus_ns.class_("DeltaSolBS2BSensor")
DeltaSol_C = vbus_ns.class_("DeltaSolCBSensor")
DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2BSensor")
DeltaSol_CS4 = vbus_ns.class_("DeltaSolCS4BSensor")
DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusBSensor")
VBusCustom = vbus_ns.class_("VBusCustomBSensor")
VBusCustomSub = vbus_ns.class_("VBusCustomSubBSensor", binary_sensor.BinarySensor)
CONF_RELAY1 = "relay1"
@@ -54,7 +54,7 @@ CONF_FROST_PROTECTION_ACTIVE = "frost_protection_active"
CONFIG_SCHEMA = cv.typed_schema(
{
CONF_DELTASOL_BS_PLUS: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS_PLUS: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS_Plus),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -96,7 +96,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_BS_2009: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS_2009: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS_2009),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -123,7 +123,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_BS2: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS2: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS2),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -145,7 +145,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_C: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_C: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_C),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -167,7 +167,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS2: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS2: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS2),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -189,7 +189,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS4: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS4: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS4),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -211,7 +211,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS_PLUS: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS_PLUS: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS_Plus),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -233,7 +233,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_CUSTOM: cv.COMPONENT_SCHEMA.extend(
CONF_CUSTOM: cv.Schema(
{
cv.GenerateID(): cv.declare_id(VBusCustom),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -259,7 +259,6 @@ CONFIG_SCHEMA = cv.typed_schema(
async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
binary_sensors = binary_sensor.sub_binary_sensors(config)
if config[CONF_MODEL] == CONF_DELTASOL_BS_PLUS:
@@ -6,7 +6,7 @@ namespace esphome::vbus {
ESPHOME_LOG_TAG(TAG, "vbus.binary_sensor");
void DeltaSolBSPlusBSensor::dump_config() {
void DeltaSolBSPlusBSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol BS Plus:");
LOG_BINARY_SENSOR(" ", "Relay 1 On", this->relay1_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Relay 2 On", this->relay2_binary_sensor_);
@@ -37,7 +37,7 @@ void DeltaSolBSPlusBSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->hqm_binary_sensor_, message[15] & 0x20);
}
void DeltaSolBS2009BSensor::dump_config() {
void DeltaSolBS2009BSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol BS 2009:");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -54,7 +54,7 @@ void DeltaSolBS2009BSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->frost_protection_active_binary_sensor_, message[25] & 1);
}
void DeltaSolCBSensor::dump_config() {
void DeltaSolCBSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol C:");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -69,7 +69,7 @@ void DeltaSolCBSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->s4_error_binary_sensor_, message[10] & 8);
}
void DeltaSolCS2BSensor::dump_config() {
void DeltaSolCS2BSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS2:");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -84,7 +84,7 @@ void DeltaSolCS2BSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->s4_error_binary_sensor_, message[18] & 8);
}
void DeltaSolCS4BSensor::dump_config() {
void DeltaSolCS4BSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS4:");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -99,7 +99,7 @@ void DeltaSolCS4BSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->s4_error_binary_sensor_, message[20] & 8);
}
void DeltaSolCSPlusBSensor::dump_config() {
void DeltaSolCSPlusBSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS Plus:");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -114,7 +114,7 @@ void DeltaSolCSPlusBSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->s4_error_binary_sensor_, message[20] & 8);
}
void DeltaSolBS2BSensor::dump_config() {
void DeltaSolBS2BSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "DeltaSol BS/2 (DrainBack):");
LOG_BINARY_SENSOR(" ", "Sensor 1 Error", this->s1_error_binary_sensor_);
LOG_BINARY_SENSOR(" ", "Sensor 2 Error", this->s2_error_binary_sensor_);
@@ -129,7 +129,7 @@ void DeltaSolBS2BSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->s4_error_binary_sensor_, message[10] & 8);
}
void VBusCustomBSensor::dump_config() {
void VBusCustomBSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "VBus Custom Binary Sensor:");
if (this->source_ == 0xffff) {
ESP_LOGCONFIG(TAG, " Source address: ANY");
@@ -5,9 +5,9 @@
namespace esphome::vbus {
class DeltaSolBSPlusBSensor final : public VBusListener, public Component {
class DeltaSolBSPlusBSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(relay1)
SUB_BINARY_SENSOR(relay2)
SUB_BINARY_SENSOR(s1_error)
@@ -25,9 +25,9 @@ class DeltaSolBSPlusBSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolBS2009BSensor final : public VBusListener, public Component {
class DeltaSolBS2009BSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -38,9 +38,9 @@ class DeltaSolBS2009BSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCBSensor final : public VBusListener, public Component {
class DeltaSolCBSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -50,9 +50,9 @@ class DeltaSolCBSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCS2BSensor final : public VBusListener, public Component {
class DeltaSolCS2BSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -62,9 +62,9 @@ class DeltaSolCS2BSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCS4BSensor final : public VBusListener, public Component {
class DeltaSolCS4BSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -74,9 +74,9 @@ class DeltaSolCS4BSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCSPlusBSensor final : public VBusListener, public Component {
class DeltaSolCSPlusBSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -86,9 +86,9 @@ class DeltaSolCSPlusBSensor final : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolBS2BSensor final : public VBusListener, public Component {
class DeltaSolBS2BSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_BINARY_SENSOR(s1_error)
SUB_BINARY_SENSOR(s2_error)
SUB_BINARY_SENSOR(s3_error)
@@ -100,9 +100,9 @@ class DeltaSolBS2BSensor final : public VBusListener, public Component {
class VBusCustomSubBSensor;
class VBusCustomBSensor final : public VBusListener, public Component {
class VBusCustomBSensor final : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
void set_bsensors(std::vector<VBusCustomSubBSensor *> bsensors) { this->bsensors_ = std::move(bsensors); };
protected:
+16 -17
View File
@@ -44,14 +44,14 @@ from .. import (
vbus_ns,
)
DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusSensor", cg.Component)
DeltaSol_BS_2009 = vbus_ns.class_("DeltaSolBS2009Sensor", cg.Component)
DeltaSol_BS2 = vbus_ns.class_("DeltaSolBS2Sensor", cg.Component)
DeltaSol_C = vbus_ns.class_("DeltaSolCSensor", cg.Component)
DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2Sensor", cg.Component)
DeltaSol_CS4 = vbus_ns.class_("DeltaSolCS4Sensor", cg.Component)
DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusSensor", cg.Component)
VBusCustom = vbus_ns.class_("VBusCustomSensor", cg.Component)
DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusSensor")
DeltaSol_BS_2009 = vbus_ns.class_("DeltaSolBS2009Sensor")
DeltaSol_BS2 = vbus_ns.class_("DeltaSolBS2Sensor")
DeltaSol_C = vbus_ns.class_("DeltaSolCSensor")
DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2Sensor")
DeltaSol_CS4 = vbus_ns.class_("DeltaSolCS4Sensor")
DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusSensor")
VBusCustom = vbus_ns.class_("VBusCustomSensor")
VBusCustomSub = vbus_ns.class_("VBusCustomSubSensor", sensor.Sensor)
CONF_FLOW_RATE = "flow_rate"
@@ -70,7 +70,7 @@ CONF_TEMPERATURE_5 = "temperature_5"
CONFIG_SCHEMA = cv.typed_schema(
{
CONF_DELTASOL_BS_PLUS: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS_PLUS: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS_Plus),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -151,7 +151,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_BS_2009: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS_2009: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS_2009),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -232,7 +232,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_BS2: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_BS2: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_BS2),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -305,7 +305,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_C: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_C: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_C),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -382,7 +382,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS2: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS2: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS2),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -441,7 +441,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS4: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS4: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS4),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -534,7 +534,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_DELTASOL_CS_PLUS: cv.COMPONENT_SCHEMA.extend(
CONF_DELTASOL_CS_PLUS: cv.Schema(
{
cv.GenerateID(): cv.declare_id(DeltaSol_CS_Plus),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -627,7 +627,7 @@ CONFIG_SCHEMA = cv.typed_schema(
),
}
),
CONF_CUSTOM: cv.COMPONENT_SCHEMA.extend(
CONF_CUSTOM: cv.Schema(
{
cv.GenerateID(): cv.declare_id(VBusCustom),
cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
@@ -653,7 +653,6 @@ CONFIG_SCHEMA = cv.typed_schema(
async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
sensors = sensor.sub_sensors(config)
if config[CONF_MODEL] == CONF_DELTASOL_BS_PLUS:
@@ -14,7 +14,7 @@ static inline int16_t get_i16(std::vector<uint8_t> &message, int start) {
return encode_value_le<int16_t>(&message[start]);
}
void DeltaSolBSPlusSensor::dump_config() {
void DeltaSolBSPlusSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol BS Plus:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -44,7 +44,7 @@ void DeltaSolBSPlusSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->version_sensor_, get_u16(message, 26) * 0.01f);
}
void DeltaSolBS2009Sensor::dump_config() {
void DeltaSolBS2009Sensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol BS 2009:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -73,7 +73,7 @@ void DeltaSolBS2009Sensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->version_sensor_, get_u16(message, 32) * 0.01f);
}
void DeltaSolCSensor::dump_config() {
void DeltaSolCSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol C:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -101,7 +101,7 @@ void DeltaSolCSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->time_sensor_, get_u16(message, 22));
}
void DeltaSolCS2Sensor::dump_config() {
void DeltaSolCS2Sensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS2:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -125,7 +125,7 @@ void DeltaSolCS2Sensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->version_sensor_, get_u16(message, 28) * 0.01f);
}
void DeltaSolCS4Sensor::dump_config() {
void DeltaSolCS4Sensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS4:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -159,7 +159,7 @@ void DeltaSolCS4Sensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->flow_rate_sensor_, get_u16(message, 38));
}
void DeltaSolCSPlusSensor::dump_config() {
void DeltaSolCSPlusSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "Deltasol CS Plus:");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -193,7 +193,7 @@ void DeltaSolCSPlusSensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->flow_rate_sensor_, get_u16(message, 38));
}
void DeltaSolBS2Sensor::dump_config() {
void DeltaSolBS2Sensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "DeltaSol BS/2 (DrainBack):");
LOG_SENSOR(" ", "Temperature 1", this->temperature1_sensor_);
LOG_SENSOR(" ", "Temperature 2", this->temperature2_sensor_);
@@ -221,7 +221,7 @@ void DeltaSolBS2Sensor::handle_message(std::vector<uint8_t> &message) {
PUBLISH_STATE(this->version_sensor_, get_u16(message, 24) * 0.01f);
}
void VBusCustomSensor::dump_config() {
void VBusCustomSensor::dump_child_config() {
ESP_LOGCONFIG(TAG, "VBus Custom Sensor:");
if (this->source_ == 0xffff) {
ESP_LOGCONFIG(TAG, " Source address: ANY");
+16 -17
View File
@@ -5,9 +5,9 @@
namespace esphome::vbus {
class DeltaSolBSPlusSensor : public VBusListener, public Component {
class DeltaSolBSPlusSensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -24,9 +24,9 @@ class DeltaSolBSPlusSensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolBS2009Sensor : public VBusListener, public Component {
class DeltaSolBS2009Sensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -43,9 +43,9 @@ class DeltaSolBS2009Sensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCSensor : public VBusListener, public Component {
class DeltaSolCSensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -61,9 +61,9 @@ class DeltaSolCSensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCS2Sensor : public VBusListener, public Component {
class DeltaSolCS2Sensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -77,9 +77,9 @@ class DeltaSolCS2Sensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCS4Sensor : public VBusListener, public Component {
class DeltaSolCS4Sensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -98,9 +98,9 @@ class DeltaSolCS4Sensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolCSPlusSensor : public VBusListener, public Component {
class DeltaSolCSPlusSensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -119,10 +119,9 @@ class DeltaSolCSPlusSensor : public VBusListener, public Component {
void handle_message(std::vector<uint8_t> &message) override;
};
class DeltaSolBS2Sensor : public VBusListener, public Component {
class DeltaSolBS2Sensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
SUB_SENSOR(temperature1)
SUB_SENSOR(temperature2)
SUB_SENSOR(temperature3)
@@ -140,9 +139,9 @@ class DeltaSolBS2Sensor : public VBusListener, public Component {
class VBusCustomSubSensor;
class VBusCustomSensor : public VBusListener, public Component {
class VBusCustomSensor : public VBusListener {
public:
void dump_config() override;
void dump_child_config() override;
void set_sensors(std::vector<VBusCustomSubSensor *> sensors) { this->sensors_ = std::move(sensors); };
protected:
+5 -1
View File
@@ -11,7 +11,11 @@ ESPHOME_LOG_TAG(TAG, "vbus");
// Maximum bytes to log in verbose hex output (16 frames * 4 bytes = 64 bytes typical)
static constexpr size_t VBUS_MAX_LOG_BYTES = 64;
void VBus::dump_config() { ESP_LOGCONFIG(TAG, "VBus:"); }
void VBus::dump_config() {
ESP_LOGCONFIG(TAG, "VBus:");
for (auto *listener : this->listeners_)
listener->dump_child_config();
}
static void septet_spread(uint8_t *data, int start, int count, uint8_t septet) {
for (int i = 0; i < count; i++, septet >>= 1) {
+2
View File
@@ -11,6 +11,8 @@ class VBus;
class VBusListener {
public:
// Called from the hub's dump_config(); not dump_config() so Component children don't print twice
virtual void dump_child_config() {}
void set_command(uint16_t command) { this->command_ = command; }
void set_source(uint16_t source) { this->source_ = source; }
void set_dest(uint16_t dest) { this->dest_ = dest; }
+9
View File
@@ -74,3 +74,12 @@ sensor:
name: BS2 Heat Quantity
version:
name: BS2 Firmware Version
- platform: vbus
model: custom
command: 0x100
source: 0x1234
dest: 0x10
sensors:
- id: vcustom_s
name: VBus Custom Sensor
lambda: return (x[1] << 8) + x[0];
@@ -0,0 +1,34 @@
esphome:
name: vbus-dump-listeners
host:
api:
logger:
level: DEBUG
uart:
baud_rate: 9600
port: /dev/null
vbus:
sensor:
- platform: vbus
model: deltasol_cs4
temperature_1:
name: CS4 Temp 1
- platform: vbus
model: custom
command: 0x0100
source: 0x1234
sensors:
- name: Custom Value
lambda: return x[0];
binary_sensor:
- platform: vbus
model: custom
dest: 0x0010
binary_sensors:
- name: Custom Flag
lambda: return x[0] & 1;
@@ -0,0 +1,36 @@
"""The VBus hub prints each listener's config dump."""
from __future__ import annotations
import pytest
from .log_utils import LineWaiter
from .types import APIClientConnectedFactory, RunCompiledFunction
@pytest.mark.asyncio
async def test_vbus_dump_listeners(
yaml_config: str,
run_compiled: RunCompiledFunction,
api_client_connected: APIClientConnectedFactory,
) -> None:
"""Each listener prints its model and entities, as when it was a component."""
waiter = LineWaiter()
async with (
run_compiled(yaml_config, line_callback=waiter.callback),
api_client_connected() as client,
):
await client.device_info()
await waiter.wait_for_each(
"Deltasol CS4:",
"Temperature 1 'CS4 Temp 1'",
"VBus Custom Sensor:",
"Source address: 0x1234",
"Dest address: ANY",
"Command: 0x0100",
"- 'Custom Value'",
"VBus Custom Binary Sensor:",
"Source address: ANY",
"Dest address: 0x0010",
"- 'Custom Flag'",
)