Skip to content

Commit d0da799

Browse files
committed
Merge branch 'release/v2.6.3'
2 parents 41bdd3e + 4d1f003 commit d0da799

File tree

4 files changed

+56
-21
lines changed

4 files changed

+56
-21
lines changed

.github/workflows/examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
fail-fast: false
99
matrix:
1010
os: [ubuntu-16.04, windows-latest, macos-latest]
11-
python-version: [2.7, 3.7]
11+
python-version: [3.7]
1212
example:
1313
- "examples/arduino-asyncudp"
1414
- "examples/arduino-blink"

boards/esp07.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"build": {
33
"arduino": {
4-
"ldscript": "eagle.flash.4m1m.ld"
4+
"ldscript": "eagle.flash.1m256.ld"
55
},
66
"core": "esp8266",
77
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
88
"f_cpu": "80000000L",
99
"f_flash": "40000000L",
1010
"flash_mode": "qio",
1111
"mcu": "esp8266",
12-
"variant": "nodemcu"
12+
"variant": "generic"
1313
},
1414
"connectivity": [
1515
"wifi"
@@ -19,12 +19,12 @@
1919
"esp8266-rtos-sdk",
2020
"esp8266-nonos-sdk"
2121
],
22-
"name": "Espressif Generic ESP8266 ESP-07",
22+
"name": "Espressif Generic ESP8266 ESP-07 1MB",
2323
"upload": {
2424
"maximum_ram_size": 81920,
25-
"maximum_size": 4194304,
25+
"maximum_size": 1048576,
2626
"require_upload_port": true,
27-
"resetmethod": "nodemcu",
27+
"resetmethod": "ck",
2828
"speed": 115200
2929
},
3030
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",

boards/esp07s.json

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "eagle.flash.4m1m.ld"
5+
},
6+
"core": "esp8266",
7+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP07",
8+
"f_cpu": "80000000L",
9+
"f_flash": "40000000L",
10+
"flash_mode": "qio",
11+
"mcu": "esp8266",
12+
"variant": "nodemcu"
13+
},
14+
"connectivity": [
15+
"wifi"
16+
],
17+
"frameworks": [
18+
"arduino",
19+
"esp8266-rtos-sdk",
20+
"esp8266-nonos-sdk"
21+
],
22+
"name": "Espressif Generic ESP8266 ESP-07S",
23+
"upload": {
24+
"maximum_ram_size": 81920,
25+
"maximum_size": 4194304,
26+
"require_upload_port": true,
27+
"resetmethod": "nodemcu",
28+
"speed": 115200
29+
},
30+
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family#esp-07",
31+
"vendor": "Espressif"
32+
}

platform.json

+18-15
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,19 @@
55
"homepage": "https://espressif.com/",
66
"license": "Apache-2.0",
77
"keywords": [
8-
"dev-platform",
9-
"Wi-Fi",
10-
"Xtensa",
11-
"106Micro"
8+
"dev-platform",
9+
"Wi-Fi",
10+
"Xtensa",
11+
"106Micro"
1212
],
1313
"engines": {
14-
"platformio": "<5"
14+
"platformio": "^5"
1515
},
1616
"repository": {
1717
"type": "git",
1818
"url": "https://github.com/platformio/platform-espressif8266.git"
1919
},
20-
"version": "2.6.2",
21-
"packageRepositories": [
22-
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
23-
"http://dl.platformio.org/packages/manifest.json",
24-
"https://raw.githubusercontent.com/eerimoq/simba/master/make/platformio/manifest.json",
25-
"https://raw.githubusercontent.com/yanbe/framework-esp8266-rtos-sdk/master/manifest.json",
26-
"https://raw.githubusercontent.com/sanderv32/framework-esp8266-nonos-sdk/master/manifest.json"
27-
],
20+
"version": "2.6.3",
2821
"frameworks": {
2922
"arduino": {
3023
"package": "framework-arduinoespressif8266",
@@ -52,44 +45,54 @@
5245
"packages": {
5346
"toolchain-xtensa": {
5447
"type": "toolchain",
55-
"version": "~2.40802.191122"
48+
"owner": "platformio",
49+
"version": "~2.40802.0",
50+
"optionalVersions": ["~1.40802.0"]
5651
},
5752
"framework-arduinoespressif8266": {
5853
"type": "framework",
5954
"optional": true,
55+
"owner": "platformio",
6056
"version": "~3.20704.0"
6157
},
6258
"framework-esp8266-rtos-sdk": {
6359
"type": "framework",
6460
"optional": true,
61+
"owner": "platformio",
6562
"version": ">=1.5.0-beta"
6663
},
6764
"framework-esp8266-nonos-sdk": {
6865
"type": "framework",
6966
"optional": true,
67+
"owner": "platformio",
7068
"version": ">=2.1.0"
7169
},
7270
"framework-simba": {
7371
"type": "framework",
7472
"optional": true,
73+
"owner": "platformio",
7574
"version": ">=7.0.0"
7675
},
7776
"tool-esptool": {
7877
"type": "uploader",
78+
"owner": "platformio",
7979
"version": "<2"
8080
},
8181
"tool-esptoolpy": {
8282
"type": "uploader",
83-
"version": "~1.20800.0"
83+
"owner": "platformio",
84+
"version": "~1.30000.0"
8485
},
8586
"tool-mkspiffs": {
8687
"type": "uploader",
8788
"optional": true,
89+
"owner": "platformio",
8890
"version": "~1.200.0"
8991
},
9092
"tool-mklittlefs": {
9193
"type": "uploader",
9294
"optional": true,
95+
"owner": "platformio",
9396
"version": "~1.203.0"
9497
}
9598
}

0 commit comments

Comments
 (0)