Skip to content

Commit cae60af

Browse files
authored
Merge pull request #25 from espressif/master
Update 05112021
2 parents 7d79518 + 83884a0 commit cae60af

File tree

12 files changed

+43
-63
lines changed

12 files changed

+43
-63
lines changed

.github/stale.yml

+26-61
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,26 @@
1-
# Configuration for probot-stale - https://github.com/probot/stale
2-
3-
# Number of days of inactivity before an Issue or Pull Request becomes stale
4-
daysUntilStale: 60
5-
6-
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7-
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8-
daysUntilClose: 14
9-
10-
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11-
onlyLabels: []
12-
13-
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14-
exemptLabels:
15-
- "Type: For reference"
16-
- "Type: To be implemented"
17-
- "Type: Feature request"
18-
19-
# Set to true to ignore issues in a project (defaults to false)
20-
exemptProjects: false
21-
22-
# Set to true to ignore issues in a milestone (defaults to false)
23-
exemptMilestones: false
24-
25-
# Set to true to ignore issues with an assignee (defaults to false)
26-
exemptAssignees: false
27-
28-
# Label to use when marking as stale
29-
staleLabel: "Status: Stale"
30-
31-
# Comment to post when marking as stale. Set to `false` to disable
32-
markComment: >
33-
[STALE_SET] This issue has been automatically marked as stale because it has not had
34-
recent activity. It will be closed in 14 days if no further activity occurs. Thank you
35-
for your contributions.
36-
37-
# Comment to post when removing the stale label.
38-
unmarkComment: >
39-
[STALE_CLR] This issue has been removed from the stale queue. Please ensure activity to keep it openin the future.
40-
41-
# Comment to post when closing a stale Issue or Pull Request.
42-
closeComment: >
43-
[STALE_DEL] This stale issue has been automatically closed. Thank you for your contributions.
44-
45-
# Limit the number of actions per hour, from 1-30. Default is 30
46-
limitPerRun: 30
47-
48-
# Limit to only `issues` or `pulls`
49-
only: issues
50-
51-
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
52-
# pulls:
53-
# daysUntilStale: 30
54-
# markComment: >
55-
# This pull request has been automatically marked as stale because it has not had
56-
# recent activity. It will be closed if no further activity occurs. Thank you
57-
# for your contributions.
58-
59-
# issues:
60-
# exemptLabels:
61-
# - confirmed
1+
# This workflow firstly warns and then closes issues that have had no activity for a specified amount of time.
2+
#
3+
# You can adjust the behavior by modifying this file.
4+
# For more information can be found here: https://github.com/actions/stale
5+
6+
name: Mark stale issues
7+
on:
8+
schedule:
9+
- cron: '30 9 * * *'
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
permissions:
16+
issues: write
17+
18+
steps:
19+
- uses: actions/stale@v3
20+
with:
21+
repo-token: ${{ secrets.GITHUB_TOKEN }}
22+
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.'
23+
days-before-stale: 60
24+
days-before-close: 14
25+
exempt-issue-labels: 'Type: For reference,Type: To be implemented,Type: Feature request'
26+
stale-issue-label: 'Status: Stale'

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ set(LIBRARY_SRCS
5555
libraries/DNSServer/src/DNSServer.cpp
5656
libraries/EEPROM/src/EEPROM.cpp
5757
libraries/ESPmDNS/src/ESPmDNS.cpp
58+
libraries/Ethernet/src/ETH.cpp
5859
libraries/FFat/src/FFat.cpp
5960
libraries/FS/src/FS.cpp
6061
libraries/FS/src/vfs_api.cpp
@@ -91,7 +92,6 @@ set(LIBRARY_SRCS
9192
libraries/WebServer/src/detail/mimetable.cpp
9293
libraries/WiFiClientSecure/src/ssl_client.cpp
9394
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
94-
libraries/WiFi/src/ETH.cpp
9595
libraries/WiFi/src/WiFiAP.cpp
9696
libraries/WiFi/src/WiFiClient.cpp
9797
libraries/WiFi/src/WiFi.cpp

boards.txt

+3
Original file line numberDiff line numberDiff line change
@@ -2571,6 +2571,9 @@ esp32micromod.upload.extra_flags=
25712571
esp32micromod.serial.disableDTR=true
25722572
esp32micromod.serial.disableRTS=true
25732573

2574+
esp32micromod.build.tarch=xtensa
2575+
esp32micromod.build.bootloader_addr=0x1000
2576+
esp32micromod.build.target=esp32
25742577
esp32micromod.build.mcu=esp32
25752578
esp32micromod.build.core=esp32
25762579
esp32micromod.build.variant=esp32micromod

docs/source/esp-idf_component.rst

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ For a simplified method, see `lib-builder <lib_builder>`_.
1010
Installation
1111
------------
1212

13+
.. note::
14+
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.
15+
1316
- Download and install `ESP-IDF <https://github.com/espressif/esp-idf>`_.
1417
- Create blank idf project (from one of the examples).
1518
- In the project folder, create a new folder called `components` and clone this repository inside the new created folder.

libraries/Ethernet/library.properties

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name=Ethernet
2+
version=2.0.0
3+
author=Hristo Gochkov
4+
maintainer=Hristo Gochkov <[email protected]>
5+
sentence=Enables network connection (local and Internet) using the ESP32 Ethernet.
6+
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.
7+
category=Communication
8+
url=
9+
architectures=esp32
File renamed without changes.
File renamed without changes.

libraries/WiFi/src/WiFiGeneric.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class WiFiGenericClass
172172
bool setTxPower(wifi_power_t power);
173173
wifi_power_t getTxPower();
174174

175-
bool initiateFTM(uint8_t frm_count=16, uint16_t burst_period=2, uint8_t channel=0, const uint8_t * mac=NULL);
175+
bool initiateFTM(uint8_t frm_count=16, uint16_t burst_period=2, uint8_t channel=1, const uint8_t * mac=NULL);
176176

177177
static const char * getHostname();
178178
static bool setHostname(const char * hostname);

0 commit comments

Comments
 (0)