-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
patches: Update for ESP-IDF 5.3 and arduino-esp32 3.1.
Remove patches that were backported to 4.4 or are just not necessary anymore. Update other patches to compile against the new versions. Currently not all patches are applied automatically, for example lib-builder/managed_components/*
- Loading branch information
Showing
32 changed files
with
506 additions
and
1,221 deletions.
There are no files selected for viewing
41 changes: 0 additions & 41 deletions
41
software/patches/arduino-esp32/0001-LittleFS-Use-default-implementation-of-exists.patch
This file was deleted.
Oops, something went wrong.
25 changes: 13 additions & 12 deletions
25
software/patches/arduino-esp32/0002-ETH-Make-eth_handle-public.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,26 @@ | ||
From 0cd6d432a38a5ff1a89f34778fec9df78236fd08 Mon Sep 17 00:00:00 2001 | ||
From 2b8d6d219b740426a957a525ea43392fefc5fd7b Mon Sep 17 00:00:00 2001 | ||
From: Erik Fleckstein <[email protected]> | ||
Date: Fri, 3 Dec 2021 14:02:41 +0100 | ||
Date: Wed, 16 Oct 2024 10:41:08 +0200 | ||
Subject: [PATCH] ETH: Make eth_handle public. | ||
|
||
--- | ||
libraries/Ethernet/src/ETH.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/libraries/Ethernet/src/ETH.h b/libraries/Ethernet/src/ETH.h | ||
index 918cd357..824b066d 100644 | ||
index 14d2d042..10ab283b 100644 | ||
--- a/libraries/Ethernet/src/ETH.h | ||
+++ b/libraries/Ethernet/src/ETH.h | ||
@@ -57,7 +57,7 @@ typedef enum { ETH_PHY_LAN8720, ETH_PHY_TLK110, ETH_PHY_RTL8201, ETH_PHY_DP83848 | ||
#define ETH_PHY_IP101 ETH_PHY_TLK110 | ||
@@ -182,8 +182,8 @@ protected: | ||
public: | ||
void _onEthEvent(int32_t event_id, void *event_data); | ||
|
||
class ETHClass { | ||
- private: | ||
+ public: | ||
bool initialized; | ||
bool staticIP; | ||
#if ESP_IDF_VERSION_MAJOR > 3 | ||
-private: | ||
esp_eth_handle_t _eth_handle; | ||
+private: | ||
uint8_t _eth_index; | ||
eth_phy_type_t _phy_type; | ||
esp_eth_netif_glue_handle_t _glue_handle; | ||
-- | ||
2.33.1 | ||
2.47.0 | ||
|
40 changes: 0 additions & 40 deletions
40
software/patches/arduino-esp32/0003-WiFiGeneric-Add-ETH_LOST_IP-event.patch
This file was deleted.
Oops, something went wrong.
19 changes: 0 additions & 19 deletions
19
...are/patches/arduino-esp32/0004-Disable-WiFiClientSecure-esp_crt_bundle-re-implement.patch
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
software/patches/arduino-esp32/0005-WiFi-Increase-scan-timeout.patch
This file was deleted.
Oops, something went wrong.
74 changes: 36 additions & 38 deletions
74
...are/patches/arduino-esp32/0006-Remove-automatic-reconnect-if-first-connect-after-st.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,45 @@ | ||
From bd8c0377eac15db67cac1746bebc411aeed94933 Mon Sep 17 00:00:00 2001 | ||
From 84d66d04511edab3be8c2f62f982f342326522e4 Mon Sep 17 00:00:00 2001 | ||
From: Erik Fleckstein <[email protected]> | ||
Date: Mon, 13 Nov 2023 13:09:19 +0100 | ||
Date: Wed, 16 Oct 2024 10:49:53 +0200 | ||
Subject: [PATCH] Remove automatic reconnect if first connect after startup | ||
fails. | ||
|
||
--- | ||
libraries/WiFi/src/WiFiGeneric.cpp | 9 +-------- | ||
1 file changed, 1 insertion(+), 8 deletions(-) | ||
libraries/WiFi/src/STA.cpp | 7 +------ | ||
1 file changed, 1 insertion(+), 6 deletions(-) | ||
|
||
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp | ||
index 3760285d..d182adc6 100644 | ||
--- a/libraries/WiFi/src/WiFiGeneric.cpp | ||
+++ b/libraries/WiFi/src/WiFiGeneric.cpp | ||
@@ -1036,8 +1036,6 @@ void WiFiGenericClass::removeEvent(wifi_event_id_t id) | ||
*/ | ||
esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event) | ||
{ | ||
- static bool first_connect = true; | ||
- | ||
if(!event) return ESP_OK; //Null would crash this function | ||
diff --git a/libraries/WiFi/src/STA.cpp b/libraries/WiFi/src/STA.cpp | ||
index 443d2621..582d5c52 100644 | ||
--- a/libraries/WiFi/src/STA.cpp | ||
+++ b/libraries/WiFi/src/STA.cpp | ||
@@ -106,7 +106,6 @@ static void _onStaArduinoEvent(arduino_event_t *ev) { | ||
if (_sta_network_if == NULL || ev->event_id < ARDUINO_EVENT_WIFI_STA_START || ev->event_id > ARDUINO_EVENT_WIFI_STA_LOST_IP) { | ||
return; | ||
} | ||
- static bool first_connect = true; | ||
log_v("Arduino STA Event: %d - %s", ev->event_id, Network.eventName(ev->event_id)); | ||
|
||
log_d("Arduino Event: %d - %s", event->event_id, WiFi.eventName(event->event_id)); | ||
@@ -1065,7 +1063,7 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event) | ||
log_w("Reason: %u - %s", reason, WiFi.disconnectReasonName((wifi_err_reason_t)reason)); | ||
if(reason == WIFI_REASON_NO_AP_FOUND) { | ||
WiFiSTAClass::_setStatus(WL_NO_SSID_AVAIL); | ||
- } else if((reason == WIFI_REASON_AUTH_FAIL) && !first_connect){ | ||
+ } else if((reason == WIFI_REASON_AUTH_FAIL)){ | ||
WiFiSTAClass::_setStatus(WL_CONNECT_FAILED); | ||
} else if(reason == WIFI_REASON_BEACON_TIMEOUT || reason == WIFI_REASON_HANDSHAKE_TIMEOUT) { | ||
WiFiSTAClass::_setStatus(WL_CONNECTION_LOST); | ||
@@ -1079,11 +1077,6 @@ esp_err_t WiFiGenericClass::_eventCallback(arduino_event_t *event) | ||
bool DoReconnect = false; | ||
if(reason == WIFI_REASON_ASSOC_LEAVE) { //Voluntarily disconnected. Don't reconnect! | ||
} | ||
- else if(first_connect) { //Retry once for all failure reasons | ||
- first_connect = false; | ||
- DoReconnect = true; | ||
- log_d("WiFi Reconnect Running"); | ||
- } | ||
else if(WiFi.getAutoReconnect() && _isReconnectableReason(reason)) { | ||
DoReconnect = true; | ||
log_d("WiFi AutoReconnect Running"); | ||
if (ev->event_id == ARDUINO_EVENT_WIFI_STA_START) { | ||
@@ -135,7 +134,7 @@ static void _onStaArduinoEvent(arduino_event_t *ev) { | ||
log_w("Reason: %u - %s", reason, WiFi.STA.disconnectReasonName((wifi_err_reason_t)reason)); | ||
if (reason == WIFI_REASON_NO_AP_FOUND) { | ||
_sta_network_if->_setStatus(WL_NO_SSID_AVAIL); | ||
- } else if ((reason == WIFI_REASON_AUTH_FAIL) && !first_connect) { | ||
+ } else if ((reason == WIFI_REASON_AUTH_FAIL)) { | ||
_sta_network_if->_setStatus(WL_CONNECT_FAILED); | ||
} else if (reason == WIFI_REASON_BEACON_TIMEOUT || reason == WIFI_REASON_HANDSHAKE_TIMEOUT) { | ||
_sta_network_if->_setStatus(WL_CONNECTION_LOST); | ||
@@ -147,10 +146,6 @@ static void _onStaArduinoEvent(arduino_event_t *ev) { | ||
|
||
bool DoReconnect = false; | ||
if (reason == WIFI_REASON_ASSOC_LEAVE) { //Voluntarily disconnected. Don't reconnect! | ||
- } else if (first_connect) { //Retry once for all failure reasons | ||
- first_connect = false; | ||
- DoReconnect = true; | ||
- log_d("WiFi Reconnect Running"); | ||
} else if (_sta_network_if->getAutoReconnect() && _is_staReconnectableReason(reason)) { | ||
DoReconnect = true; | ||
log_d("WiFi AutoReconnect Running"); | ||
-- | ||
2.42.0 | ||
2.47.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.