Skip to content

Commit 3b76b80

Browse files
authored
really fix logic
1 parent a94b5b3 commit 3b76b80

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

platform.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,21 @@ def install_tool(TOOL, retry_count=0):
120120
if "arduino" in frameworks:
121121
self.packages["framework-arduinoespressif32"]["optional"] = False
122122
self.packages["framework-arduinoespressif32-libs"]["optional"] = False
123-
# use newer branch idf-release/v5.4 when existing
124-
self.packages["framework-arduinoespressif32"]["version"] = "https://github.com/espressif/arduino-esp32/archive/refs/heads/idf-release/v5.4.zip"
123+
125124
URL = "https://raw.githubusercontent.com/espressif/arduino-esp32/idf-release/v5.4/package/package_esp32_index.template.json"
126125
req = requests.get(URL)
127126
if req.status_code == 200:
128127
packjdata = req.json()
128+
self.packages["framework-arduinoespressif32"]["version"] = "https://github.com/espressif/arduino-esp32/archive/refs/heads/idf-release/v5.4.zip"
129+
dyn_lib_url = packjdata['packages'][0]['tools'][0]['systems'][0]['url']
130+
self.packages["framework-arduinoespressif32-libs"]["version"] = dyn_lib_url
129131
else:
130132
# use branch master
131133
URL = "https://raw.githubusercontent.com/espressif/arduino-esp32/master/package/package_esp32_index.template.json"
134+
req = requests.get(URL)
132135
packjdata = requests.get(URL).json()
133-
dyn_lib_url = packjdata['packages'][0]['tools'][0]['systems'][0]['url']
134-
self.packages["framework-arduinoespressif32-libs"]["version"] = dyn_lib_url
136+
dyn_lib_url = packjdata['packages'][0]['tools'][0]['systems'][0]['url']
137+
self.packages["framework-arduinoespressif32-libs"]["version"] = dyn_lib_url
135138

136139
if variables.get("custom_sdkconfig") is not None or len(str(board_sdkconfig)) > 3:
137140
frameworks.append("espidf")

0 commit comments

Comments
 (0)