mirror of
https://github.com/esphome/esphome.git
synced 2025-09-08 22:32:21 +01:00
Reduce entity memory usage by eliminating field shadowing and bit-packing (#9076)
This commit is contained in:
@@ -12,20 +12,12 @@ void EntityBase::set_name(const char *name) {
|
||||
this->name_ = StringRef(name);
|
||||
if (this->name_.empty()) {
|
||||
this->name_ = StringRef(App.get_friendly_name());
|
||||
this->has_own_name_ = false;
|
||||
this->flags_.has_own_name = false;
|
||||
} else {
|
||||
this->has_own_name_ = true;
|
||||
this->flags_.has_own_name = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Entity Internal
|
||||
bool EntityBase::is_internal() const { return this->internal_; }
|
||||
void EntityBase::set_internal(bool internal) { this->internal_ = internal; }
|
||||
|
||||
// Entity Disabled by Default
|
||||
bool EntityBase::is_disabled_by_default() const { return this->disabled_by_default_; }
|
||||
void EntityBase::set_disabled_by_default(bool disabled_by_default) { this->disabled_by_default_ = disabled_by_default; }
|
||||
|
||||
// Entity Icon
|
||||
std::string EntityBase::get_icon() const {
|
||||
if (this->icon_c_str_ == nullptr) {
|
||||
@@ -35,14 +27,10 @@ std::string EntityBase::get_icon() const {
|
||||
}
|
||||
void EntityBase::set_icon(const char *icon) { this->icon_c_str_ = icon; }
|
||||
|
||||
// Entity Category
|
||||
EntityCategory EntityBase::get_entity_category() const { return this->entity_category_; }
|
||||
void EntityBase::set_entity_category(EntityCategory entity_category) { this->entity_category_ = entity_category; }
|
||||
|
||||
// Entity Object ID
|
||||
std::string EntityBase::get_object_id() const {
|
||||
// Check if `App.get_friendly_name()` is constant or dynamic.
|
||||
if (!this->has_own_name_ && App.is_name_add_mac_suffix_enabled()) {
|
||||
if (!this->flags_.has_own_name && App.is_name_add_mac_suffix_enabled()) {
|
||||
// `App.get_friendly_name()` is dynamic.
|
||||
return str_sanitize(str_snake_case(App.get_friendly_name()));
|
||||
} else {
|
||||
@@ -61,7 +49,7 @@ void EntityBase::set_object_id(const char *object_id) {
|
||||
// Calculate Object ID Hash from Entity Name
|
||||
void EntityBase::calc_object_id_() {
|
||||
// Check if `App.get_friendly_name()` is constant or dynamic.
|
||||
if (!this->has_own_name_ && App.is_name_add_mac_suffix_enabled()) {
|
||||
if (!this->flags_.has_own_name && App.is_name_add_mac_suffix_enabled()) {
|
||||
// `App.get_friendly_name()` is dynamic.
|
||||
const auto object_id = str_sanitize(str_snake_case(App.get_friendly_name()));
|
||||
// FNV-1 hash
|
||||
|
Reference in New Issue
Block a user