Merge branch 'release/v1.7.0'

platformio · Apr 23, 2018 · b0bfa9b · b0bfa9b
2 parents 41a0bee + 428659a
commit b0bfa9b
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.pyc
+.pioenvs
diff --git a/README.md b/README.md
@@ -9,16 +9,27 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
 
 # Usage
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
-2. Install Espressif 8266 development platform:
-```bash
-# install the latest stable version
-> platformio platform install espressif8266
-
-# install development version
-> platformio platform install https://github.com/platformio/platform-espressif8266.git
+1. [Install PlatformIO](http://platformio.org)
+2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
+
+## Stable version
+
+```ini
+[env:stable]
+platform = espressif8266
+board = ...
+...
+```
+
+## Development version
+
+```ini
+[env:development]
+platform = https://github.com/platformio/platform-espressif8266.git
+board = ...
+...
 ```
 
-# Using "Staging" Arduino Core
+# Configuration
 
-http://docs.platformio.org/page/platforms/espressif8266.html#using-arduino-framework-with-staging-version
+Please navigate to [documentation](http://docs.platformio.org/page/platforms/espressif8266.html).
diff --git a/boards/d1_mini.json b/boards/d1_mini.json
@@ -23,7 +23,7 @@
     "maximum_size": 4194304,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
-    "speed": 115200
+    "speed": 921600
   },
   "url": "https://wiki.wemos.cc/products:d1:d1_mini",
   "vendor": "WEMOS"

diff --git a/boards/d1_mini_lite.json b/boards/d1_mini_lite.json
@@ -21,7 +21,7 @@
     "maximum_size": 1048576,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
-    "speed": 115200
+    "speed": 921600
   },
   "url": "https://wiki.wemos.cc/products:d1:d1_mini_lite",
   "vendor": "WEMOS"

diff --git a/boards/d1_mini_pro.json b/boards/d1_mini_pro.json
@@ -23,7 +23,7 @@
     "maximum_size": 16777216,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
-    "speed": 115200
+    "speed": 921600
   },
   "url": "https://wiki.wemos.cc/products:d1:d1_mini",
   "vendor": "WEMOS"

diff --git a/boards/esp210.json b/boards/esp210.json
@@ -23,7 +23,7 @@
     "maximum_size": 4194304,
     "require_upload_port": true,
     "resetmethod": "ck",
-    "speed": 115200
+    "speed": 57600
   },
   "url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
   "vendor": "SweetPea"

diff --git a/boards/oak.json b/boards/oak.json
@@ -21,7 +21,7 @@
     "maximum_size": 4194304,
     "require_upload_port": true,
     "resetmethod": "ck",
-    "speed": 115200
+    "speed": 921600
   },
   "url": "http://digistump.com/category/22",
   "vendor": "DigiStump"

diff --git a/builder/frameworks/esp8266-nonos-sdk.py b/builder/frameworks/esp8266-nonos-sdk.py
@@ -66,9 +66,7 @@
 
 libs = []
 
-envsafe = env.Clone()
-
-libs.append(envsafe.BuildLibrary(
+libs.append(env.BuildLibrary(
     join(FRAMEWORK_DIR, "lib", "driver"),
     join(FRAMEWORK_DIR, "driver_lib")
 ))

diff --git a/builder/frameworks/esp8266-rtos-sdk.py b/builder/frameworks/esp8266-rtos-sdk.py
@@ -68,9 +68,7 @@
 
 libs = []
 
-envsafe = env.Clone()
-
-libs.append(envsafe.BuildLibrary(
+libs.append(env.BuildLibrary(
     join(FRAMEWORK_DIR, "lib", "driver"),
     join(FRAMEWORK_DIR, "driver_lib")
 ))

diff --git a/builder/main.py b/builder/main.py
@@ -189,9 +189,12 @@ def fetch_spiffs_size(env):
         _value = 0
         if int(env[k], 16) < 0x40300000:
             _value = int(env[k], 16) & 0xFFFFF
+        elif int(env[k], 16) < 0x411FB000:
+            _value = int(env[k], 16) & 0xFFFFFF
+            _value -= 0x200000  # correction
         else:
             _value = int(env[k], 16) & 0xFFFFFF
-            _value -= 0x200000  # esptool offset
+            _value += 0xE00000  # correction
 
         env[k] = hex(_value)
 
@@ -370,7 +373,8 @@ def __fetch_spiffs_size(target, source, env):
         AlwaysBuild(env.Alias("buildfs", target_firm))
     else:
         if env.subst("$PIOFRAMEWORK") in ("arduino", "simba"):
-            target_firm = env.ElfToBin(target_elf)
+            target_firm = env.ElfToBin(
+                join("$BUILD_DIR", "${PROGNAME}"), target_elf)
         else:
             target_firm = env.ElfToBin([
                 join("$BUILD_DIR", "eagle.flash.bin"),

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "1.6.0",
+  "version": "1.7.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",
@@ -46,7 +46,7 @@
     "framework-arduinoespressif8266": {
       "type": "framework",
       "optional": true,
-      "version": "~1.20400.0"
+      "version": "~1.20401.1"
     },
     "framework-esp8266-rtos-sdk": {
       "type": "framework",
@@ -65,7 +65,7 @@
     },
     "tool-esptool": {
       "type": "uploader",
-      "version": "~1.409.0"
+      "version": "<2"
     },
     "tool-espotapy": {
       "type": "uploader",