Skip to content

Commit 1c0c4a9

Browse files
committed
Merge branch 'release/v1.7.1'
2 parents b0bfa9b + 1ca38f8 commit 1c0c4a9

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

boards/esp_wroom_02.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"f_cpu": "80000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "qio",
8-
"ldscript": "eagle.flash.4m1m.ld",
8+
"ldscript": "eagle.flash.2m.ld",
99
"mcu": "esp8266",
1010
"variant": "nodemcu"
1111
},
@@ -21,7 +21,7 @@
2121
"name": "ESP-WROOM-02",
2222
"upload": {
2323
"maximum_ram_size": 81920,
24-
"maximum_size": 4194304,
24+
"maximum_size": 2097152,
2525
"require_upload_port": true,
2626
"resetmethod": "nodemcu",
2727
"speed": 115200

builder/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ def _get_board_f_flash(env):
141141
#
142142

143143
MKSPIFFSTOOL="mkspiffs",
144+
145+
SIZEPROGREGEXP=r"^(?:\.irom0\.text|\.text|\.data|\.rodata|)\s+([0-9]+).*",
146+
SIZEDATAREGEXP=r"^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*",
147+
SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
144148
SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
145149

146150
PROGSUFFIX=".elf"

platform.json

Lines changed: 1 addition & 1 deletion
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": "1.7.0",
15+
"version": "1.7.1",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",

0 commit comments

Comments
 (0)