mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-03-04 11:48:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'prefs_encap' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-24 21:16:15 -10:00
parent a2ff099e92 9538ec6f9b
commit 46b1e30c10
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/water_heater/water_heater.cpp
View File

@@ -185,7 +185,7 @@ void WaterHeater::publish_state() {
}
optional<WaterHeaterCall> WaterHeater::restore_state_() {
this->pref_ = global_preferences->make_preference<SavedWaterHeaterState>(this->get_preference_hash());
this->pref_ = this->make_entity_preference<SavedWaterHeaterState>();
SavedWaterHeaterState recovered{};
if (!this->pref_.load(&recovered))
return {};

3
esphome/core/entity_base.cpp
View File

@@ -127,7 +127,10 @@ ESPPreferenceObject EntityBase::make_entity_preference_(size_t size, uint32_t ve
// this->migrate_entity_preference_(size, old_key, new_key);
// return global_preferences->make_preference(size, new_key);
//
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
uint32_t key = this->get_preference_hash() ^ version;
#pragma GCC diagnostic pop
return global_preferences->make_preference(size, key);
}