github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-02 11:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into buildinfo

Browse Source
This commit is contained in:
David Woodhouse
2025-12-17 19:15:48 +00:00
committed by GitHub
parent 01d8775005 d7b04a3d18
commit 745f5b8dd2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/nextion/nextion.h
+2 -2
View File
@@ -1426,7 +1426,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
* @return position of last byte transferred, -1 for failure.
*/
int upload_by_chunks_(esp_http_client_handle_t http_client, uint32_t &range_start);
#else
#elif defined(USE_ARDUINO)
/**
* will request chunk_size chunks from the web server
* and send each to the nextion
@@ -1435,7 +1435,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
* @return position of last byte transferred, -1 for failure.
*/
int upload_by_chunks_(HTTPClient &http_client, uint32_t &range_start);
#endif // USE_ESP32 vs others
#endif // USE_ESP32 vs USE_ARDUINO
/**
* Ends the upload process, restart Nextion and, if successful,