ESP-IDF support and generic target platforms (#2303)

* Socket refactor and SSL

* esp-idf temp

* Fixes

* Echo component and noise

* Add noise API transport support

* Updates

* ESP-IDF

* Complete

* Fixes

* Fixes

* Versions update

* New i2c APIs

* Complete i2c refactor

* SPI migration

* Revert ESP Preferences migration, too complex for now

* OTA support

* Remove echo again

* Remove ssl again

* GPIOFlags updates

* Rename esphal and ICACHE_RAM_ATTR

* Make ESP32 arduino compilable again

* Fix GPIO flags

* Complete pin registry refactor and fixes

* Fixes to make test1 compile

* Remove sdkconfig file

* Ignore sdkconfig file

* Fixes in reviewing

* Make test2 compile

* Make test4 compile

* Make test5 compile

* Run clang-format

* Fix lint errors

* Use esp-idf APIs instead of btStart

* Another round of fixes

* Start implementing ESP8266

* Make test3 compile

* Guard esp8266 code

* Lint

* Reformat

* Fixes

* Fixes v2

* more fixes

* ESP-IDF tidy target

* Convert ARDUINO_ARCH_ESPxx

* Update WiFiSignalSensor

* Update time ifdefs

* OTA needs millis from hal

* RestartSwitch needs delay from hal

* ESP-IDF Uart

* Fix OTA blank password

* Allow setting sdkconfig

* Fix idf partitions and allow setting sdkconfig from yaml

* Re-add read/write compat APIs and fix esp8266 uart

* Fix esp8266 store log strings in flash

* Fix ESP32 arduino preferences not initialized

* Update ifdefs

* Change how sdkconfig change is detected

* Add checks to ci-custom and fix them

* Run clang-format

* Add esp-idf clang-tidy target and fix errors

* Fixes from clang-tidy idf round 2

* Fixes from compiling tests with esp-idf

* Run clang-format

* Switch test5.yaml to esp-idf

* Implement ESP8266 Preferences

* Lint

* Re-do PIO package version selection a bit

* Fix arduinoespressif32 package version

* Fix unit tests

* Lint

* Lint fixes

* Fix readv/writev not defined

* Fix graphing component

* Re-add all old options from core/config.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

esphome/components/nextion/nextion_upload.cpp

@@ -1,16 +1,16 @@
+#ifdef USE_NEXTION_TFT_UPLOAD
 
 #include "nextion.h"
 #include "esphome/core/application.h"
 #include "esphome/core/macros.h"
 #include "esphome/core/util.h"
 #include "esphome/core/log.h"
+#include "esphome/components/network/util.h"
 
 namespace esphome {
 namespace nextion {
 static const char *const TAG = "nextion_upload";
 
-#if defined(USE_TFT_UPLOAD) && (defined(USE_ETHERNET) || defined(USE_WIFI))
-
 // Followed guide
 // https://unofficialnextion.com/t/nextion-upload-protocol-v1-2-the-fast-one/1044/2
 
@@ -26,7 +26,7 @@ int Nextion::upload_by_chunks_(HTTPClient *http, int range_start) {
   if (range_end > this->tft_size_)
     range_end = this->tft_size_;
 
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef USE_ESP8266
 #if ARDUINO_VERSION_CODE >= VERSION_CODE(2, 7, 0)
   http->setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
 #elif ARDUINO_VERSION_CODE >= VERSION_CODE(2, 6, 0)
@@ -46,10 +46,10 @@ int Nextion::upload_by_chunks_(HTTPClient *http, int range_start) {
   int code = 0;
   bool begin_status = false;
   while (tries <= 5) {
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
     begin_status = http->begin(this->tft_url_.c_str());
 #endif
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef USE_ESP8266
     begin_status = http->begin(*this->get_wifi_client_(), this->tft_url_.c_str());
 #endif
 
@@ -129,7 +129,7 @@ void Nextion::upload_tft() {
     return;
   }
 
-  if (!network_is_connected()) {
+  if (!network::is_connected()) {
     ESP_LOGD(TAG, "network is not connected");
     return;
   }
@@ -139,10 +139,10 @@ void Nextion::upload_tft() {
   HTTPClient http;
   http.setTimeout(15000);  // Yes 15 seconds.... Helps 8266s along
   bool begin_status = false;
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
   begin_status = http.begin(this->tft_url_.c_str());
 #endif
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef USE_ESP8266
 #if ARDUINO_VERSION_CODE >= VERSION_CODE(2, 7, 0)
   http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
 #elif ARDUINO_VERSION_CODE >= VERSION_CODE(2, 6, 0)
@@ -157,7 +157,7 @@ void Nextion::upload_tft() {
   if (!begin_status) {
     this->is_updating_ = false;
     ESP_LOGD(TAG, "connection failed");
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
     if (psramFound())
       free(this->transfer_buffer_);  // NOLINT
     else
@@ -249,7 +249,7 @@ void Nextion::upload_tft() {
   }
 
   // Nextion wants 4096 bytes at a time. Make chunk_size a multiple of 4096
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
   uint32_t chunk_size = 8192;
   if (psramFound()) {
     chunk_size = this->content_length_;
@@ -268,7 +268,7 @@ void Nextion::upload_tft() {
 #endif
 
   if (this->transfer_buffer_ == nullptr) {
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
     if (psramFound()) {
       ESP_LOGD(TAG, "Allocating PSRAM buffer size %d, Free PSRAM size is %u", chunk_size, ESP.getFreePsram());
       this->transfer_buffer_ = (uint8_t *) ps_malloc(chunk_size);
@@ -289,7 +289,7 @@ void Nextion::upload_tft() {
 
         if (!this->transfer_buffer_)
           this->upload_end_();
-#ifdef ARDUINO_ARCH_ESP32
+#ifdef USE_ESP32
       }
 #endif
     }
@@ -325,7 +325,7 @@ void Nextion::upload_end_() {
   ESP.restart();  // NOLINT(readability-static-accessed-through-instance)
 }
 
-#ifdef ARDUINO_ARCH_ESP8266
+#ifdef USE_ESP8266
 WiFiClient *Nextion::get_wifi_client_() {
   if (this->tft_url_.compare(0, 6, "https:") == 0) {
     if (this->wifi_client_secure_ == nullptr) {
@@ -342,9 +342,7 @@ WiFiClient *Nextion::get_wifi_client_() {
   return this->wifi_client_;
 }
 #endif
-
-#else
-void Nextion::upload_tft() { ESP_LOGW(TAG, "tft_url, WIFI or Ethernet components are needed. Cannot upload."); }
-#endif
 }  // namespace nextion
 }  // namespace esphome
+
+#endif  // USE_NEXTION_TFT_UPLOAD