From bbd490f27e5504f513b564d32f218b5830e4a8d7 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:32:20 +0200
Subject: [PATCH] Fix S2/C3/C6 compilations with regards to GetDeviceHardware

---
 tasmota/support_esp.ino | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tasmota/support_esp.ino b/tasmota/support_esp.ino
index 3145503db..8ddba729c 100644
--- a/tasmota/support_esp.ino
+++ b/tasmota/support_esp.ino
@@ -497,6 +497,16 @@ float CpuTemperature(void) {
   return ConvertTemp(temperatureRead());
 }
 
+/*
+#if CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/esp_efuse.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/esp_efuse.h"
+#elif CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/esp_efuse.h"
+#endif
+*/
+
 String GetDeviceHardware(void) {
 /*
 Source: esp-idf esp_system.h and esptool
@@ -572,9 +582,9 @@ typedef struct {
         pkg_version = (word3 >> 21) & 0x0F
         return pkg_version
 */
-//    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
-//    uint32_t pkg_version = chip_ver & 0x7;
-    uint32_t pkg_version = esp_efuse_get_pkg_ver();
+    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
+    uint32_t pkg_version = chip_ver & 0x7;
+//    uint32_t pkg_version = esp_efuse_get_pkg_ver();
 
     switch (pkg_version) {
       case 0:              return F("ESP32-S2");
@@ -597,9 +607,9 @@ typedef struct {
         pkg_version = (word3 >> 21) & 0x0F
         return pkg_version
 */
-//    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
-//    uint32_t pkg_version = chip_ver & 0x7;
-    uint32_t pkg_version = esp_efuse_get_pkg_ver();
+    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
+    uint32_t pkg_version = chip_ver & 0x7;
+//    uint32_t pkg_version = esp_efuse_get_pkg_ver();
 
     switch (pkg_version) {
       case 0:              return F("ESP32-C3");
@@ -620,9 +630,9 @@ typedef struct {
         pkg_version = (word3 >> 21) & 0x0F
         return pkg_version
 */
-//    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
-//    uint32_t pkg_version = chip_ver & 0x7;
-    uint32_t pkg_version = esp_efuse_get_pkg_ver();
+    uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
+    uint32_t pkg_version = chip_ver & 0x7;
+//    uint32_t pkg_version = esp_efuse_get_pkg_ver();
 
     switch (pkg_version) {
       case 0:              return F("ESP32-C6");