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

fix merge conflict

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-25 23:11:11 -10:00
parent c32767db81
commit 01b24a7b69
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/api/api_connection.cpp
View File

@@ -1826,6 +1826,7 @@ uint16_t APIConnection::try_send_ping_request(EntityBase *entity, APIConnection
return encode_message_to_buffer(req, PingRequest::MESSAGE_TYPE, conn, remaining_size, is_single); return encode_message_to_buffer(req, PingRequest::MESSAGE_TYPE, conn, remaining_size, is_single);
} }
#ifdef USE_API_HOMEASSISTANT_STATES
void APIConnection::process_state_subscriptions_() { void APIConnection::process_state_subscriptions_() {
const auto &subs = this->parent_->get_state_subs(); const auto &subs = this->parent_->get_state_subs();
if (this->state_subs_at_ >= static_cast<int>(subs.size())) { if (this->state_subs_at_ >= static_cast<int>(subs.size())) {
@@ -1845,6 +1846,7 @@ void APIConnection::process_state_subscriptions_() {
this->state_subs_at_++; this->state_subs_at_++;
} }
} }
#endif // USE_API_HOMEASSISTANT_STATES
} // namespace esphome::api } // namespace esphome::api
#endif #endif

3
esphome/components/api/api_connection.h
View File

@@ -294,8 +294,9 @@ class APIConnection : public APIServerConnection {
// Helper function to handle authentication completion // Helper function to handle authentication completion
void complete_authentication_(); void complete_authentication_();
// Process state subscriptions efficiently #ifdef USE_API_HOMEASSISTANT_STATES
void process_state_subscriptions_(); void process_state_subscriptions_();
#endif
// Non-template helper to encode any ProtoMessage // Non-template helper to encode any ProtoMessage
static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint8_t message_type, APIConnection *conn, static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint8_t message_type, APIConnection *conn,