Skip to content

Commit 0a6cf98

Browse files
authored
check if compile skeleton install is needed
1 parent 8c5e8ee commit 0a6cf98

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

builder/frameworks/espidf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676

7777
config = env.GetProjectConfig()
7878
board = env.BoardConfig()
79+
pio_orig_frwrk = env.GetProjectOption("framework")
7980
mcu = board.get("build.mcu", "esp32")
8081
chip_variant = board.get("build.chip_variant", "").lower()
8182
chip_variant = chip_variant if chip_variant else mcu
@@ -181,7 +182,7 @@ def create_silent_action(action_func):
181182
ARDUINO_FRMWRK_LIB_DIR_PATH = arduino_lib_dir.resolve()
182183
ARDUINO_FRMWRK_LIB_DIR = str(ARDUINO_FRMWRK_LIB_DIR_PATH)
183184

184-
if mcu == "esp32c2":
185+
if mcu == "esp32c2" and not ("espidf" in pio_orig_frwrk):
185186
ARDUINO_FRMWRK_C2_LIB_DIR = str(ARDUINO_FRMWRK_LIB_DIR_PATH / chip_variant)
186187
if not os.path.exists(ARDUINO_FRMWRK_C2_LIB_DIR):
187188
_arduino_c2_dir = platform.get_package_dir("framework-arduino-c2-skeleton-lib")
@@ -192,7 +193,7 @@ def create_silent_action(action_func):
192193
ARDUINO_C2_DIR = str(arduino_c2_dir / chip_variant)
193194
shutil.copytree(ARDUINO_C2_DIR, ARDUINO_FRMWRK_C2_LIB_DIR, dirs_exist_ok=True)
194195

195-
if mcu == "esp32c61":
196+
if mcu == "esp32c61" and not ("espidf" in pio_orig_frwrk):
196197
ARDUINO_FRMWRK_C61_LIB_DIR = str(ARDUINO_FRMWRK_LIB_DIR_PATH / chip_variant)
197198
if not os.path.exists(ARDUINO_FRMWRK_C61_LIB_DIR):
198199
_arduino_c61_dir = platform.get_package_dir("framework-arduino-c61-skeleton-lib")
@@ -233,7 +234,6 @@ def contains_path_traversal(url):
233234
if "espidf.custom_sdkconfig" in board:
234235
flag_custom_sdkonfig = True
235236

236-
pio_orig_frwrk = env.GetProjectOption("framework")
237237
# Disable HybridCompile for espidf and arduino, espidf projects
238238
# HybridCompile is always "framework = arduino" !
239239
if "espidf" in pio_orig_frwrk:

0 commit comments

Comments
 (0)