Skip to content

Commit c1b0a9f

Browse files
committed
Use full path to esptool-ck for SDK and Simba frameworks
1 parent 0946996 commit c1b0a9f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

builder/frameworks/esp8266-nonos-sdk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
BUILDERS=dict(
104104
ElfToBin=Builder(
105105
action=env.VerboseAction(" ".join([
106-
'esptool',
106+
platform.get_package_dir("tool-esptool"),
107107
"-eo", "$SOURCE",
108108
"-bo", "${TARGET}",
109109
"-bm", "$BOARD_FLASH_MODE",

builder/frameworks/esp8266-rtos-sdk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
BUILDERS=dict(
105105
ElfToBin=Builder(
106106
action=env.VerboseAction(" ".join([
107-
'esptool',
107+
platform.get_package_dir("tool-esptool"),
108108
"-eo", "$SOURCE",
109109
"-bo", "${TARGET}",
110110
"-bm", "$BOARD_FLASH_MODE",

builder/frameworks/simba.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ def VariantDirWrap(env, variant_dir, src_dir, duplicate=False):
4646

4747

4848
env = DefaultEnvironment()
49+
platform = env.PioPlatform()
4950

5051
env.AddMethod(LookupSources)
5152
env.AddMethod(VariantDirWrap)
5253

5354
env.Replace(
54-
PLATFORMFW_DIR=env.PioPlatform().get_package_dir("framework-simba"),
55-
OBJCOPY="esptool"
55+
PLATFORMFW_DIR=platform.get_package_dir("framework-simba"),
56+
OBJCOPY=platform.get_package_dir("tool-esptool")
5657
)
5758

5859
env.Append(
@@ -63,7 +64,7 @@ def VariantDirWrap(env, variant_dir, src_dir, duplicate=False):
6364
BUILDERS=dict(
6465
ElfToBin=Builder(
6566
action=env.VerboseAction(" ".join([
66-
'esptool',
67+
platform.get_package_dir("tool-esptool"),
6768
"-eo", '"%s"' % join(
6869
"$PLATFORMFW_DIR", "3pp", "esp8266Arduino", "2.3.0",
6970
"bootloaders", "eboot", "eboot.elf"

0 commit comments

Comments
 (0)