mirror of
https://github.com/esphome/esphome.git
synced 2025-09-21 04:32:23 +01:00
Merge branch 'missing_ifdef_member_vars' into integration
This commit is contained in:
@@ -273,9 +273,13 @@ class InfoResponseProtoMessage : public ProtoMessage {
|
||||
uint32_t key{0};
|
||||
std::string name{};
|
||||
bool disabled_by_default{false};
|
||||
#ifdef USE_ENTITY_ICON
|
||||
std::string icon{};
|
||||
#endif
|
||||
enums::EntityCategory entity_category{};
|
||||
#ifdef USE_DEVICES
|
||||
uint32_t device_id{0};
|
||||
#endif
|
||||
|
||||
protected:
|
||||
};
|
||||
@@ -284,7 +288,9 @@ class StateResponseProtoMessage : public ProtoMessage {
|
||||
public:
|
||||
~StateResponseProtoMessage() override = default;
|
||||
uint32_t key{0};
|
||||
#ifdef USE_DEVICES
|
||||
uint32_t device_id{0};
|
||||
#endif
|
||||
|
||||
protected:
|
||||
};
|
||||
@@ -293,7 +299,9 @@ class CommandProtoMessage : public ProtoDecodableMessage {
|
||||
public:
|
||||
~CommandProtoMessage() override = default;
|
||||
uint32_t key{0};
|
||||
#ifdef USE_DEVICES
|
||||
uint32_t device_id{0};
|
||||
#endif
|
||||
|
||||
protected:
|
||||
};
|
||||
|
Reference in New Issue
Block a user