From 86c9e3e6b22e40ef349a50e256af0c42c1a648f8 Mon Sep 17 00:00:00 2001 From: Testato Date: Sat, 7 Oct 2017 06:36:54 +0200 Subject: [PATCH 1/2] Chip revision fix https://www.esp32.com/viewtopic.php?f=2&t=1358&sid=f77cd62ec254317f3bbb30d8ab75ca2a&start=10 --- cores/esp32/Esp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp index b11c7f53c31..cb59f475f61 100644 --- a/cores/esp32/Esp.cpp +++ b/cores/esp32/Esp.cpp @@ -119,7 +119,7 @@ uint32_t EspClass::getFreeHeap(void) uint8_t EspClass::getChipRevision(void) { - return (REG_READ(EFUSE_BLK0_RDATA3_REG) >> EFUSE_RD_CHIP_VER_RESERVE_S) && EFUSE_RD_CHIP_VER_RESERVE_V; + return (REG_READ(EFUSE_BLK0_RDATA3_REG) >> EFUSE_RD_CHIP_VER_RESERVE_S) & EFUSE_RD_CHIP_VER_RESERVE_V; } const char * EspClass::getSdkVersion(void) From b6a3fa5ebc5f7f68743bf724834e3017b5fc8da6 Mon Sep 17 00:00:00 2001 From: Testato Date: Sat, 7 Oct 2017 09:56:35 +0200 Subject: [PATCH 2/2] using of esp_chip_info instead of register reading --- cores/esp32/Esp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp index cb59f475f61..c60abfbbfe9 100644 --- a/cores/esp32/Esp.cpp +++ b/cores/esp32/Esp.cpp @@ -119,7 +119,9 @@ uint32_t EspClass::getFreeHeap(void) uint8_t EspClass::getChipRevision(void) { - return (REG_READ(EFUSE_BLK0_RDATA3_REG) >> EFUSE_RD_CHIP_VER_RESERVE_S) & EFUSE_RD_CHIP_VER_RESERVE_V; + esp_chip_info_t chip_info; + esp_chip_info(&chip_info); + return chip_info.revision; } const char * EspClass::getSdkVersion(void)