Skip to content

Commit cd6f5cc

Browse files
committed
Merge branch 'release/v2.2.3'
2 parents 8f77684 + 2a3850c commit cd6f5cc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
custom: https://platformio.org/donate

builder/main.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def _update_max_upload_size(env):
200200
# Target: Build executable and linkable firmware or SPIFFS image
201201
#
202202

203-
target_elf = None
203+
target_elf = env.BuildProgram()
204204
if "nobuild" in COMMAND_LINE_TARGETS:
205205
target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
206206
if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
@@ -209,7 +209,6 @@ def _update_max_upload_size(env):
209209
else:
210210
target_firm = join("$BUILD_DIR", "${PROGNAME}.bin")
211211
else:
212-
target_elf = env.BuildProgram()
213212
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
214213
target_firm = env.DataToBin(
215214
join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")

platform.json

+1-1
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": "2.2.2",
15+
"version": "2.2.3",
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)