mirror of https://github.com/esphome/esphome.git
Lint
This commit is contained in:
parent
6a75b4bb52
commit
1414c9aad4
|
@ -1226,12 +1226,12 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Closes the HTTP client and cleans up resources.
|
* @brief Closes the HTTP client and cleans up resources.
|
||||||
*
|
*
|
||||||
* This function abstracts the details of closing an HTTP client across different platforms.
|
* This function abstracts the details of closing an HTTP client across different platforms.
|
||||||
* For Arduino, it simply ends the connection using the `end()` method of the HttpClient class.
|
* For Arduino, it simply ends the connection using the `end()` method of the HttpClient class.
|
||||||
* For ESP-IDF, it first closes the HTTP connection using `esp_http_client_close()` and then
|
* For ESP-IDF, it first closes the HTTP connection using `esp_http_client_close()` and then
|
||||||
* cleans up the allocated resources using `esp_http_client_cleanup()`.
|
* cleans up the allocated resources using `esp_http_client_cleanup()`.
|
||||||
*
|
*
|
||||||
* Usage of this function makes the code cleaner and reduces duplication across different parts
|
* Usage of this function makes the code cleaner and reduces duplication across different parts
|
||||||
* of the project where HTTP client needs to be closed.
|
* of the project where HTTP client needs to be closed.
|
||||||
*
|
*
|
||||||
|
@ -1239,11 +1239,11 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
|
||||||
* depends on the platform:
|
* depends on the platform:
|
||||||
* - Arduino: HttpClient type from the ArduinoHttpClient library.
|
* - Arduino: HttpClient type from the ArduinoHttpClient library.
|
||||||
* - ESP-IDF: esp_http_client_handle_t from the ESP HTTP Client library.
|
* - ESP-IDF: esp_http_client_handle_t from the ESP HTTP Client library.
|
||||||
*
|
*
|
||||||
* @note Ensure that the HTTP client is initialized and not NULL before calling this function
|
* @note Ensure that the HTTP client is initialized and not NULL before calling this function
|
||||||
* to avoid runtime errors.
|
* to avoid runtime errors.
|
||||||
*/
|
*/
|
||||||
void close_http_client_(auto& http_client);
|
void close_http_client_(auto &http_client);
|
||||||
|
|
||||||
#endif // USE_NEXTION_TFT_UPLOAD
|
#endif // USE_NEXTION_TFT_UPLOAD
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ inline uint32_t Nextion::get_free_heap_() {
|
||||||
|
|
||||||
#ifdef ARDUINO
|
#ifdef ARDUINO
|
||||||
int Nextion::upload_by_chunks_(HTTPClient &http_client, uint32_t &range_start) {
|
int Nextion::upload_by_chunks_(HTTPClient &http_client, uint32_t &range_start) {
|
||||||
#else // ESP-IDF
|
#else // ESP-IDF
|
||||||
int Nextion::upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start) {
|
int Nextion::upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start) {
|
||||||
#endif // ARDUINO vs ESP-IDF
|
#endif // ARDUINO vs ESP-IDF
|
||||||
uint32_t range_size = this->tft_size_ - range_start;
|
uint32_t range_size = this->tft_size_ - range_start;
|
||||||
|
@ -57,7 +57,7 @@ int Nextion::upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &r
|
||||||
ESP_LOGW(TAG, "HTTP Request failed; Error: %s", HTTPClient::errorToString(code).c_str());
|
ESP_LOGW(TAG, "HTTP Request failed; Error: %s", HTTPClient::errorToString(code).c_str());
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
#else // ESP-IDF
|
#else // ESP-IDF
|
||||||
esp_http_client_set_header(http_client, "Range", range_header);
|
esp_http_client_set_header(http_client, "Range", range_header);
|
||||||
ESP_LOGV(TAG, "Opening HTTP connetion");
|
ESP_LOGV(TAG, "Opening HTTP connetion");
|
||||||
esp_err_t err;
|
esp_err_t err;
|
||||||
|
@ -104,7 +104,7 @@ int Nextion::upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &r
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else // ESP-IDF
|
#else // ESP-IDF
|
||||||
while (retries < 5 && read_len < buffer_size) {
|
while (retries < 5 && read_len < buffer_size) {
|
||||||
partial_read_len =
|
partial_read_len =
|
||||||
esp_http_client_read(http_client, reinterpret_cast<char *>(buffer) + read_len, buffer_size - read_len);
|
esp_http_client_read(http_client, reinterpret_cast<char *>(buffer) + read_len, buffer_size - read_len);
|
||||||
|
@ -320,7 +320,7 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {
|
||||||
std::string content_range_string = http_client.header("Content-Range");
|
std::string content_range_string = http_client.header("Content-Range");
|
||||||
content_range_string.remove(0, 12);
|
content_range_string.remove(0, 12);
|
||||||
this->tft_size_ = content_range_string.toInt();
|
this->tft_size_ = content_range_string.toInt();
|
||||||
#else // ESP-IDF
|
#else // ESP-IDF
|
||||||
this->tft_size_ = esp_http_client_get_content_length(http_client);
|
this->tft_size_ = esp_http_client_get_content_length(http_client);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -423,11 +423,11 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {
|
||||||
return upload_end_(true);
|
return upload_end_(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Nextion::close_http_client_(auto& http_client) {
|
void Nextion::close_http_client_(auto &http_client) {
|
||||||
ESP_LOGD(TAG, "Close HTTP connection");
|
ESP_LOGD(TAG, "Close HTTP connection");
|
||||||
#ifdef ARDUINO
|
#ifdef ARDUINO
|
||||||
http_client.end();
|
http_client.end();
|
||||||
#else // ESP-IDF
|
#else // ESP-IDF
|
||||||
esp_http_client_close(http_client);
|
esp_http_client_close(http_client);
|
||||||
esp_http_client_cleanup(http_client);
|
esp_http_client_cleanup(http_client);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue