From 06fbb2d24bcf8fae1ec620b3b5bdd32334482123 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 21 Nov 2016 12:51:05 +0200 Subject: [PATCH 1/3] Cleanup code --- builder/main.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/builder/main.py b/builder/main.py index 5f92ffb..2e4690e 100644 --- a/builder/main.py +++ b/builder/main.py @@ -158,15 +158,6 @@ env.Append( # Target: Build executable and linkable firmware or SPIFFS image # - -def __tmp_hook_before_pio_3_2(): - env.ProcessFlags(env.get("BUILD_FLAGS")) - # append specified LD_SCRIPT - if ("LDSCRIPT_PATH" in env and - not any(["-Wl,-T" in f for f in env['LINKFLAGS']])): - env.Append(LINKFLAGS=['-Wl,-T"$LDSCRIPT_PATH"']) - - target_elf = env.BuildProgram() if "PIOFRAMEWORK" in env: target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf) From aec1d31aa020307cfb9f75fa79117b89d1f90bda Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 23 Nov 2016 18:17:04 +0200 Subject: [PATCH 2/3] Escape path and fix issue with user account that contains spaces --- builder/frameworks/espidf.py | 2 +- builder/main.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 6596cfd..7f0934c 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -140,7 +140,7 @@ partition_table = env.Command( join(env.subst("$BUILD_DIR"), "partitions_table.bin"), join("$ESPIDF_DIR", "components", "partition_table", "partitions_singleapp.csv"), - '"$PYTHONEXE" %s -q $SOURCE $TARGET' % join( + '"$PYTHONEXE" "%s" -q $SOURCE $TARGET' % join( "$ESPIDF_DIR", "components", "partition_table", "gen_esp32part.py") ) diff --git a/builder/main.py b/builder/main.py index 2e4690e..3c95e4c 100644 --- a/builder/main.py +++ b/builder/main.py @@ -113,10 +113,10 @@ env.Replace( if env.subst("$PIOFRAMEWORK") == "arduino": env.Append( UPLOADERFLAGS=[ - "0x1000", join("$FRAMEWORK_ARDUINOESP32_DIR", "tools", - "sdk", "bin", "bootloader.bin"), - "0x4000", join("$FRAMEWORK_ARDUINOESP32_DIR", "tools", - "sdk", "bin", "partitions_singleapp.bin"), + "0x1000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools", + "sdk", "bin", "bootloader.bin"), + "0x4000", '"%s"' % join("$FRAMEWORK_ARDUINOESP32_DIR", "tools", + "sdk", "bin", "partitions_singleapp.bin"), "0x10000" ] ) From b8cc8c08d198b0e576663212ff73028717f7a96b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 23 Nov 2016 18:19:15 +0200 Subject: [PATCH 3/3] Bump version to 1.1.2 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 90138d6..42032d6 100644 --- a/platform.json +++ b/platform.json @@ -13,7 +13,7 @@ "type": "git", "url": "https://github.com/platformio/platform-espressif32.git" }, - "version": "0.1.1", + "version": "0.1.2", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",