|
33 | 33 | SUBPROCESS_TIMEOUT = 300
|
34 | 34 | DEFAULT_DEBUG_SPEED = "5000"
|
35 | 35 | DEFAULT_APP_OFFSET = "0x10000"
|
| 36 | +tl_install_name = "tool-esp_install" |
36 | 37 | ARDUINO_ESP32_PACKAGE_URL = "https://raw.githubusercontent.com/espressif/arduino-esp32/master/package/package_esp32_index.template.json"
|
37 | 38 |
|
38 | 39 | # MCUs that support ESP-builtin debug
|
@@ -161,10 +162,9 @@ def packages_dir(self) -> str:
|
161 | 162 |
|
162 | 163 | def _check_tl_install_version(self) -> bool:
|
163 | 164 | """
|
164 |
| - Prüft ob tl-install in der korrekten Version installiert ist. |
| 165 | + Prüft ob tool-esp_install in der korrekten Version installiert ist. |
165 | 166 | Installiert die korrekte Version falls erforderlich.
|
166 | 167 | """
|
167 |
| - tl_install_name = "tool-esp_install" |
168 | 168 |
|
169 | 169 | # Hole die erforderliche Version aus platform.json
|
170 | 170 | required_version = self.packages.get(tl_install_name, {}).get("version")
|
@@ -207,9 +207,8 @@ def _check_tl_install_version(self) -> bool:
|
207 | 207 |
|
208 | 208 | def _install_tl_install(self, version: str) -> bool:
|
209 | 209 | """
|
210 |
| - Installiert tl-install in der angegebenen Version. |
| 210 | + Installiert tool-esp_install in der angegebenen Version. |
211 | 211 | """
|
212 |
| - tl_install_name = "tool-esp_install" |
213 | 212 | tl_install_path = os.path.join(self.packages_dir, tl_install_name)
|
214 | 213 |
|
215 | 214 | try:
|
@@ -260,7 +259,7 @@ def _get_tool_paths(self, tool_name: str) -> Dict[str, str]:
|
260 | 259 | 'tools_json_path': os.path.join(tool_path, "tools.json"),
|
261 | 260 | 'piopm_path': os.path.join(tool_path, ".piopm"),
|
262 | 261 | 'idf_tools_path': os.path.join(
|
263 |
| - self.packages_dir, "tool-esp_install", "tools", "idf_tools.py" |
| 262 | + self.packages_dir, tl_install_name, "tools", "idf_tools.py" |
264 | 263 | )
|
265 | 264 | }
|
266 | 265 | return self._tools_cache[tool_name]
|
@@ -504,14 +503,14 @@ def _configure_installer(self) -> None:
|
504 | 503 | """Configure the ESP-IDF tools installer."""
|
505 | 504 |
|
506 | 505 | if not self._check_tl_install_version():
|
507 |
| - logger.error("Error during tl-install version check / installation") |
| 506 | + logger.error("Error during tool-esp_install version check / installation") |
508 | 507 | return
|
509 | 508 |
|
510 | 509 | installer_path = os.path.join(
|
511 |
| - self.packages_dir, "tl-install", "tools", "idf_tools.py" |
| 510 | + self.packages_dir, tl_install_name, "tools", "idf_tools.py" |
512 | 511 | )
|
513 | 512 | if os.path.exists(installer_path):
|
514 |
| - self.packages["tl-install"]["optional"] = True |
| 513 | + self.packages[tl_install_name]["optional"] = True |
515 | 514 |
|
516 | 515 | def _install_esptool_package(self) -> None:
|
517 | 516 | """Install esptool package required for all builds."""
|
|
0 commit comments