mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-21 09:46:31 +00:00
Merge pull request #14774 from curzon01/development
Expand config_version ESP32 id
This commit is contained in:
commit
b992abd912
@ -444,11 +444,16 @@ bool SettingsConfigRestore(void) {
|
||||
valid_settings = (0 == settings_buffer[0xF36]); // Settings->config_version
|
||||
#endif // ESP8266
|
||||
#ifdef ESP32
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32C3
|
||||
valid_settings = (2 == settings_buffer[0xF36]); // Settings->config_version
|
||||
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32S3
|
||||
valid_settings = (2 == settings_buffer[0xF36]); // Settings->config_version ESP32S3
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2
|
||||
valid_settings = (3 == settings_buffer[0xF36]); // Settings->config_version ESP32S2
|
||||
#elif CONFIG_IDF_TARGET_ESP32C3
|
||||
valid_settings = (4 == settings_buffer[0xF36]); // Settings->config_version ESP32C3
|
||||
#else
|
||||
valid_settings = (1 == settings_buffer[0xF36]); // Settings->config_version
|
||||
#endif // CONFIG_IDF_TARGET_ESP32C3
|
||||
valid_settings = (1 == settings_buffer[0xF36]); // Settings->config_version ESP32 all other
|
||||
#endif // CONFIG_IDF_TARGET_ESP32S3
|
||||
#endif // ESP32
|
||||
}
|
||||
|
||||
@ -828,11 +833,15 @@ void SettingsDefaultSet2(void) {
|
||||
// Settings->config_version = 0; // ESP8266 (Has been 0 for long time)
|
||||
#endif // ESP8266
|
||||
#ifdef ESP32
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32C3
|
||||
Settings->config_version = 2; // ESP32C3
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32S3
|
||||
Settings->config_version = 2; // ESP32S3
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2
|
||||
Settings->config_version = 3; // ESP32S2
|
||||
#elif CONFIG_IDF_TARGET_ESP32C3
|
||||
Settings->config_version = 4; // ESP32C3
|
||||
#else
|
||||
Settings->config_version = 1; // ESP32
|
||||
#endif // CONFIG_IDF_TARGET_ESP32C3
|
||||
#endif // CONFIG_IDF_TARGET_ESP32S3
|
||||
#endif // ESP32
|
||||
|
||||
flag.stop_flash_rotate |= APP_FLASH_CYCLE;
|
||||
@ -1354,11 +1363,15 @@ void SettingsDelta(void) {
|
||||
Settings->config_version = 0; // ESP8266 (Has been 0 for long time)
|
||||
#endif // ESP8266
|
||||
#ifdef ESP32
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32C3
|
||||
Settings->config_version = 2; // ESP32C3
|
||||
#ifdef CONFIG_IDF_TARGET_ESP32S3
|
||||
Settings->config_version = 2; // ESP32S3
|
||||
#elif CONFIG_IDF_TARGET_ESP32S2
|
||||
Settings->config_version = 3; // ESP32S2
|
||||
#elif CONFIG_IDF_TARGET_ESP32C3
|
||||
Settings->config_version = 4; // ESP32C3
|
||||
#else
|
||||
Settings->config_version = 1; // ESP32
|
||||
#endif // CONFIG_IDF_TARGET_ESP32C3
|
||||
#endif // CONFIG_IDF_TARGET_ESP32S3
|
||||
#endif // ESP32
|
||||
}
|
||||
if (Settings->version < 0x08020006) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user