From 0f174aae885f4710ff5f942bd41fe45016088a7d Mon Sep 17 00:00:00 2001 From: VojtechBartoska Date: Thu, 30 Sep 2021 17:12:45 +0200 Subject: [PATCH 1/5] Update stale.yml --- .github/stale.yml | 87 ++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index cdb07ef5115..8b7ca846187 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,61 +1,26 @@ -# Configuration for probot-stale - https://github.com/probot/stale - -# Number of days of inactivity before an Issue or Pull Request becomes stale -daysUntilStale: 60 - -# Number of days of inactivity before an Issue or Pull Request with the stale label is closed. -# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. -daysUntilClose: 14 - -# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled) -onlyLabels: [] - -# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable -exemptLabels: - - "Type: For reference" - - "Type: To be implemented" - - "Type: Feature request" - -# Set to true to ignore issues in a project (defaults to false) -exemptProjects: false - -# Set to true to ignore issues in a milestone (defaults to false) -exemptMilestones: false - -# Set to true to ignore issues with an assignee (defaults to false) -exemptAssignees: false - -# Label to use when marking as stale -staleLabel: "Status: Stale" - -# Comment to post when marking as stale. Set to `false` to disable -markComment: > - [STALE_SET] This issue has been automatically marked as stale because it has not had - recent activity. It will be closed in 14 days if no further activity occurs. Thank you - for your contributions. - -# Comment to post when removing the stale label. -unmarkComment: > - [STALE_CLR] This issue has been removed from the stale queue. Please ensure activity to keep it openin the future. - -# Comment to post when closing a stale Issue or Pull Request. -closeComment: > - [STALE_DEL] This stale issue has been automatically closed. Thank you for your contributions. - -# Limit the number of actions per hour, from 1-30. Default is 30 -limitPerRun: 30 - -# Limit to only `issues` or `pulls` -only: issues - -# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls': -# pulls: -# daysUntilStale: 30 -# markComment: > -# This pull request has been automatically marked as stale because it has not had -# recent activity. It will be closed if no further activity occurs. Thank you -# for your contributions. - -# issues: -# exemptLabels: -# - confirmed +# This workflow firstly warns and then closes issues that have had no activity for a specified amount of time. +# +# You can adjust the behavior by modifying this file. +# For more information can be found here: https://github.com/actions/stale + +name: Mark stale issues +on: + schedule: + - cron: '30 9 * * *' + +jobs: + stale: + + runs-on: ubuntu-latest + permissions: + issues: write + + steps: + - uses: actions/stale@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs. Thank you for your contributions.' + days-before-stale: 60 + days-before-close: 14 + exempt-issue-labels: 'Type: For reference,Type: To be implemented,Type: Feature request' + stale-issue-label: 'Status: Stale' \ No newline at end of file From a2d7c0dcf648384ee08155a136205c96aca654b1 Mon Sep 17 00:00:00 2001 From: Pedro Minatel Date: Thu, 4 Nov 2021 14:08:08 +0000 Subject: [PATCH 2/5] [Examples] WiFi and Ethernet examples organization (#5830) * examples: WiFi and Ethernet examples organization * examples: Change on CI scripts to include new folder * Library name reverted to WiFi * examples: WiFi and Ethernet examples organization in a new folder * examples: Eth files moved from WiFi to Ethernet lib and CMakeLists updated --- CMakeLists.txt | 2 +- .../examples/ETH_LAN8720/.skip.esp32s2 | 0 .../examples/ETH_LAN8720/ETH_LAN8720.ino | 0 .../{WiFi => Ethernet}/examples/ETH_TLK110/.skip.esp32s2 | 0 .../examples/ETH_TLK110/ETH_TLK110.ino | 0 libraries/Ethernet/library.properties | 9 +++++++++ libraries/{WiFi => Ethernet}/src/ETH.cpp | 0 libraries/{WiFi => Ethernet}/src/ETH.h | 0 8 files changed, 10 insertions(+), 1 deletion(-) rename libraries/{WiFi => Ethernet}/examples/ETH_LAN8720/.skip.esp32s2 (100%) rename libraries/{WiFi => Ethernet}/examples/ETH_LAN8720/ETH_LAN8720.ino (100%) rename libraries/{WiFi => Ethernet}/examples/ETH_TLK110/.skip.esp32s2 (100%) rename libraries/{WiFi => Ethernet}/examples/ETH_TLK110/ETH_TLK110.ino (100%) create mode 100644 libraries/Ethernet/library.properties rename libraries/{WiFi => Ethernet}/src/ETH.cpp (100%) rename libraries/{WiFi => Ethernet}/src/ETH.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d70ac76938d..895ac421315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ set(LIBRARY_SRCS libraries/DNSServer/src/DNSServer.cpp libraries/EEPROM/src/EEPROM.cpp libraries/ESPmDNS/src/ESPmDNS.cpp + libraries/Ethernet/src/ETH.cpp libraries/FFat/src/FFat.cpp libraries/FS/src/FS.cpp libraries/FS/src/vfs_api.cpp @@ -91,7 +92,6 @@ set(LIBRARY_SRCS libraries/WebServer/src/detail/mimetable.cpp libraries/WiFiClientSecure/src/ssl_client.cpp libraries/WiFiClientSecure/src/WiFiClientSecure.cpp - libraries/WiFi/src/ETH.cpp libraries/WiFi/src/WiFiAP.cpp libraries/WiFi/src/WiFiClient.cpp libraries/WiFi/src/WiFi.cpp diff --git a/libraries/WiFi/examples/ETH_LAN8720/.skip.esp32s2 b/libraries/Ethernet/examples/ETH_LAN8720/.skip.esp32s2 similarity index 100% rename from libraries/WiFi/examples/ETH_LAN8720/.skip.esp32s2 rename to libraries/Ethernet/examples/ETH_LAN8720/.skip.esp32s2 diff --git a/libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino b/libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino similarity index 100% rename from libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino rename to libraries/Ethernet/examples/ETH_LAN8720/ETH_LAN8720.ino diff --git a/libraries/WiFi/examples/ETH_TLK110/.skip.esp32s2 b/libraries/Ethernet/examples/ETH_TLK110/.skip.esp32s2 similarity index 100% rename from libraries/WiFi/examples/ETH_TLK110/.skip.esp32s2 rename to libraries/Ethernet/examples/ETH_TLK110/.skip.esp32s2 diff --git a/libraries/WiFi/examples/ETH_TLK110/ETH_TLK110.ino b/libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino similarity index 100% rename from libraries/WiFi/examples/ETH_TLK110/ETH_TLK110.ino rename to libraries/Ethernet/examples/ETH_TLK110/ETH_TLK110.ino diff --git a/libraries/Ethernet/library.properties b/libraries/Ethernet/library.properties new file mode 100644 index 00000000000..c32adf1a7ea --- /dev/null +++ b/libraries/Ethernet/library.properties @@ -0,0 +1,9 @@ +name=Ethernet +version=2.0.0 +author=Hristo Gochkov +maintainer=Hristo Gochkov +sentence=Enables network connection (local and Internet) using the ESP32 Ethernet. +paragraph=With this library you can instantiate Servers, Clients and send/receive UDP packets through Ethernet. The IP address can be assigned statically or through a DHCP. The library can also manage DNS. +category=Communication +url= +architectures=esp32 diff --git a/libraries/WiFi/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp similarity index 100% rename from libraries/WiFi/src/ETH.cpp rename to libraries/Ethernet/src/ETH.cpp diff --git a/libraries/WiFi/src/ETH.h b/libraries/Ethernet/src/ETH.h similarity index 100% rename from libraries/WiFi/src/ETH.h rename to libraries/Ethernet/src/ETH.h From 4b9dc6144706983f2d1fc2d810800b792939322e Mon Sep 17 00:00:00 2001 From: Benjamin Staar Date: Thu, 4 Nov 2021 15:08:50 +0100 Subject: [PATCH 3/5] Solving *"wifi:channel=0 is invalid"* when using FTM example code (#5809) When using the FTM examples I got an error in the FTM_Initiator.ino: *"wifi:channel=0 is invalid"* I solved it for myself by simply passing the channel argument to be 1 in *WiFi.initiateFTM*. However, a better fix would be to directly change the default channel here. --- libraries/WiFi/src/WiFiGeneric.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/WiFi/src/WiFiGeneric.h b/libraries/WiFi/src/WiFiGeneric.h index e3fd62689ad..7079c032993 100644 --- a/libraries/WiFi/src/WiFiGeneric.h +++ b/libraries/WiFi/src/WiFiGeneric.h @@ -172,7 +172,7 @@ class WiFiGenericClass bool setTxPower(wifi_power_t power); wifi_power_t getTxPower(); - bool initiateFTM(uint8_t frm_count=16, uint16_t burst_period=2, uint8_t channel=0, const uint8_t * mac=NULL); + bool initiateFTM(uint8_t frm_count=16, uint16_t burst_period=2, uint8_t channel=1, const uint8_t * mac=NULL); static const char * getHostname(); static bool setHostname(const char * hostname); From 80b82625950b6167693c5b13b44cec624c3ae57c Mon Sep 17 00:00:00 2001 From: VojtechBartoska Date: Thu, 4 Nov 2021 17:21:44 +0100 Subject: [PATCH 4/5] Update esp-idf_component.rst --- docs/source/esp-idf_component.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/esp-idf_component.rst b/docs/source/esp-idf_component.rst index 7db07a13c88..ba2ff67604d 100644 --- a/docs/source/esp-idf_component.rst +++ b/docs/source/esp-idf_component.rst @@ -10,6 +10,9 @@ For a simplified method, see `lib-builder `_. Installation ------------ +.. note:: +Latest Arduino Core ESP32 version is now compatible with [ESP-IDF v4.4](https://github.com/espressif/esp-idf/tree/release/v4.4). Please consider this compability when using Arduino as component in ESP-IDF. + - Download and install `ESP-IDF `_. - Create blank idf project (from one of the examples). - In the project folder, create a new folder called `components` and clone this repository inside the new created folder. From 83884a0cdad834de667bee8342a37768b094f215 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Thu, 4 Nov 2021 19:18:31 +0200 Subject: [PATCH 5/5] Fix SparkFun MicroMod compilation issues Fixes: https://github.com/espressif/arduino-esp32/issues/5818 --- boards.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boards.txt b/boards.txt index a7a430bd574..c8c2f6e2a1c 100644 --- a/boards.txt +++ b/boards.txt @@ -2571,6 +2571,9 @@ esp32micromod.upload.extra_flags= esp32micromod.serial.disableDTR=true esp32micromod.serial.disableRTS=true +esp32micromod.build.tarch=xtensa +esp32micromod.build.bootloader_addr=0x1000 +esp32micromod.build.target=esp32 esp32micromod.build.mcu=esp32 esp32micromod.build.core=esp32 esp32micromod.build.variant=esp32micromod