Skip to content

Commit 6b110e6

Browse files
me-no-devme-no-dev
committed
Update IDF, tools and toolchains
1 parent fccf573 commit 6b110e6

File tree

758 files changed

+33194
-23043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

758 files changed

+33194
-23043
lines changed

‎.github/scripts/install-platformio-esp32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo "Installing Platform ESP32 ..."
1313
python -m platformio platform install $PLATFORMIO_ESP32_URL > /dev/null 2>&1
1414

1515
echo "Replacing the framework version ..."
16-
python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif32']['version'] = '*'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
16+
python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif32']['version'] = '*'; del data['packages']['framework-arduinoespressif32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
1717

1818
if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ]; then
1919
echo "Linking Core..."

‎boards.txt

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
menu.UploadSpeed=Upload Speed
2-
menu.UploadMode=Upload Mode
32
menu.SerialMode=Serial Connected To
43
menu.CPUFreq=CPU Frequency
54
menu.FlashFreq=Flash Frequency
@@ -27,8 +26,8 @@ esp32s2.upload.maximum_size=1310720
2726
esp32s2.upload.maximum_data_size=327680
2827
esp32s2.upload.flags=
2928

30-
esp32s2.serial.disableDTR=true
31-
esp32s2.serial.disableRTS=true
29+
esp32s2.serial.disableDTR=false
30+
esp32s2.serial.disableRTS=false
3231

3332
esp32s2.build.mcu=esp32s2
3433
esp32s2.build.core=esp32
@@ -49,22 +48,6 @@ esp32s2.menu.SerialMode.default.build.serial=0
4948
esp32s2.menu.SerialMode.cdc=USB CDC
5049
esp32s2.menu.SerialMode.cdc.build.serial=1
5150

52-
esp32s2.menu.UploadMode.default=Default Uart
53-
esp32s2.menu.UploadMode.default.upload.flags=
54-
esp32s2.menu.UploadMode.default.upload.tool=esptool_py
55-
esp32s2.menu.UploadMode.default.serial.disableDTR=true
56-
esp32s2.menu.UploadMode.default.serial.disableRTS=true
57-
esp32s2.menu.UploadMode.cdc=USB CDC
58-
esp32s2.menu.UploadMode.cdc.upload.flags=--no-stub
59-
esp32s2.menu.UploadMode.cdc.upload.tool=esptool_py
60-
esp32s2.menu.UploadMode.cdc.serial.disableDTR=false
61-
esp32s2.menu.UploadMode.cdc.serial.disableRTS=false
62-
#esp32s2.menu.UploadMode.dfu=USB DFU
63-
#esp32s2.menu.UploadMode.dfu.upload.flags=
64-
#esp32s2.menu.UploadMode.dfu.upload.tool=dfu_util
65-
#esp32s2.menu.UploadMode.dfu.serial.disableDTR=false
66-
#esp32s2.menu.UploadMode.dfu.serial.disableRTS=false
67-
6851
esp32s2.menu.PSRAM.disabled=Disabled
6952
esp32s2.menu.PSRAM.disabled.build.defines=
7053
esp32s2.menu.PSRAM.enabled=Enabled
@@ -578,8 +561,8 @@ feathers2.upload.maximum_size=1310720
578561
feathers2.upload.maximum_data_size=327680
579562
feathers2.upload.flags=
580563

581-
feathers2.serial.disableDTR=true
582-
feathers2.serial.disableRTS=true
564+
feathers2.serial.disableDTR=false
565+
feathers2.serial.disableRTS=false
583566

584567
feathers2.build.mcu=esp32s2
585568
feathers2.build.core=esp32
@@ -605,17 +588,6 @@ feathers2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
605588
feathers2.menu.PSRAM.disabled=Disabled
606589
feathers2.menu.PSRAM.disabled.build.defines=
607590

608-
feathers2.menu.UploadMode.cdc=USB CDC
609-
feathers2.menu.UploadMode.cdc.upload.flags=--no-stub
610-
feathers2.menu.UploadMode.cdc.upload.tool=esptool_py
611-
feathers2.menu.UploadMode.cdc.serial.disableDTR=false
612-
feathers2.menu.UploadMode.cdc.serial.disableRTS=false
613-
feathers2.menu.UploadMode.default=Default Uart - External
614-
feathers2.menu.UploadMode.default.upload.flags=
615-
feathers2.menu.UploadMode.default.upload.tool=esptool_py
616-
feathers2.menu.UploadMode.default.serial.disableDTR=true
617-
feathers2.menu.UploadMode.default.serial.disableRTS=true
618-
619591
feathers2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
620592
feathers2.menu.PartitionScheme.fatflash.build.partitions=ffat
621593
feathers2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
@@ -710,8 +682,8 @@ pros2.upload.maximum_size=1310720
710682
pros2.upload.maximum_data_size=327680
711683
pros2.upload.flags=
712684

713-
pros2.serial.disableDTR=true
714-
pros2.serial.disableRTS=true
685+
pros2.serial.disableDTR=false
686+
pros2.serial.disableRTS=false
715687

716688
pros2.build.mcu=esp32s2
717689
pros2.build.core=esp32
@@ -737,17 +709,6 @@ pros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
737709
pros2.menu.PSRAM.disabled=Disabled
738710
pros2.menu.PSRAM.disabled.build.defines=
739711

740-
pros2.menu.UploadMode.cdc=USB CDC
741-
pros2.menu.UploadMode.cdc.upload.flags=--no-stub
742-
pros2.menu.UploadMode.cdc.upload.tool=esptool_py
743-
pros2.menu.UploadMode.cdc.serial.disableDTR=false
744-
pros2.menu.UploadMode.cdc.serial.disableRTS=false
745-
pros2.menu.UploadMode.default=Default Uart - External
746-
pros2.menu.UploadMode.default.upload.flags=
747-
pros2.menu.UploadMode.default.upload.tool=esptool_py
748-
pros2.menu.UploadMode.default.serial.disableDTR=true
749-
pros2.menu.UploadMode.default.serial.disableRTS=true
750-
751712
pros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
752713
pros2.menu.PartitionScheme.fatflash.build.partitions=ffat
753714
pros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152

‎cores/esp32/USB.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#define USB_PRODUCT ARDUINO_BOARD
3030
#endif
3131
#ifndef USB_SERIAL
32-
#define USB_SERIAL ""
32+
#define USB_SERIAL "0"
3333
#endif
3434

3535
extern "C" {

‎cores/esp32/esp32-hal-tinyusb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ esp_err_t tinyusb_init(tinyusb_device_config_t *config) {
544544
initialized = false;
545545
return err;
546546
}
547-
xTaskCreate(usb_device_task, "usbd", 4096, NULL, 24, NULL);
547+
xTaskCreate(usb_device_task, "usbd", 4096, NULL, configMAX_PRIORITIES - 1, NULL);
548548
return err;
549549
}
550550

‎libraries/WiFi/src/ETH.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,16 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
116116
tcpipInit();
117117

118118
tcpip_adapter_set_default_eth_handlers();
119+
120+
esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
121+
esp_netif_t *eth_netif = esp_netif_new(&cfg);
122+
123+
if(esp_eth_set_default_handlers(eth_netif) != ESP_OK){
124+
log_e("esp_eth_set_default_handlers failed");
125+
return false;
126+
}
127+
128+
119129
esp_eth_mac_t *eth_mac = NULL;
120130
#if CONFIG_ETH_SPI_ETHERNET_DM9051
121131
if(type == ETH_PHY_DM9051){
@@ -176,6 +186,12 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
176186
log_e("esp_eth_driver_install failed");
177187
return false;
178188
}
189+
190+
/* attach Ethernet driver to TCP/IP stack */
191+
if(esp_netif_attach(eth_netif, esp_eth_new_netif_glue(eth_handle)) != ESP_OK){
192+
log_e("esp_netif_attach failed");
193+
return false;
194+
}
179195

180196
if(esp_eth_start(eth_handle) != ESP_OK){
181197
log_e("esp_eth_start failed");

‎libraries/WiFi/src/WiFiMulti.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ bool WiFiMulti::addAP(const char* ssid, const char *passphrase)
5656
return false;
5757
}
5858

59-
if(passphrase && strlen(passphrase) > 63) {
59+
if(passphrase && strlen(passphrase) > 64) {
6060
// fail passphrase too long!
6161
log_e("[WIFI][APlistAdd] passphrase too long");
6262
return false;

‎package/package_esp32_index.template.json

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -54,83 +54,83 @@
5454
"tools": [
5555
{
5656
"name": "xtensa-esp32-elf-gcc",
57-
"version": "gcc8_2_0-esp-2020r1",
57+
"version": "gcc8_2_0-esp-2020r2",
5858
"systems": [
5959
{
6060
"host": "i686-mingw32",
61-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-win32.zip",
62-
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r1-win32.zip",
63-
"checksum": "SHA-256:5fbabd2b7c75f56ebe207061f56beb21aca32ef867b64e14e735065cf812cce4",
64-
"size": "103877946"
61+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-win32.zip",
62+
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r2-win32.zip",
63+
"checksum": "SHA-256:f2ba6bdb1c4b2178955e5e7a204552bb754709e02eaf9d8febe770d46629db8f",
64+
"size": "103885422"
6565
},
6666
{
6767
"host": "x86_64-apple-darwin",
68-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-macos.tar.gz",
69-
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r1-macos.tar.gz",
70-
"checksum": "SHA-256:a3ee69bbe23acb77242086d2445c62d6bf13dbd9abcdfd4b56acef0937051a12",
71-
"size": "92170881"
68+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-macos.tar.gz",
69+
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r2-macos.tar.gz",
70+
"checksum": "SHA-256:48b288e3e5c60623851616bf545b8e4fc5382dc980d6b9682373f11013fe5776",
71+
"size": "92201363"
7272
},
7373
{
7474
"host": "x86_64-pc-linux-gnu",
75-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz",
76-
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz",
77-
"checksum": "SHA-256:b65ae41a675c866f5e11e3c452fc4b9cee3f39038d88435faa45308f50388c54",
78-
"size": "85490835"
75+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz",
76+
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz",
77+
"checksum": "SHA-256:6c73b9e9d252810a63ca5e94b497c6c09fb8c903fe9c477f385bdc2ab4d2187e",
78+
"size": "85520229"
7979
},
8080
{
8181
"host": "i686-pc-linux-gnu",
82-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz",
83-
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz",
84-
"checksum": "SHA-256:19273eb069efb29cc1df129f667fc09571c8e6e0ffa1fc536fb8b5d14bd59d4b",
85-
"size": "87449664"
82+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz",
83+
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz",
84+
"checksum": "SHA-256:a003c7bc9b9f0dd82170480aadd62c0586fc6e3d69119c637c957125164f40e5",
85+
"size": "87467927"
8686
},
8787
{
8888
"host": "arm-linux-gnueabihf",
89-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz",
90-
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz",
91-
"checksum": "SHA-256:7cd03edf067b5da6acf333ddaf18ce8070db98876c01b1d8979702e63587fcb5",
92-
"size": "83653607"
89+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz",
90+
"archiveFileName": "xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz",
91+
"checksum": "SHA-256:51dd318c4f2ac1fe2b206d029e1d2080c922107cc56e4a3802b1acafd7b436db",
92+
"size": "83672167"
9393
}
9494
]
9595
},
9696
{
9797
"name": "xtensa-esp32s2-elf-gcc",
98-
"version": "gcc8_2_0-esp-2020r1",
98+
"version": "gcc8_2_0-esp-2020r2",
9999
"systems": [
100100
{
101101
"host": "i686-mingw32",
102-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-win32.zip",
103-
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-win32.zip",
104-
"checksum": "SHA-256:a73a5b61510e730d7d0e46584f146a190b19627117e7657c92dccbedbf55ad68",
105-
"size": "104292272"
102+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-win32.zip",
103+
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-win32.zip",
104+
"checksum": "SHA-256:e7fe06fc37f1046765653ec1ed571f06a86a5b5cde7b3a0ab71c44232c5b6a2f",
105+
"size": "104302935"
106106
},
107107
{
108108
"host": "x86_64-apple-darwin",
109-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-macos.tar.gz",
110-
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-macos.tar.gz",
111-
"checksum": "SHA-256:f6ec427699930ccd17d730fb5bcb0daa2283bee83e0987cade45d8f0e1f6f544",
112-
"size": "92539826"
109+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-macos.tar.gz",
110+
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-macos.tar.gz",
111+
"checksum": "SHA-256:76d17b170e667b73dbb013e8efa8032b18d9e68f6e364745639e851d99ad68a3",
112+
"size": "92562690"
113113
},
114114
{
115115
"host": "x86_64-pc-linux-gnu",
116-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz",
117-
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-amd64.tar.gz",
118-
"checksum": "SHA-256:f435159a654dbfd8ccc9f89a16d5ce523ebd9e04ae48d95bf4935d15ac7bd058",
119-
"size": "85781628"
116+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz",
117+
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz",
118+
"checksum": "SHA-256:f5efd18a96f773b73bd6bcdee4476b5e4fbccea6befe0cb62c08675e4c68a65f",
119+
"size": "85796525"
120120
},
121121
{
122122
"host": "i686-pc-linux-gnu",
123-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz",
124-
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-i686.tar.gz",
125-
"checksum": "SHA-256:38b685c3243ab991dd9112ef330ba1fa1a176ab68a6aca832a0fc76975b8916f",
126-
"size": "87764133"
123+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz",
124+
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-i686.tar.gz",
125+
"checksum": "SHA-256:53e8b9d38c409a207685b615924eada2ee9719ac4fe8c79caa7a89c788a65a7d",
126+
"size": "87773410"
127127
},
128128
{
129129
"host": "arm-linux-gnueabihf",
130-
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r1/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz",
131-
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r1-linux-armel.tar.gz",
132-
"checksum": "SHA-256:38081688e3d6d21b436adca9c790d8cdc9dd4dbd9e1a9c98262ea6b04639f8c1",
133-
"size": "84055798"
130+
"url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2020r2/xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz",
131+
"archiveFileName": "xtensa-esp32s2-elf-gcc8_2_0-esp-2020r2-linux-armel.tar.gz",
132+
"checksum": "SHA-256:40ed8c365a3e32643c7fc9cf44908fb166d3acc52754ebf0b03e82122a0ecd2c",
133+
"size": "84041933"
134134
}
135135
]
136136
},

0 commit comments

Comments
 (0)