Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-20 16:18:49 +01:00
Code Issues Projects Releases Wiki Activity

total_daily_energy: allow to disable restore mode (#2795)

Browse Source
This commit is contained in:
Adrián Panella 2021-11-25 15:35:36 -06:00 committed by GitHub
parent 2347e043a9
commit e7827a6997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/total_daily_energy/sensor.py
View File

@ -4,6 +4,7 @@ from esphome.components import sensor, time
from esphome.const import ( from esphome.const import (
CONF_ICON, CONF_ICON,
CONF_ID, CONF_ID,
CONF_RESTORE,
CONF_TIME_ID, CONF_TIME_ID,
DEVICE_CLASS_ENERGY, DEVICE_CLASS_ENERGY,
CONF_METHOD, CONF_METHOD,
@ -36,6 +37,7 @@ CONFIG_SCHEMA = (
cv.GenerateID(): cv.declare_id(TotalDailyEnergy), cv.GenerateID(): cv.declare_id(TotalDailyEnergy),
cv.GenerateID(CONF_TIME_ID): cv.use_id(time.RealTimeClock), cv.GenerateID(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
cv.Required(CONF_POWER_ID): cv.use_id(sensor.Sensor), cv.Required(CONF_POWER_ID): cv.use_id(sensor.Sensor),
cv.Optional(CONF_RESTORE, default=True): cv.boolean,
cv.Optional( cv.Optional(
CONF_MIN_SAVE_INTERVAL, default="0s" CONF_MIN_SAVE_INTERVAL, default="0s"
): cv.positive_time_period_milliseconds, ): cv.positive_time_period_milliseconds,
@ -70,5 +72,6 @@ async def to_code(config):
cg.add(var.set_parent(sens)) cg.add(var.set_parent(sens))
time_ = await cg.get_variable(config[CONF_TIME_ID]) time_ = await cg.get_variable(config[CONF_TIME_ID])
cg.add(var.set_time(time_)) cg.add(var.set_time(time_))
cg.add(var.set_restore(config[CONF_RESTORE]))
cg.add(var.set_min_save_interval(config[CONF_MIN_SAVE_INTERVAL])) cg.add(var.set_min_save_interval(config[CONF_MIN_SAVE_INTERVAL]))
cg.add(var.set_method(config[CONF_METHOD])) cg.add(var.set_method(config[CONF_METHOD]))

12
esphome/components/total_daily_energy/total_daily_energy.cpp
View File

@ -7,14 +7,14 @@ namespace total_daily_energy {
static const char *const TAG = "total_daily_energy"; static const char *const TAG = "total_daily_energy";
void TotalDailyEnergy::setup() { void TotalDailyEnergy::setup() {
this->pref_ = global_preferences->make_preference<float>(this->get_object_id_hash()); float initial_value = 0;
float recovered; if (this->restore_) {
if (this->pref_.load(&recovered)) { this->pref_ = global_preferences->make_preference<float>(this->get_object_id_hash());
this->publish_state_and_save(recovered); this->pref_.load(&initial_value);
} else {
this->publish_state_and_save(0);
} }
this->publish_state_and_save(initial_value);
this->last_update_ = millis(); this->last_update_ = millis();
this->last_save_ = this->last_update_; this->last_save_ = this->last_update_;

2
esphome/components/total_daily_energy/total_daily_energy.h
View File

@ -17,6 +17,7 @@ enum TotalDailyEnergyMethod {
class TotalDailyEnergy : public sensor::Sensor, public Component { class TotalDailyEnergy : public sensor::Sensor, public Component {
public: public:
void set_restore(bool restore) { restore_ = restore; }
void set_min_save_interval(uint32_t min_interval) { this->min_save_interval_ = min_interval; } void set_min_save_interval(uint32_t min_interval) { this->min_save_interval_ = min_interval; }
void set_time(time::RealTimeClock *time) { time_ = time; } void set_time(time::RealTimeClock *time) { time_ = time; }
void set_parent(Sensor *parent) { parent_ = parent; } void set_parent(Sensor *parent) { parent_ = parent; }
@ -41,6 +42,7 @@ class TotalDailyEnergy : public sensor::Sensor, public Component {
uint32_t last_update_{0}; uint32_t last_update_{0};
uint32_t last_save_{0}; uint32_t last_save_{0};
uint32_t min_save_interval_{0}; uint32_t min_save_interval_{0};
bool restore_;
float total_energy_{0.0f}; float total_energy_{0.0f};
float last_power_state_{0.0f}; float last_power_state_{0.0f};
}; };