Skip to content

Commit 153995a

Browse files
committed
Merge branch 'release/v1.4.0'
2 parents 28ce385 + 551ff76 commit 153995a

28 files changed

+443
-351
lines changed

boards/d1.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"mcu": "esp8266",
1010
"variant": "d1"
1111
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"esp8266-rtos-sdk"

boards/d1_mini.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"mcu": "esp8266",
1010
"variant": "d1_mini"
1111
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"esp8266-rtos-sdk"

boards/d1_mini_lite.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"mcu": "esp8266",
1010
"variant": "d1_mini"
1111
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino"
1417
],

boards/esp01.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.512k64.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp8266.flash.512k64.ld",
9+
"mcu": "esp8266",
1010
"variant": "generic"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
13-
"arduino",
16+
"arduino",
1417
"simba",
1518
"esp8266-rtos-sdk"
16-
],
17-
"name": "Espressif Generic ESP8266 ESP-01 512k",
19+
],
20+
"name": "Espressif Generic ESP8266 ESP-01 512k",
1821
"upload": {
19-
"maximum_ram_size": 81920,
20-
"maximum_size": 524288,
21-
"require_upload_port": true,
22-
"resetmethod": "ck",
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 524288,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
2326
"speed": 115200
24-
},
25-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
27+
},
28+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2629
"vendor": "Espressif"
2730
}

boards/esp01_1m.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.1m256.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp8266.flash.1m256.ld",
9+
"mcu": "esp8266",
1010
"variant": "generic"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
13-
"arduino",
16+
"arduino",
1417
"simba",
1518
"esp8266-rtos-sdk"
16-
],
17-
"name": "Espressif Generic ESP8266 ESP-01 1M",
19+
],
20+
"name": "Espressif Generic ESP8266 ESP-01 1M",
1821
"upload": {
19-
"maximum_ram_size": 81920,
20-
"maximum_size": 1048576,
21-
"require_upload_port": true,
22-
"resetmethod": "ck",
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
2326
"speed": 115200
24-
},
25-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
27+
},
28+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2629
"vendor": "Espressif"
2730
}

boards/esp07.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp8266.flash.4m1m.ld",
9+
"mcu": "esp8266",
1010
"variant": "nodemcu"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"esp8266-rtos-sdk"
15-
],
16-
"name": "Espressif Generic ESP8266 ESP-07",
18+
],
19+
"name": "Espressif Generic ESP8266 ESP-07",
1720
"upload": {
18-
"maximum_ram_size": 81920,
19-
"maximum_size": 4194304,
20-
"require_upload_port": true,
21-
"resetmethod": "nodemcu",
21+
"maximum_ram_size": 81920,
22+
"maximum_size": 4194304,
23+
"require_upload_port": true,
24+
"resetmethod": "nodemcu",
2225
"speed": 115200
23-
},
24-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",
26+
},
27+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",
2528
"vendor": "Espressif"
2629
}

boards/esp12e.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "dio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP12",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp8266.flash.4m1m.ld",
9+
"mcu": "esp8266",
1010
"variant": "nodemcu"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
13-
"arduino",
16+
"arduino",
1417
"simba",
1518
"esp8266-rtos-sdk"
16-
],
17-
"name": "Espressif ESP8266 ESP-12E",
19+
],
20+
"name": "Espressif ESP8266 ESP-12E",
1821
"upload": {
19-
"maximum_ram_size": 81920,
20-
"maximum_size": 4194304,
21-
"require_upload_port": true,
22-
"resetmethod": "nodemcu",
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 4194304,
24+
"require_upload_port": true,
25+
"resetmethod": "nodemcu",
2326
"speed": 115200
24-
},
25-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
27+
},
28+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2629
"vendor": "Espressif"
2730
}

boards/esp210.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP210",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP210",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp8266.flash.4m1m.ld",
9+
"mcu": "esp8266",
1010
"variant": "generic"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"esp8266-rtos-sdk"
15-
],
16-
"name": "SweetPea ESP-210",
18+
],
19+
"name": "SweetPea ESP-210",
1720
"upload": {
18-
"maximum_ram_size": 81920,
19-
"maximum_size": 4194304,
20-
"require_upload_port": true,
21-
"resetmethod": "ck",
21+
"maximum_ram_size": 81920,
22+
"maximum_size": 4194304,
23+
"require_upload_port": true,
24+
"resetmethod": "ck",
2225
"speed": 115200
23-
},
24-
"url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
26+
},
27+
"url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
2528
"vendor": "SweetPea"
2629
}

boards/esp8285.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_ESP01",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "dout",
8-
"ldscript": "esp8266.flash.1m256.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_ESP01",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dout",
8+
"ldscript": "esp8266.flash.1m256.ld",
9+
"mcu": "esp8266",
1010
"variant": "generic"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"esp8266-rtos-sdk"
15-
],
16-
"name": "Generic ESP8285 Module",
18+
],
19+
"name": "Generic ESP8285 Module",
1720
"upload": {
18-
"maximum_ram_size": 81920,
19-
"maximum_size": 434160,
20-
"require_upload_port": true,
21-
"resetmethod": "ck",
21+
"maximum_ram_size": 81920,
22+
"maximum_size": 434160,
23+
"require_upload_port": true,
24+
"resetmethod": "ck",
2225
"speed": 115200
23-
},
24-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
26+
},
27+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2528
"vendor": "Espressif"
2629
}

boards/esp_wroom_02.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
{
22
"build": {
3-
"core": "esp8266",
4-
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP_WROOM_02",
5-
"f_cpu": "80000000L",
6-
"f_flash": "40000000L",
7-
"flash_mode": "qio",
8-
"ldscript": "esp8266.flash.4m1m.ld",
9-
"mcu": "esp8266",
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP_WROOM_02",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "qio",
8+
"ldscript": "esp8266.flash.4m1m.ld",
9+
"mcu": "esp8266",
1010
"variant": "nodemcu"
11-
},
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
1215
"frameworks": [
1316
"arduino",
1417
"simba",
1518
"esp8266-rtos-sdk"
16-
],
17-
"name": "ESP-WROOM-02",
19+
],
20+
"name": "ESP-WROOM-02",
1821
"upload": {
19-
"maximum_ram_size": 81920,
20-
"maximum_size": 4194304,
21-
"require_upload_port": true,
22-
"resetmethod": "nodemcu",
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 4194304,
24+
"require_upload_port": true,
25+
"resetmethod": "nodemcu",
2326
"speed": 115200
24-
},
25-
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
27+
},
28+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2629
"vendor": "Espressif"
2730
}

0 commit comments

Comments
 (0)