Skip to content

Commit

Permalink
Merge branch 'release/v2.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Nov 27, 2019
2 parents cd6f5cc + 1979ac6 commit 9a959c8
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 6 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:

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

Expand Down
30 changes: 30 additions & 0 deletions boards/espmxdevkit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build": {
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"ldscript": "eagle.flash.1m256.ld",
"mcu": "esp8266",
"variant": "esp8285"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "ESP-Mx DevKit (ESP8285)",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "https://arduino-esp8266.readthedocs.io/en/latest/boards.html#doit-esp-mx-devkit-esp8285",
"vendor": "Doit"
}
30 changes: 30 additions & 0 deletions boards/sonoff_basic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build": {
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_BASIC",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"ldscript": "eagle.flash.1m256.ld",
"mcu": "esp8266",
"variant": "itead"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Sonoff Basic",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "https://www.itead.cc/sonoff-wifi-wireless-switch.html",
"vendor": "ITEAD"
}
30 changes: 30 additions & 0 deletions boards/sonoff_s20.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build": {
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_S20",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"ldscript": "eagle.flash.1m256.ld",
"mcu": "esp8266",
"variant": "itead"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Sonoff S20",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "https://www.itead.cc/smart-socket.html",
"vendor": "ITEAD"
}
30 changes: 30 additions & 0 deletions boards/sonoff_sv.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build": {
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_SV",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"ldscript": "eagle.flash.1m256.ld",
"mcu": "esp8266",
"variant": "itead"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Sonoff SV",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "https://www.itead.cc/sonoff-sv.html",
"vendor": "ITEAD"
}
30 changes: 30 additions & 0 deletions boards/sonoff_th.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"build": {
"core": "esp8266",
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SONOFF_TH",
"f_cpu": "80000000L",
"f_flash": "40000000L",
"flash_mode": "dout",
"ldscript": "eagle.flash.1m256.ld",
"mcu": "esp8266",
"variant": "itead"
},
"connectivity": [
"wifi"
],
"frameworks": [
"arduino",
"esp8266-rtos-sdk",
"esp8266-nonos-sdk"
],
"name": "Sonoff TH",
"upload": {
"maximum_ram_size": 81920,
"maximum_size": 1048576,
"require_upload_port": true,
"resetmethod": "ck",
"speed": 115200
},
"url": "https://www.itead.cc/sonoff-th.html",
"vendor": "ITEAD"
}
8 changes: 4 additions & 4 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-espressif8266.git"
},
"version": "2.2.3",
"version": "2.3.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json",
Expand Down Expand Up @@ -41,12 +41,12 @@
"packages": {
"toolchain-xtensa": {
"type": "toolchain",
"version": "<3"
"version": "~2.40802.191122"
},
"framework-arduinoespressif8266": {
"type": "framework",
"optional": true,
"version": "~2.20502.0"
"version": "~2.20601.0"
},
"framework-esp8266-rtos-sdk": {
"type": "framework",
Expand All @@ -69,7 +69,7 @@
},
"tool-esptoolpy": {
"type": "uploader",
"version": "~1.20600.0"
"version": "~1.20800.0"
},
"tool-mkspiffs": {
"type": "uploader",
Expand Down
2 changes: 1 addition & 1 deletion platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class Espressif8266Platform(PlatformBase):

def configure_default_packages(self, variables, targets):
framework = variables.get("pioframework")
framework = variables.get("pioframework", [])
if "arduino" not in framework:
self.packages['toolchain-xtensa']['version'] = "~1.40802.0"
if "buildfs" in targets:
Expand Down

0 comments on commit 9a959c8

Please sign in to comment.