Modified to be compatible with the new version of sdk, compatible with esp32s3

src/mesh/generated/mesh.pb.h

@@ -73,6 +73,8 @@ typedef enum _HardwareModel {
     HardwareModel_M5STACK = 44, 
     /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
     HardwareModel_STATION_G1 = 45, 
+    /* TODO: REPLACE */
+    HardwareModel_TBEAM_S3_M2 = 46,
     /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */
     HardwareModel_PRIVATE_HW = 255 
 } HardwareModel;

src/mesh/http/WiFiAPClient.cpp

@@ -238,8 +238,10 @@ bool initWifi(bool forceSoftAP)
                 WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
                 DEBUG_MSG("MY IP AP ADDRESS: %s\n", WiFi.softAPIP().toString().c_str());
 
+#if !CONFIG_IDF_TARGET_ESP32S3
                 // This is needed to improve performance.
                 esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving
+#endif
 
                 dnsServer.start(53, "*", apIP);
 
@@ -252,14 +254,19 @@ bool initWifi(bool forceSoftAP)
                 WiFi.setHostname(ourHost);
                 WiFi.onEvent(WiFiEvent);
 
+#if !CONFIG_IDF_TARGET_ESP32S3
                 // This is needed to improve performance.
                 esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving
+#endif
 
                 WiFi.onEvent(
                     [](WiFiEvent_t event, WiFiEventInfo_t info) {
                         Serial.print("\nWiFi lost connection. Reason: ");
+                        #if CONFIG_IDF_TARGET_ESP32S3
+                        Serial.println(info.wifi_sta_disconnected.reason);
+                        wifiDisconnectReason = info.wifi_sta_disconnected.reason;
+                        #else
                         Serial.println(info.disconnected.reason);
-
                         /*
                            If we are disconnected from the AP for some reason,
                            save the error code.
@@ -268,8 +275,14 @@ bool initWifi(bool forceSoftAP)
                              https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
                         */
                         wifiDisconnectReason = info.disconnected.reason;
+                        #endif
+
                     },
+#if CONFIG_IDF_TARGET_ESP32S3
+                    WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
+#else
                     WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
+#endif
 
                 DEBUG_MSG("JOINING WIFI soon: ssid=%s\n", wifiName);
                 wifiReconnect = new Periodic("WifiConnect", reconnectWiFi);

src/platform/esp32/ESP32CryptoEngine.cpp

@@ -1,16 +1,16 @@
 #include "CryptoEngine.h"
 #include "configuration.h"
 
+#if CONFIG_IDF_TARGET_ESP32S3
+#include "mbedtls/aes.h"
+#else
 #include "crypto/includes.h"
-
 #include "crypto/common.h"
-
 // #include "esp_system.h"
-
 #include "crypto/aes.h"
 #include "crypto/aes_wrap.h"
 #include "mbedtls/aes.h"
-
+#endif
 
 
 class ESP32CryptoEngine : public CryptoEngine

src/platform/esp32/architecture.h

@@ -44,6 +44,8 @@
     #define HW_VENDOR HardwareModel_TBEAM
 #elif defined(TBEAM_V07)
     #define HW_VENDOR HardwareModel_TBEAM0p7
+#elif defined(TBEAM_S3_M2)
+    #define HW_VENDOR HardwareModel_TBEAM_S3_M2
 #elif defined(DIY_V1)
     #define HW_VENDOR HardwareModel_DIY_V1
 #elif defined(RAK_11200)

src/sleep.cpp

@@ -284,7 +284,12 @@ void enableModemSleep()
 {
     static esp_pm_config_esp32_t esp32_config; // filled with zeros because bss
 
+
+#if CONFIG_IDF_TARGET_ESP32S3
+    esp32_config.max_freq_mhz = CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ;
+#else
     esp32_config.max_freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
+#endif
     esp32_config.min_freq_mhz = 20; // 10Mhz is minimum recommended
     esp32_config.light_sleep_enable = false;
     int rv = esp_pm_configure(&esp32_config);