Skip to content

Commit a4b5e48

Browse files
committed
Merge branch 'hotfix/v1.1.2' into develop
2 parents 1837554 + d9ce365 commit a4b5e48

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

builder/main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,14 @@ def _fetch_spiffs_size(target, source, env):
323323
target_firm = join("$BUILD_DIR", "firmware.bin")
324324
else:
325325
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
326+
# @TODO, replace with env.ProcessAllFlags() after PIO 3.2 release
327+
env.ProcessFlags(env.get("BUILD_FLAGS"))
326328
# append specified LD_SCRIPT
327329
if ("LDSCRIPT_PATH" in env and
328330
not any(["-Wl,-T" in f for f in env['LINKFLAGS']])):
329331
env.Append(LINKFLAGS=['-Wl,-T"$LDSCRIPT_PATH"'])
332+
###
333+
330334
target_firm = env.DataToBin(
331335
join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")
332336
AlwaysBuild(target_firm)

platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"type": "git",
1414
"url": "https://github.com/platformio/platform-espressif8266.git"
1515
},
16-
"version": "1.1.1",
16+
"version": "1.1.2",
1717
"packageRepositories": [
1818
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1919
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",

0 commit comments

Comments
 (0)