sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-14 07:43:48 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-05 14:43:19 -05:00
parent c796c02b3a 722c5a94f2
commit 58f917030e
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ void APIConnection::loop() {
APIError err = this->helper_->loop();
if (err != APIError::OK) {
this->fatal_error_with_socket_log_(err);
this->fatal_error_with_log_(LOG_STR("Socket operation failed"), err);
return;
}
@@ -1574,7 +1574,7 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
delay(0);
APIError err = this->helper_->loop();
if (err != APIError::OK) {
this->fatal_error_with_socket_log_(err);
this->fatal_error_with_log_(LOG_STR("Socket operation failed"), err);
return false;
}
if (this->helper_->can_write_without_blocking())

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

@@ -737,9 +737,6 @@ class APIConnection final : public APIServerConnection {
this->on_fatal_error();
this->log_warning_(message, err);
}
inline void fatal_error_with_socket_log_(APIError err) {
this->fatal_error_with_log_(LOG_STR("Socket operation failed"), err);
}
};
} // namespace esphome::api

10
esphome/components/sps30/sps30.cpp
View File

@@ -45,16 +45,16 @@ void SPS30Component::setup() {
}
ESP_LOGV(TAG, " Serial number: %s", this->serial_number_);
bool result;
if (this->fan_interval_.has_value()) {
// override default value
this->result_ =
this->write_command(SPS30_CMD_SET_AUTOMATIC_CLEANING_INTERVAL_SECONDS, this->fan_interval_.value());
result = this->write_command(SPS30_CMD_SET_AUTOMATIC_CLEANING_INTERVAL_SECONDS, this->fan_interval_.value());
} else {
this->result_ = this->write_command(SPS30_CMD_SET_AUTOMATIC_CLEANING_INTERVAL_SECONDS);
result = this->write_command(SPS30_CMD_SET_AUTOMATIC_CLEANING_INTERVAL_SECONDS);
}
this->set_timeout(20, [this]() {
if (this->result_) {
this->set_timeout(20, [this, result]() {
if (result) {
uint16_t secs[2];
if (this->read_data(secs, 2)) {
this->fan_interval_ = secs[0] << 16 | secs[1];

1
esphome/components/sps30/sps30.h
View File

@@ -30,7 +30,6 @@ class SPS30Component : public PollingComponent, public sensirion_common::Sensiri
bool start_fan_cleaning();
protected:
bool result_{false};
bool setup_complete_{false};
uint16_t raw_firmware_version_;
char serial_number_[17] = {0}; /// Terminating NULL character