Skip to content

Commit a6205f6

Browse files
committed
Merge branch 'release/v4.1.0'
2 parents 245f375 + 6339b32 commit a6205f6

File tree

3 files changed

+39
-23
lines changed

3 files changed

+39
-23
lines changed

boards/ttgo-t-oi-plus.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32c3_out.ld"
5+
},
6+
"core": "esp32",
7+
"f_cpu": "160000000L",
8+
"f_flash": "80000000L",
9+
"flash_mode": "qio",
10+
"extra_flags": "-DARDUINO_TTGO_T_OI_PLUS_DEV",
11+
"mcu": "esp32c3",
12+
"variant": "ttgo-t-oi-plus"
13+
},
14+
"connectivity": [
15+
"wifi"
16+
],
17+
"debug": {
18+
"openocd_target": "esp32c3.cfg"
19+
},
20+
"frameworks": [
21+
"arduino",
22+
"espidf"
23+
],
24+
"name": "TTGO T-OI PLUS RISC-V ESP32-C3",
25+
"upload": {
26+
"flash_size": "4MB",
27+
"maximum_ram_size": 327680,
28+
"maximum_size": 4194304,
29+
"require_upload_port": true,
30+
"speed": 460800
31+
},
32+
"url": "http://www.lilygo.cn/prod_view.aspx?TypeId=50044&Id=1361&FId=t3:50044:3",
33+
"vendor": "TTGO"
34+
}

platform.json

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-espressif32.git"
2020
},
21-
"version": "4.0.0",
21+
"version": "4.1.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinoespressif32",
@@ -36,28 +36,19 @@
3636
"toolchain-xtensa-esp32": {
3737
"type": "toolchain",
3838
"owner": "espressif",
39-
"version": "8.4.0+2021r1",
40-
"optionalVersions": [
41-
"8.4.0+2021r2-patch2"
42-
]
39+
"version": "8.4.0+2021r2-patch3"
4340
},
4441
"toolchain-xtensa-esp32s2": {
4542
"type": "toolchain",
4643
"optional": true,
4744
"owner": "espressif",
48-
"version": "8.4.0+2021r1",
49-
"optionalVersions": [
50-
"8.4.0+2021r2-patch2"
51-
]
45+
"version": "8.4.0+2021r2-patch3"
5246
},
5347
"toolchain-riscv32-esp": {
5448
"type": "toolchain",
5549
"optional": true,
5650
"owner": "espressif",
57-
"version": "8.4.0+2021r1",
58-
"optionalVersions": [
59-
"8.4.0+2021r2-patch2"
60-
]
51+
"version": "8.4.0+2021r2-patch3"
6152
},
6253
"toolchain-esp32ulp": {
6354
"type": "toolchain",
@@ -75,7 +66,7 @@
7566
"type": "framework",
7667
"optional": true,
7768
"owner": "platformio",
78-
"version": "~3.20000.0"
69+
"version": "~3.20001.0"
7970
},
8071
"framework-arduino-mbcwb": {
8172
"type": "framework",

platform.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,6 @@ def configure_default_packages(self, variables, targets):
9595
elif p in ("tool-mconf", "tool-idf") and "windows" in get_systype():
9696
self.packages[p]["optional"] = False
9797

98-
# Toolchains for stable IDF are different from Arduino
99-
if len(frameworks) == 1:
100-
for toolchain in (
101-
"toolchain-xtensa-esp32",
102-
"toolchain-xtensa-esp32s2",
103-
"toolchain-riscv32-esp",
104-
):
105-
self.packages[toolchain]["version"] = "8.4.0+2021r2-patch2"
106-
10798
if mcu in ("esp32s2", "esp32c3"):
10899
self.packages.pop("toolchain-xtensa-esp32", None)
109100
self.packages.pop("toolchain-esp32ulp", None)

0 commit comments

Comments
 (0)