espressif/esptool
1
0
Fork 0
mirror of https://github.com/espressif/esptool.git synced 2025-10-16 23:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp32_d0wdr2_v3): Print correct chip name

Browse Source
This commit is contained in:
Radim Karniš
2024-08-06 13:41:04 +02:00
parent c266fdda71
commit dfd61e2252
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esptool/targets/esp32.py
View File

@@ -227,11 +227,11 @@ class ESP32ROM(ESPLoader):
major_rev = self.get_major_chip_version() major_rev = self.get_major_chip_version()
minor_rev = self.get_minor_chip_version() minor_rev = self.get_minor_chip_version()
rev3 = major_rev == 3 rev3 = major_rev == 3
single_core = self.read_efuse(3) & (1 << 0) # CHIP_VER DIS_APP_CPU sc = self.read_efuse(3) & (1 << 0) # single core, CHIP_VER DIS_APP_CPU
chip_name = { chip_name = {
0: "ESP32-S0WDQ6" if single_core else "ESP32-D0WDQ6", 0: "ESP32-S0WDQ6" if sc else "ESP32-D0WDQ6-V3" if rev3 else "ESP32-D0WDQ6",
1: "ESP32-S0WD" if single_core else "ESP32-D0WD", 1: "ESP32-S0WD" if sc else "ESP32-D0WD-V3" if rev3 else "ESP32-D0WD",
2: "ESP32-D2WD", 2: "ESP32-D2WD",
4: "ESP32-U4WDH", 4: "ESP32-U4WDH",
5: "ESP32-PICO-V3" if rev3 else "ESP32-PICO-D4", 5: "ESP32-PICO-V3" if rev3 else "ESP32-PICO-D4",
@@ -239,10 +239,6 @@ class ESP32ROM(ESPLoader):
7: "ESP32-D0WDR2-V3", 7: "ESP32-D0WDR2-V3",
}.get(pkg_version, "unknown ESP32") }.get(pkg_version, "unknown ESP32")
# ESP32-D0WD-V3, ESP32-D0WDQ6-V3
if chip_name.startswith("ESP32-D0WD") and rev3:
chip_name += "-V3"
return f"{chip_name} (revision v{major_rev}.{minor_rev})" return f"{chip_name} (revision v{major_rev}.{minor_rev})"
def get_chip_features(self): def get_chip_features(self):