jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 03:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix S2/C3/C6 compilations with regards to GetDeviceHardware

Browse Source
This commit is contained in:
Theo Arends 2021-04-17 17:32:20 +02:00
parent 65f9856209
commit bbd490f27e
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tasmota/support_esp.ino
View File

@ -497,6 +497,16 @@ float CpuTemperature(void) {
return ConvertTemp(temperatureRead()); 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) { String GetDeviceHardware(void) {
/* /*
Source: esp-idf esp_system.h and esptool Source: esp-idf esp_system.h and esptool
@ -572,9 +582,9 @@ typedef struct {
pkg_version = (word3 >> 21) & 0x0F pkg_version = (word3 >> 21) & 0x0F
return pkg_version return pkg_version
*/ */
// uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_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 = chip_ver & 0x7;
uint32_t pkg_version = esp_efuse_get_pkg_ver(); // uint32_t pkg_version = esp_efuse_get_pkg_ver();
switch (pkg_version) { switch (pkg_version) {
case 0: return F("ESP32-S2"); case 0: return F("ESP32-S2");
@ -597,9 +607,9 @@ typedef struct {
pkg_version = (word3 >> 21) & 0x0F pkg_version = (word3 >> 21) & 0x0F
return pkg_version return pkg_version
*/ */
// uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_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 = chip_ver & 0x7;
uint32_t pkg_version = esp_efuse_get_pkg_ver(); // uint32_t pkg_version = esp_efuse_get_pkg_ver();
switch (pkg_version) { switch (pkg_version) {
case 0: return F("ESP32-C3"); case 0: return F("ESP32-C3");
@ -620,9 +630,9 @@ typedef struct {
pkg_version = (word3 >> 21) & 0x0F pkg_version = (word3 >> 21) & 0x0F
return pkg_version return pkg_version
*/ */
// uint32_t chip_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_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 = chip_ver & 0x7;
uint32_t pkg_version = esp_efuse_get_pkg_ver(); // uint32_t pkg_version = esp_efuse_get_pkg_ver();
switch (pkg_version) { switch (pkg_version) {
case 0: return F("ESP32-C6"); case 0: return F("ESP32-C6");