Florian/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

adjust

Browse Source
This commit is contained in:
J. Nick Koston
2025-05-14 23:09:18 -05:00
parent b32ed848b0
commit 47b9c3db1d
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1773,8 +1773,6 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
api_error_to_str(err), errno);
return false;
<<<<<<< HEAD
=======
}
if (this->helper_->can_write_without_blocking())
return true;
@@ -1783,19 +1781,6 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
}
return false;
}
bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) {
if (!this->try_to_clear_buffer(message_type != 29)) { // SubscribeLogsResponse
return false;
>>>>>>> upstream/dev
}
if (this->helper_->can_write_without_blocking())
return true;
if (log_out_of_space) {
ESP_LOGV(TAG, "Cannot send message because of TCP buffer space");
}
delay(0); // Not sure this makes sense, but it is in the original code
return false;
}
bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) {
// Track send_buffer time
const uint32_t start_time = millis();