mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 02:36:35 +00:00
Fix S2/C3/C6 compilations with regards to GetDeviceHardware
This commit is contained in:
parent
65f9856209
commit
bbd490f27e
@ -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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user