Skip to content

Commit 6f9e45a

Browse files
valerosvaleros
committed
Merge branch 'release/v4.2.0'
2 parents a6205f6 + 162df5f commit 6f9e45a

File tree

9 files changed

+251
-10
lines changed

9 files changed

+251
-10
lines changed

‎boards/adafruit_feather_esp32s2_tft.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s2_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": [
8+
"-DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT",
9+
"-DBOARD_HAS_PSRAM",
10+
"-DARDUINO_USB_CDC_ON_BOOT=1"
11+
],
12+
"f_cpu": "240000000L",
13+
"f_flash": "80000000L",
14+
"flash_mode": "qio",
15+
"hwids": [
16+
[
17+
"0x239A",
18+
"0x810F"
19+
],
20+
[
21+
"0x239A",
22+
"0x010F"
23+
],
24+
[
25+
"0x239A",
26+
"0x8110"
27+
]
28+
],
29+
"mcu": "esp32s2",
30+
"variant": "adafruit_feather_esp32s2_tft"
31+
},
32+
"connectivity": [
33+
"wifi"
34+
],
35+
"debug": {
36+
"openocd_target": "esp32s2.cfg"
37+
},
38+
"frameworks": [
39+
"arduino",
40+
"espidf"
41+
],
42+
"name": "Adafruit Feather ESP32-S2 TFT",
43+
"upload": {
44+
"arduino": {
45+
"flash_extra_images": [
46+
[
47+
"0x2d0000",
48+
"variants/adafruit_feather_esp32s2_tft/tinyuf2.bin"
49+
]
50+
]
51+
},
52+
"flash_size": "4MB",
53+
"maximum_ram_size": 327680,
54+
"maximum_size": 4194304,
55+
"use_1200bps_touch": true,
56+
"wait_for_upload_port": true,
57+
"require_upload_port": true,
58+
"speed": 460800
59+
},
60+
"url": "https://www.adafruit.com/product/5300",
61+
"vendor": "Adafruit"
62+
}

‎boards/adafruit_qtpy_esp32s2.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s2_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": [
8+
"-DARDUINO_ADAFRUIT_QTPY_ESP32S2",
9+
"-DBOARD_HAS_PSRAM",
10+
"-DARDUINO_USB_CDC_ON_BOOT=1"
11+
],
12+
"f_cpu": "240000000L",
13+
"f_flash": "80000000L",
14+
"flash_mode": "qio",
15+
"hwids": [
16+
[
17+
"0x239A",
18+
"0x8111"
19+
],
20+
[
21+
"0x239A",
22+
"0x0111"
23+
],
24+
[
25+
"0x239A",
26+
"0x8112"
27+
]
28+
],
29+
"mcu": "esp32s2",
30+
"variant": "adafruit_qtpy_esp32s2"
31+
},
32+
"connectivity": [
33+
"wifi"
34+
],
35+
"debug": {
36+
"openocd_target": "esp32s2.cfg"
37+
},
38+
"frameworks": [
39+
"arduino",
40+
"espidf"
41+
],
42+
"name": "Adafruit QT Py ESP32-S2",
43+
"upload": {
44+
"arduino": {
45+
"flash_extra_images": [
46+
[
47+
"0x2d0000",
48+
"variants/adafruit_qtpy_esp32s2/tinyuf2.bin"
49+
]
50+
]
51+
},
52+
"flash_size": "4MB",
53+
"maximum_ram_size": 327680,
54+
"maximum_size": 4194304,
55+
"use_1200bps_touch": true,
56+
"wait_for_upload_port": true,
57+
"require_upload_port": true,
58+
"speed": 460800
59+
},
60+
"url": "https://www.adafruit.com/product/5325",
61+
"vendor": "Adafruit"
62+
}

‎boards/denky_d4.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"core": "esp32",
77
"extra_flags": [
88
"-DARDUINO_DENKY_PICOV3",
9-
"-DBOARD_HAS_PSRAM",
10-
"-mfix-esp32-psram-cache-issue",
11-
"-mfix-esp32-psram-cache-strategy=memw"
9+
"-DBOARD_HAS_PSRAM"
1210
],
1311
"f_cpu": "240000000L",
1412
"f_flash": "80000000L",

‎boards/dpu_esp32.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32_out.ld",
5+
"partitions": "default_8MB.csv"
6+
},
7+
"core": "esp32",
8+
"extra_flags": [
9+
"-DARDUINO_DPU_ESP32",
10+
"-DBOARD_HAS_PSRAM",
11+
"-mfix-esp32-psram-cache-issue",
12+
"-mfix-esp32-psram-cache-strategy=memw"
13+
],
14+
"f_cpu": "240000000L",
15+
"f_flash": "40000000L",
16+
"flash_mode": "dio",
17+
"mcu": "esp32",
18+
"variant": "dpu_esp32"
19+
},
20+
"connectivity": [
21+
"wifi",
22+
"bluetooth",
23+
"ethernet",
24+
"can"
25+
],
26+
"debug": {
27+
"openocd_board": "esp32-wrover.cfg"
28+
},
29+
"frameworks": [
30+
"arduino",
31+
"espidf"
32+
],
33+
"name": "TAMC DPU ESP32",
34+
"upload": {
35+
"flash_size": "8MB",
36+
"maximum_ram_size": 327680,
37+
"maximum_size": 8388608,
38+
"require_upload_port": true,
39+
"speed": 460800
40+
},
41+
"url": "https://github.com/TAMCTec/dpu-esp32",
42+
"vendor": "TAMC"
43+
}

‎boards/wipy3.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ldscript": "esp32_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": "-DARDUINO_WIPY3",
8+
"f_cpu": "240000000L",
9+
"f_flash": "40000000L",
10+
"flash_mode": "dio",
11+
"mcu": "esp32",
12+
"variant": "wipy3"
13+
},
14+
"connectivity": [
15+
"wifi",
16+
"bluetooth",
17+
"can",
18+
"ethernet"
19+
],
20+
"debug": {
21+
"openocd_board": "esp-wroom-32.cfg"
22+
},
23+
"frameworks": [
24+
"arduino",
25+
"espidf"
26+
],
27+
"name": "Pycom WiPy3",
28+
"upload": {
29+
"flash_size": "4MB",
30+
"maximum_ram_size": 1310720,
31+
"maximum_size": 4194304,
32+
"require_upload_port": true,
33+
"speed": 460800
34+
},
35+
"url": "https://pycom.io/",
36+
"vendor": "Pycom Ltd."
37+
}

‎boards/wt32-eth01.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32_out.ld"
5+
},
6+
"core": "esp32",
7+
"extra_flags": [
8+
"-DARDUINO_WT32_ETH01"
9+
],
10+
"f_cpu": "240000000L",
11+
"f_flash": "40000000L",
12+
"flash_mode": "dio",
13+
"mcu": "esp32",
14+
"variant": "wt32-eth01"
15+
},
16+
"connectivity": [
17+
"wifi",
18+
"bluetooth",
19+
"ethernet",
20+
"can"
21+
],
22+
"debug": {
23+
"openocd_board": "esp-wroom-32.cfg"
24+
},
25+
"frameworks": [
26+
"arduino",
27+
"espidf"
28+
],
29+
"name": "Wireless-Tag WT32-ETH01 Ethernet Module",
30+
"upload": {
31+
"flash_size": "4MB",
32+
"maximum_ram_size": 327680,
33+
"maximum_size": 4194304,
34+
"require_upload_port": true,
35+
"speed": 460800
36+
},
37+
"url": "http://www.wireless-tag.com/portfolio/wt32-eth01/",
38+
"vendor": "Wireless-Tag"
39+
}

‎builder/frameworks/espidf.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,8 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
556556
def prepare_build_envs(config, default_env):
557557
build_envs = []
558558
target_compile_groups = config.get("compileGroups")
559-
is_build_type_debug = (
560-
set(["debug", "sizedata"]) & set(COMMAND_LINE_TARGETS)
561-
or default_env.GetProjectOption("build_type") == "debug"
562-
)
563559

560+
is_build_type_debug = "debug" in env.GetBuildType()
564561
for cg in target_compile_groups:
565562
includes = []
566563
sys_includes = []

‎platform.json

Lines changed: 3 additions & 3 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.1.0",
21+
"version": "4.2.0",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinoespressif32",
@@ -66,7 +66,7 @@
6666
"type": "framework",
6767
"optional": true,
6868
"owner": "platformio",
69-
"version": "~3.20001.0"
69+
"version": "~3.20002.0"
7070
},
7171
"framework-arduino-mbcwb": {
7272
"type": "framework",
@@ -84,7 +84,7 @@
8484
"tool-esptoolpy": {
8585
"type": "uploader",
8686
"owner": "platformio",
87-
"version": "~1.30100.0"
87+
"version": "~1.30300.0"
8888
},
8989
"tool-mbctool": {
9090
"optional": true,

‎platform.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ def _add_dynamic_options(self, board):
161161
debug = board.manifest.get("debug", {})
162162
non_debug_protocols = ["esptool", "espota", "mbctool"]
163163
supported_debug_tools = [
164+
"cmsis-dap",
164165
"esp-prog",
165166
"iot-bus-jtag",
166167
"jlink",
@@ -190,6 +191,8 @@ def _add_dynamic_options(self, board):
190191

191192
if link == "jlink":
192193
openocd_interface = link
194+
elif link == "cmsis-dap":
195+
openocd_interface = link
193196
elif link in ("esp-prog", "ftdi"):
194197
if board.id == "esp32-s2-kaluga-1":
195198
openocd_interface = "ftdi/esp32s2_kaluga_v1"

0 commit comments

Comments
 (0)