Skip to content

Commit 9a959c8

Browse files
committed
Merge branch 'release/v2.3.0'
2 parents cd6f5cc + 1979ac6 commit 9a959c8

File tree

8 files changed

+156
-6
lines changed

8 files changed

+156
-6
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111

1212
install:
1313
- cmd: git submodule update --init --recursive
14-
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
14+
- cmd: SET PATH=C:\Python36\Scripts;%PATH%
1515
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
1616
- cmd: platformio platform install file://.
1717

boards/espmxdevkit.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"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": "dout",
8+
"ldscript": "eagle.flash.1m256.ld",
9+
"mcu": "esp8266",
10+
"variant": "esp8285"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "ESP-Mx DevKit (ESP8285)",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
26+
"speed": 115200
27+
},
28+
"url": "https://arduino-esp8266.readthedocs.io/en/latest/boards.html#doit-esp-mx-devkit-esp8285",
29+
"vendor": "Doit"
30+
}

boards/sonoff_basic.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_BASIC",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dout",
8+
"ldscript": "eagle.flash.1m256.ld",
9+
"mcu": "esp8266",
10+
"variant": "itead"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "Sonoff Basic",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
26+
"speed": 115200
27+
},
28+
"url": "https://www.itead.cc/sonoff-wifi-wireless-switch.html",
29+
"vendor": "ITEAD"
30+
}

boards/sonoff_s20.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_S20",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dout",
8+
"ldscript": "eagle.flash.1m256.ld",
9+
"mcu": "esp8266",
10+
"variant": "itead"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "Sonoff S20",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
26+
"speed": 115200
27+
},
28+
"url": "https://www.itead.cc/smart-socket.html",
29+
"vendor": "ITEAD"
30+
}

boards/sonoff_sv.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_SV",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dout",
8+
"ldscript": "eagle.flash.1m256.ld",
9+
"mcu": "esp8266",
10+
"variant": "itead"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "Sonoff SV",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
26+
"speed": 115200
27+
},
28+
"url": "https://www.itead.cc/sonoff-sv.html",
29+
"vendor": "ITEAD"
30+
}

boards/sonoff_th.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_TH",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dout",
8+
"ldscript": "eagle.flash.1m256.ld",
9+
"mcu": "esp8266",
10+
"variant": "itead"
11+
},
12+
"connectivity": [
13+
"wifi"
14+
],
15+
"frameworks": [
16+
"arduino",
17+
"esp8266-rtos-sdk",
18+
"esp8266-nonos-sdk"
19+
],
20+
"name": "Sonoff TH",
21+
"upload": {
22+
"maximum_ram_size": 81920,
23+
"maximum_size": 1048576,
24+
"require_upload_port": true,
25+
"resetmethod": "ck",
26+
"speed": 115200
27+
},
28+
"url": "https://www.itead.cc/sonoff-th.html",
29+
"vendor": "ITEAD"
30+
}

platform.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-espressif8266.git"
1414
},
15-
"version": "2.2.3",
15+
"version": "2.3.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",
@@ -41,12 +41,12 @@
4141
"packages": {
4242
"toolchain-xtensa": {
4343
"type": "toolchain",
44-
"version": "<3"
44+
"version": "~2.40802.191122"
4545
},
4646
"framework-arduinoespressif8266": {
4747
"type": "framework",
4848
"optional": true,
49-
"version": "~2.20502.0"
49+
"version": "~2.20601.0"
5050
},
5151
"framework-esp8266-rtos-sdk": {
5252
"type": "framework",
@@ -69,7 +69,7 @@
6969
},
7070
"tool-esptoolpy": {
7171
"type": "uploader",
72-
"version": "~1.20600.0"
72+
"version": "~1.20800.0"
7373
},
7474
"tool-mkspiffs": {
7575
"type": "uploader",

platform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class Espressif8266Platform(PlatformBase):
1919

2020
def configure_default_packages(self, variables, targets):
21-
framework = variables.get("pioframework")
21+
framework = variables.get("pioframework", [])
2222
if "arduino" not in framework:
2323
self.packages['toolchain-xtensa']['version'] = "~1.40802.0"
2424
if "buildfs" in targets:

0 commit comments

Comments
 (0)