mirror of
https://github.com/esphome/esphome.git
synced 2024-11-21 22:48:10 +01:00
[dsmr] Add internal 'telegram' text_sensor to support bridging (#6841)
Some checks are pending
CI / Check black (push) Blocked by required conditions
CI / Create common environment (push) Waiting to run
CI / Check flake8 (push) Blocked by required conditions
CI / Check pylint (push) Blocked by required conditions
CI / Check pyupgrade (push) Blocked by required conditions
CI / Run script/ci-custom (push) Blocked by required conditions
CI / Run pytest (macOS-latest, 3.11) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.10) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.9) (push) Blocked by required conditions
CI / Run pytest (windows-latest, 3.11) (push) Blocked by required conditions
CI / Check clang-format (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 1/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 2/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 3/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 4/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP8266 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 IDF (push) Blocked by required conditions
CI / list-components (push) Blocked by required conditions
CI / Component test ${{ matrix.file }} (push) Blocked by required conditions
CI / Split components for testing into 20 groups maximum (push) Blocked by required conditions
CI / Test split components (push) Blocked by required conditions
CI / CI Status (push) Blocked by required conditions
Some checks are pending
CI / Check black (push) Blocked by required conditions
CI / Create common environment (push) Waiting to run
CI / Check flake8 (push) Blocked by required conditions
CI / Check pylint (push) Blocked by required conditions
CI / Check pyupgrade (push) Blocked by required conditions
CI / Run script/ci-custom (push) Blocked by required conditions
CI / Run pytest (macOS-latest, 3.11) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.10) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.11) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.12) (push) Blocked by required conditions
CI / Run pytest (ubuntu-latest, 3.9) (push) Blocked by required conditions
CI / Run pytest (windows-latest, 3.11) (push) Blocked by required conditions
CI / Check clang-format (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 1/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 2/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 3/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 Arduino 4/4 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP8266 (push) Blocked by required conditions
CI / Run script/clang-tidy for ESP32 IDF (push) Blocked by required conditions
CI / list-components (push) Blocked by required conditions
CI / Component test ${{ matrix.file }} (push) Blocked by required conditions
CI / Split components for testing into 20 groups maximum (push) Blocked by required conditions
CI / Test split components (push) Blocked by required conditions
CI / CI Status (push) Blocked by required conditions
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
parent
c8aed15157
commit
de7d2c33e1
3 changed files with 19 additions and 2 deletions
|
@ -256,6 +256,7 @@ bool Dsmr::parse_telegram() {
|
||||||
MyData data;
|
MyData data;
|
||||||
ESP_LOGV(TAG, "Trying to parse telegram");
|
ESP_LOGV(TAG, "Trying to parse telegram");
|
||||||
this->stop_requesting_data_();
|
this->stop_requesting_data_();
|
||||||
|
|
||||||
::dsmr::ParseResult<void> res =
|
::dsmr::ParseResult<void> res =
|
||||||
::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
|
::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
|
||||||
this->crc_check_); // Parse telegram according to data definition. Ignore unknown values.
|
this->crc_check_); // Parse telegram according to data definition. Ignore unknown values.
|
||||||
|
@ -267,6 +268,11 @@ bool Dsmr::parse_telegram() {
|
||||||
} else {
|
} else {
|
||||||
this->status_clear_warning();
|
this->status_clear_warning();
|
||||||
this->publish_sensors(data);
|
this->publish_sensors(data);
|
||||||
|
|
||||||
|
// publish the telegram, after publishing the sensors so it can also trigger action based on latest values
|
||||||
|
if (this->s_telegram_ != nullptr) {
|
||||||
|
this->s_telegram_->publish_state(std::string(this->telegram_, this->bytes_read_));
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,6 +85,9 @@ class Dsmr : public Component, public uart::UARTDevice {
|
||||||
void set_##s(text_sensor::TextSensor *sensor) { s_##s##_ = sensor; }
|
void set_##s(text_sensor::TextSensor *sensor) { s_##s##_ = sensor; }
|
||||||
DSMR_TEXT_SENSOR_LIST(DSMR_SET_TEXT_SENSOR, )
|
DSMR_TEXT_SENSOR_LIST(DSMR_SET_TEXT_SENSOR, )
|
||||||
|
|
||||||
|
// handled outside dsmr
|
||||||
|
void set_telegram(text_sensor::TextSensor *sensor) { s_telegram_ = sensor; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void receive_telegram_();
|
void receive_telegram_();
|
||||||
void receive_encrypted_telegram_();
|
void receive_encrypted_telegram_();
|
||||||
|
@ -124,6 +127,9 @@ class Dsmr : public Component, public uart::UARTDevice {
|
||||||
bool header_found_{false};
|
bool header_found_{false};
|
||||||
bool footer_found_{false};
|
bool footer_found_{false};
|
||||||
|
|
||||||
|
// handled outside dsmr
|
||||||
|
text_sensor::TextSensor *s_telegram_{nullptr};
|
||||||
|
|
||||||
// Sensor member pointers
|
// Sensor member pointers
|
||||||
#define DSMR_DECLARE_SENSOR(s) sensor::Sensor *s_##s##_{nullptr};
|
#define DSMR_DECLARE_SENSOR(s) sensor::Sensor *s_##s##_{nullptr};
|
||||||
DSMR_SENSOR_LIST(DSMR_DECLARE_SENSOR, )
|
DSMR_SENSOR_LIST(DSMR_DECLARE_SENSOR, )
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import esphome.codegen as cg
|
import esphome.codegen as cg
|
||||||
import esphome.config_validation as cv
|
import esphome.config_validation as cv
|
||||||
from esphome.components import text_sensor
|
from esphome.components import text_sensor
|
||||||
|
from esphome.const import CONF_INTERNAL
|
||||||
from . import Dsmr, CONF_DSMR_ID
|
from . import Dsmr, CONF_DSMR_ID
|
||||||
|
|
||||||
AUTO_LOAD = ["dsmr"]
|
AUTO_LOAD = ["dsmr"]
|
||||||
|
@ -22,6 +22,9 @@ CONFIG_SCHEMA = cv.Schema(
|
||||||
cv.Optional("water_equipment_id"): text_sensor.text_sensor_schema(),
|
cv.Optional("water_equipment_id"): text_sensor.text_sensor_schema(),
|
||||||
cv.Optional("sub_equipment_id"): text_sensor.text_sensor_schema(),
|
cv.Optional("sub_equipment_id"): text_sensor.text_sensor_schema(),
|
||||||
cv.Optional("gas_delivered_text"): text_sensor.text_sensor_schema(),
|
cv.Optional("gas_delivered_text"): text_sensor.text_sensor_schema(),
|
||||||
|
cv.Optional("telegram"): text_sensor.text_sensor_schema().extend(
|
||||||
|
{cv.Optional(CONF_INTERNAL, default=True): cv.boolean}
|
||||||
|
),
|
||||||
}
|
}
|
||||||
).extend(cv.COMPONENT_SCHEMA)
|
).extend(cv.COMPONENT_SCHEMA)
|
||||||
|
|
||||||
|
@ -37,7 +40,9 @@ async def to_code(config):
|
||||||
if id and id.type == text_sensor.TextSensor:
|
if id and id.type == text_sensor.TextSensor:
|
||||||
var = await text_sensor.new_text_sensor(conf)
|
var = await text_sensor.new_text_sensor(conf)
|
||||||
cg.add(getattr(hub, f"set_{key}")(var))
|
cg.add(getattr(hub, f"set_{key}")(var))
|
||||||
text_sensors.append(f"F({key})")
|
if key != "telegram":
|
||||||
|
# telegram is not handled by dsmr
|
||||||
|
text_sensors.append(f"F({key})")
|
||||||
|
|
||||||
if text_sensors:
|
if text_sensors:
|
||||||
cg.add_define(
|
cg.add_define(
|
||||||
|
|
Loading…
Reference in a new issue