Skip to content

Commit 1c9d00d

Browse files
committed
Merge branch 'release/v1.11.0'
2 parents e6b4047 + b330c10 commit 1c9d00d

File tree

5 files changed

+77
-2
lines changed

5 files changed

+77
-2
lines changed

boards/esp32cam.json

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

boards/iotaap_magnolia.json

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

boards/ttgo-t1.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
"ethernet",
1616
"can"
1717
],
18+
"debug": {
19+
"openocd_board": "esp-wroom-32.cfg"
20+
},
1821
"frameworks": [
1922
"arduino",
2023
"espidf"

boards/vintlabs-devkit-v1.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"build": {
3+
"core": "esp32",
4+
"extra_flags": "-DARDUINO_ESP32_DEV",
5+
"f_cpu": "240000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "vintlabsdevkitv1"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"debug": {
19+
"openocd_board": "esp-wroom-32.cfg"
20+
},
21+
"frameworks": [
22+
"arduino",
23+
"espidf"
24+
],
25+
"name": "VintLabs ESP32 Devkit",
26+
"upload": {
27+
"flash_size": "4MB",
28+
"maximum_ram_size": 327680,
29+
"maximum_size": 4194304,
30+
"require_upload_port": true,
31+
"speed": 460800
32+
},
33+
"url": "https://www.vintlabs.com/product/vintlabs-esp32-wroom32-iot-8x2a-pwm-driver-development-kit-4mb-flash-wifi-bluetooth/",
34+
"vendor": "VintLabs"
35+
}

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-espressif32.git"
1414
},
15-
"version": "1.10.0",
15+
"version": "1.11.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",
@@ -50,7 +50,7 @@
5050
"framework-arduinoespressif32": {
5151
"type": "framework",
5252
"optional": true,
53-
"version": "~2.10003.190916"
53+
"version": "~2.10004.191002"
5454
},
5555
"framework-espidf": {
5656
"type": "framework",

0 commit comments

Comments
 (0)