Skip to content

Commit 949098a

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v0.10.0'
2 parents ba1877f + 0deef1b commit 949098a

File tree

8 files changed

+207
-3
lines changed

8 files changed

+207
-3
lines changed

‎boards/espectro32.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": "-DESP32_DEV -DARDUINO_ESPECTRO32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "espectro32"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "ESPectro32",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 2000000,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "https://shop.makestro.com/product/espectro32",
33+
"vendor": "DycodeX"
34+
}

‎boards/heltec_wifi_kit_32.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": "-DESP32_DEV -DARDUINO_Heltec_WIFI_Kit_32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "heltec_wifi_kit_32"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "Heltec WIFI Kit 32",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "http://www.heltec.cn",
33+
"vendor": "Heltec Automation"
34+
}

‎boards/heltec_wifi_lora_32.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": "-DESP32_DEV -DARDUINO_Heltec_WIFI_LoRa_32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "heltec_wifi_lora_32"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "Heltec WIFI LoRa 32",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "http://www.heltec.cn",
33+
"vendor": "Heltec Automation"
34+
}

‎boards/m5stack-core-esp32.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": "-DESP32_DEV -DARDUINO_M5Stack-Core-ESP32",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
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+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "M5Stack-Core-ESP32",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "http://www.m5stack.com",
33+
"vendor": "M5Stack"
34+
}

‎boards/mhetesp32devkit.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": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32DEVKIT",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "mhetesp32devkit"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "MH ET LIVE ESP32DevKIT",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "http://forum.mhetlive.com",
33+
"vendor": "MH-ET Live"
34+
}

‎boards/mhetesp32minikit.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": "-DESP32_DEV -DARDUINO_MH_ET_LIVE_ESP32MINIKIT",
5+
"f_cpu": "240000000L",
6+
"f_flash": "80000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp32_out.ld",
9+
"mcu": "esp32",
10+
"variant": "mhetesp32minikit"
11+
},
12+
"connectivity": [
13+
"wifi",
14+
"bluetooth",
15+
"ethernet",
16+
"can"
17+
],
18+
"frameworks": [
19+
"arduino",
20+
"espidf"
21+
],
22+
"name": "MH ET LIVE ESP32MiniKit",
23+
"upload": {
24+
"flash_size": "4MB",
25+
"maximum_ram_size": 294912,
26+
"maximum_size": 1310720,
27+
"require_upload_port": true,
28+
"resetmethod": "nodemcu",
29+
"speed": 115200,
30+
"wait_for_upload_port": true
31+
},
32+
"url": "http://forum.mhetlive.com",
33+
"vendor": "MH-ET Live"
34+
}

‎builder/frameworks/espidf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def build_espidf_bootloader():
337337
join("$BUILD_DIR", "esp32_out.ld"),
338338
join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"),
339339
env.VerboseAction(
340-
"$CC -I$PROJECTSRC_DIR -C -P -x c -E $SOURCE -o $TARGET",
340+
'$CC -I"$PROJECTSRC_DIR" -C -P -x c -E $SOURCE -o $TARGET',
341341
"Generating LD script $TARGET"))
342342

343343
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script)

‎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": "0.9.1",
15+
"version": "0.10.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",
@@ -45,7 +45,7 @@
4545
"framework-arduinoespressif32": {
4646
"type": "framework",
4747
"optional": true,
48-
"version": "~1.1.4"
48+
"version": "~1.2.0"
4949
},
5050
"framework-espidf": {
5151
"type": "framework",

0 commit comments

Comments
 (0)