Merge branch 'release/v2.5.0'

Author: valeros

boards/eduinowifi.json

@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "eagle.flash.4m1m.ld"
+    },
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_SCHIRMILABS_EDUINO_WIFI",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp8266",
+    "variant": "eduinowifi"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "Schirmilabs Eduino WiFi",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "resetmethod": "nodemcu",
+    "speed": 115200
+  },
+  "url": "https://github.com/schirmilabs/Eduino-WiFi",
+  "vendor": "Schirmilabs"
+}

builder/main.py

@@ -122,6 +122,19 @@ def _update_max_upload_size(env):
         env.BoardConfig().update("upload.maximum_size", ldsizes['app_size'])
 
 
+def get_esptoolpy_reset_flags(resetmethod):
+    # no dtr, no_sync
+    resets = ("no_reset_no_sync", "soft_reset")
+    if resetmethod == "nodemcu":
+        # dtr
+        resets = ("default_reset", "hard_reset")
+    elif resetmethod == "ck":
+        # no dtr
+        resets = ("no_reset", "soft_reset")
+
+    return ["--before", resets[0], "--after", resets[1]]
+
+
 ########################################################
 
 env = DefaultEnvironment()
@@ -305,6 +318,10 @@ def _update_max_upload_size(env):
             UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE',
         )
 
+    env.Prepend(
+        UPLOADERFLAGS=get_esptoolpy_reset_flags(env.subst("$UPLOAD_RESETMETHOD"))
+    )
+
     upload_actions = [
         env.VerboseAction(env.AutodetectUploadPort,
                           "Looking for upload port..."),

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "2.4.0",
+  "version": "2.5.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": "~3.20603.0"
+      "version": "~3.20700.0"
     },
     "framework-esp8266-rtos-sdk": {
       "type": "framework",