Merge branch 'release/v1.7.1'

platformio · Jun 4, 2018 · 1c0c4a9 · 1c0c4a9
2 parents b0bfa9b + 1ca38f8
commit 1c0c4a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/boards/esp_wroom_02.json b/boards/esp_wroom_02.json
@@ -5,7 +5,7 @@
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
-    "ldscript": "eagle.flash.4m1m.ld",
+    "ldscript": "eagle.flash.2m.ld",
     "mcu": "esp8266",
     "variant": "nodemcu"
   },
@@ -21,7 +21,7 @@
   "name": "ESP-WROOM-02",
   "upload": {
     "maximum_ram_size": 81920,
-    "maximum_size": 4194304,
+    "maximum_size": 2097152,
     "require_upload_port": true,
     "resetmethod": "nodemcu",
     "speed": 115200

diff --git a/builder/main.py b/builder/main.py
@@ -141,6 +141,10 @@ def _get_board_f_flash(env):
     #
 
     MKSPIFFSTOOL="mkspiffs",
+
+    SIZEPROGREGEXP=r"^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
     PROGSUFFIX=".elf"

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif8266.git"
   },
-  "version": "1.7.0",
+  "version": "1.7.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",