Skip to content

Commit b30b607

Browse files
authored
final more compatible version
1 parent e20034b commit b30b607

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tools/platformio-build.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,11 @@ def add_tinyuf2_extra_image():
176176
libs = []
177177

178178
variants_dir = join(FRAMEWORK_DIR, "variants")
179-
build_name = join(board_config.get("name"))
179+
build_variants_dir = join(board_config.get("build.variants_dir"))
180+
print("build.variants_dir: ", build_variants_dir)
180181

181182
if "build.variants_dir" in board_config:
182-
if "Tasmota" not in build_name:
183+
if len(build_variants_dir) > 1:
183184
variants_dir = join("$PROJECT_DIR", board_config.get("build.variants_dir"))
184185

185186
if "build.variant" in board_config:
@@ -204,10 +205,13 @@ def add_tinyuf2_extra_image():
204205
#
205206

206207
# Tasmota places extra images "safeboot" in custom variants folder in project directory
207-
if "Tasmota" in build_name:
208-
EXTRA_IMG_DIR = join(variants_dir, "tasmota")
208+
build_name = join(board_config.get("name"))
209+
if len(build_variants_dir) > 1:
210+
EXTRA_IMG_DIR = join(variants_dir)
209211
else:
210212
EXTRA_IMG_DIR = FRAMEWORK_DIR
213+
if "tasmota" in build_name.lower():
214+
EXTRA_IMG_DIR = join(EXTRA_IMG_DIR, "variants", "tasmota")
211215

212216
env.Append(
213217
LIBSOURCE_DIRS=[join(FRAMEWORK_DIR, "libraries")],

0 commit comments

Comments
 (0)