Merge branch 'release/v1.1.2'
This commit is contained in:
@@ -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")
|
||||
)
|
||||
|
||||
|
||||
+4
-13
@@ -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"
|
||||
]
|
||||
)
|
||||
@@ -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)
|
||||
|
||||
+1
-1
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user