sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

Template sensors always publish on update interval (#2224)

Browse Source 
Co-authored-by: Chris Nussbaum <chris.nussbaum@protolabs.com>
This commit is contained in:
Chris Nussbaum
2021-09-07 22:36:49 -05:00
committed by GitHub
parent 1be106c0b5
commit 6180ee8065
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
esphome/components/template/sensor/template_sensor.cpp
View File

@@ -7,13 +7,14 @@ namespace template_ {
static const char *const TAG = "template.sensor"; static const char *const TAG = "template.sensor";
void TemplateSensor::update() { void TemplateSensor::update() {
if (!this->f_.has_value()) if (this->f_.has_value()) {
return;
auto val = (*this->f_)(); auto val = (*this->f_)();
if (val.has_value()) { if (val.has_value()) {
this->publish_state(*val); this->publish_state(*val);
} }
} else if (!isnan(this->get_raw_state())) {
this->publish_state(this->get_raw_state());
}
} }
float TemplateSensor::get_setup_priority() const { return setup_priority::HARDWARE; } float TemplateSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
void TemplateSensor::set_template(std::function<optional<float>()> &&f) { this->f_ = f; } void TemplateSensor::set_template(std::function<optional<float>()> &&f) { this->f_ = f; }

7
esphome/components/template/text_sensor/template_text_sensor.cpp
View File

@@ -7,13 +7,14 @@ namespace template_ {
static const char *const TAG = "template.text_sensor"; static const char *const TAG = "template.text_sensor";
void TemplateTextSensor::update() { void TemplateTextSensor::update() {
if (!this->f_.has_value()) if (this->f_.has_value()) {
return;
auto val = (*this->f_)(); auto val = (*this->f_)();
if (val.has_value()) { if (val.has_value()) {
this->publish_state(*val); this->publish_state(*val);
} }
} else if (this->has_state()) {
this->publish_state(this->state);
}
} }
float TemplateTextSensor::get_setup_priority() const { return setup_priority::HARDWARE; } float TemplateTextSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
void TemplateTextSensor::set_template(std::function<optional<std::string>()> &&f) { this->f_ = f; } void TemplateTextSensor::set_template(std::function<optional<std::string>()> &&f) { this->f_ = f; }