Skip to content

Commit 38f570b

Browse files
valerosvaleros
committed
Merge branch 'release/v6.6.0'
2 parents b0a7f56 + 8494318 commit 38f570b

File tree

229 files changed

+3638
-44890
lines changed

Some content is hidden

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

229 files changed

+3638
-44890
lines changed

‎.github/workflows/examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
example:
1212
- "examples/arduino-ble5-advertising"
1313
- "examples/arduino-blink"
14-
- "examples/arduino-briki-internal-libs"
1514
- "examples/arduino-usb-keyboard"
1615
- "examples/arduino-wifiscan"
1716
- "examples/espidf-arduino-blink"

‎boards/adafruit_feather_esp32s2.json

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

‎boards/briki_abc_esp32.json

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎boards/briki_mbc-wb_esp32.json

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎boards/esp32-s3-devkitm-1.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"variant": "esp32s3"
2525
},
2626
"connectivity": [
27+
"bluetooth",
2728
"wifi"
2829
],
2930
"debug": {

‎boards/lilka_v2.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_opi",
6+
"partitions": "default_16MB.csv"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DARDUINO_LILKA",
11+
"-DLILKA_VERSION=2",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_USB_CDC_ON_BOOT=1",
14+
"-DARDUINO_RUNNING_CORE=1",
15+
"-DARDUINO_EVENT_RUNNING_CORE=1",
16+
"-DBOARD_HAS_PSRAM"
17+
],
18+
"f_cpu": "240000000L",
19+
"f_flash": "80000000L",
20+
"flash_mode": "qio",
21+
"hwids": [
22+
[
23+
"0x239A",
24+
"0x8145"
25+
],
26+
[
27+
"0x239A",
28+
"0x0145"
29+
],
30+
[
31+
"0x239A",
32+
"0x8146"
33+
]
34+
],
35+
"mcu": "esp32s3",
36+
"variant": "esp32s3"
37+
},
38+
"connectivity": [
39+
"bluetooth",
40+
"wifi"
41+
],
42+
"debug": {
43+
"openocd_target": "esp32s3.cfg"
44+
},
45+
"frameworks": [
46+
"arduino",
47+
"espidf"
48+
],
49+
"name": "Lilka v2",
50+
"upload": {
51+
"flash_size": "16MB",
52+
"maximum_ram_size": 327680,
53+
"maximum_size": 16777216,
54+
"require_upload_port": true,
55+
"speed": 460800
56+
},
57+
"url": "https://github.com/and3rson/lilka",
58+
"vendor": "Anderson & friends"
59+
}
60+

‎boards/lolin32_lite.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"ethernet",
1818
"can"
1919
],
20+
"debug": {
21+
"openocd_board": "esp-wroom-32.cfg"
22+
},
2023
"frameworks": [
2124
"arduino",
2225
"espidf"

‎boards/lolin_s3_pro.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_16MB.csv",
6+
"memory_type": "qio_opi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DARDUINO_LOLIN_S3_PRO",
11+
"-DBOARD_HAS_PSRAM",
12+
"-DARDUINO_USB_MODE=1",
13+
"-DARDUINO_RUNNING_CORE=1",
14+
"-DARDUINO_EVENT_RUNNING_CORE=1"
15+
],
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"flash_mode": "qio",
19+
"hwids": [
20+
[
21+
"0x303A",
22+
"0x8161"
23+
]
24+
],
25+
"mcu": "esp32s3",
26+
"variant": "lolin_s3_pro"
27+
},
28+
"connectivity": [
29+
"wifi",
30+
"bluetooth"
31+
],
32+
"debug": {
33+
"openocd_target": "esp32s3.cfg"
34+
},
35+
"frameworks": [
36+
"arduino",
37+
"espidf"
38+
],
39+
"name": "WEMOS LOLIN S3 PRO",
40+
"upload": {
41+
"flash_size": "16MB",
42+
"maximum_ram_size": 327680,
43+
"maximum_size": 16777216,
44+
"require_upload_port": true,
45+
"speed": 460800
46+
},
47+
"url": "https://www.wemos.cc/en/latest/s3/s3_pro.html",
48+
"vendor": "WEMOS"
49+
}

‎builder/frameworks/arduino.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@
3232

3333
SConscript("_embed_files.py", exports="env")
3434

35-
if build_core == "mbcwb":
36-
SConscript(
37-
join(DefaultEnvironment().PioPlatform().get_package_dir(
38-
"framework-arduino-mbcwb"), "tools", "platformio-esp-build.py"))
39-
40-
elif "espidf" not in env.subst("$PIOFRAMEWORK"):
35+
if "espidf" not in env.subst("$PIOFRAMEWORK"):
4136
SConscript(
4237
join(DefaultEnvironment().PioPlatform().get_package_dir(
4338
"framework-arduinoespressif32"), "tools", "platformio-build.py"))

0 commit comments

Comments
 (0)