Update to Arduino 3.x core for ESP32

platformio.ini

@@ -16,7 +16,9 @@ default_envs = esp32_wifi_tft
 framework = arduino
 ; The default platform & platform package only applies to ESP32 derivatives
 platform = espressif32
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.14
+platform_packages = 
+ framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
+ platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-libs.git#idf-release/v5.1
 lib_deps =
  https://github.com/tzapu/WiFiManager.git#0d84861270c3cd64f72a4eaf34443ee580d2547e ; Anchor to latest commit as of 1/26/24
  pstolarz/OneWireNg@^0.13.1

src/ESP_BP_WiFi.cpp

@@ -24,13 +24,8 @@
 
 
 bool shouldSaveConfig = false;
-#ifndef ESP8266
-WiFiServerFixed server(23);
-WiFiClientFixed serverClient;
-#else
 WiFiServer server(23);
 WiFiClient serverClient;
-#endif
 
 extern void handleReset(); // Terrible practice. In brewpi-esp8266.cpp.
 

src/ESP_BP_WiFi.h

@@ -1,7 +1,5 @@
 #pragma once
 #include <ArduinoJson.h>
-#include "WiFiClientFix.h"
-#include "WiFiServerFixed.h"
 
 /**
  * \file ESP_BP_WiFi.h
@@ -58,13 +56,8 @@ void initWifiServer();
  */
 void wifi_connection_info(JsonDocument& doc);
 
-#ifndef ESP8266
-extern WiFiServerFixed server;
-extern WiFiClientFixed serverClient;
-#else
 extern WiFiServer server;
 extern WiFiClient serverClient;
-#endif
 
 
 

src/PiLink.h

@@ -77,12 +77,7 @@ template <typename StreamType> class PiLink : public PiStream<StreamType> {
 };
 
 #if defined(ESP32S2)
-extern PiLink<std::conditional<Config::PiLink::useWifi, WiFiClientFixed, USBCDC>::type> piLink;
+extern PiLink<std::conditional<Config::PiLink::useWifi, WiFiClient, USBCDC>::type> piLink;
 #else
-#ifdef ESP8266
 extern PiLink<std::conditional<Config::PiLink::useWifi, WiFiClient, HardwareSerial>::type> piLink;
-#else
-// ESP32
-extern PiLink<std::conditional<Config::PiLink::useWifi, WiFiClientFixed, HardwareSerial>::type> piLink;
-#endif
 #endif

src/PiStream.h

@@ -266,15 +266,15 @@ template <typename StreamType> class PiStream {
  * \brief Empty init for all other stream types types
  */
  template <typename U = StreamType>
- typename std::enable_if<!std::is_same<U, HardwareSerial>::value && !std::is_same<U, WiFiClientFixed>::value>::type
+ typename std::enable_if<!std::is_same<U, HardwareSerial>::value && !std::is_same<U, WiFiClient>::value>::type
  init(){};
 
  /**
  * \brief Initialize WiFi Stream
  *
  * \see initWifiServer()
  */
- template <typename U = StreamType> typename std::enable_if<std::is_same<U, WiFiClientFixed>::value>::type init() {
+ template <typename U = StreamType> typename std::enable_if<std::is_same<U, WiFiClient>::value>::type init() {
  ::initWifiServer();
  };
 
@@ -323,19 +323,19 @@ template <typename StreamType> class PiStream {
  // WriteBufferingClient stream;
 
  /**
- * \brief _bool implementation for non WiFiClientFixed Streams
+ * \brief _bool implementation for non WiFiClient Streams
  */
- template <typename U = StreamType> typename std::enable_if<!std::is_same<U, WiFiClientFixed>::value, bool>::type _bool() {
+ template <typename U = StreamType> typename std::enable_if<!std::is_same<U, WiFiClient>::value, bool>::type _bool() {
  return bool(stream);
  };
 
  /**
- * \brief _bool implementation for WiFiClientFixed Streams
+ * \brief _bool implementation for WiFiClient Streams
  *
  * This checks both the bool operator of the underlying Stream and its
  * connected() method
  */
- template <typename U = StreamType> typename std::enable_if<std::is_same<U, WiFiClientFixed>::value, bool>::type _bool() {
+ template <typename U = StreamType> typename std::enable_if<std::is_same<U, WiFiClient>::value, bool>::type _bool() {
  return bool(stream) && upstream.connected();
  };
 };