@@ -176,10 +176,11 @@ def add_tinyuf2_extra_image():
176
176
libs = []
177
177
178
178
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 )
180
181
181
182
if "build.variants_dir" in board_config :
182
- if "Tasmota" not in build_name :
183
+ if len ( build_variants_dir ) > 1 :
183
184
variants_dir = join ("$PROJECT_DIR" , board_config .get ("build.variants_dir" ))
184
185
185
186
if "build.variant" in board_config :
@@ -204,10 +205,13 @@ def add_tinyuf2_extra_image():
204
205
#
205
206
206
207
# 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 )
209
211
else :
210
212
EXTRA_IMG_DIR = FRAMEWORK_DIR
213
+ if "tasmota" in build_name .lower ():
214
+ EXTRA_IMG_DIR = join (EXTRA_IMG_DIR , "variants" , "tasmota" )
211
215
212
216
env .Append (
213
217
LIBSOURCE_DIRS = [join (FRAMEWORK_DIR , "libraries" )],
0 commit comments