Skip to content

Commit 57f24f3

Browse files
committed
Merge branch 'release/v1.2.1'
2 parents f1388de + 1f72a59 commit 57f24f3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

builder/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ def __fetch_spiffs_size(target, source, env):
225225
ElfToBin=Builder(
226226
action=env.VerboseAction(" ".join([
227227
'"$OBJCOPY"',
228-
"-eo", join(
229-
"$FRAMEWORK_ARDUINOESP8266_DIR", "bootloaders",
230-
"eboot", "eboot.elf"),
228+
"-eo",
229+
'"%s"' % join("$FRAMEWORK_ARDUINOESP8266_DIR",
230+
"bootloaders", "eboot", "eboot.elf"),
231231
"-bo", "$TARGET",
232232
"-bm", "$BOARD_FLASH_MODE",
233233
"-bf", "${__get_board_f_flash(__env__)}",

platform.json

Lines changed: 2 additions & 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.2.0",
16+
"version": "1.2.1",
1717
"packageRepositories": [
1818
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1919
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -51,6 +51,7 @@
5151
},
5252
"tool-espotapy": {
5353
"type": "uploader",
54+
"optional": true,
5455
"version": "~1.0.0"
5556
},
5657
"tool-mkspiffs": {

0 commit comments

Comments
 (0)