Fix failing downgrade (#7285)

arendst · Dec 22, 2019 · 4c7283c · 4c7283c
1 parent 257f3d2
commit 4c7283c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -65,6 +65,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 - Fix Arduino IDE compile error (#7277)
 - Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
 - Fix no AP on initial install (#7282)
+- Fix failing downgrade (#7285)
 - Add command ``SerialConfig 0..23`` or ``SerialConfig 8N1`` to select Serial Config based in PR by Luis Teixeira (#7108)
 - Add command ``Sensor34 9 <weight code>`` to set minimum delta to trigger JSON message by @tobox (#7188)
 - Add rule var ``%topic%`` by Adrian Scillato (#5522)

diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Fix Arduino IDE compile error (#7277)
 - Fix restore ShutterAccuracy, MqttLog, WifiConfig, WifiPower and SerialConfig (#7281)
 - Fix no AP on initial install (#7282)
+- Fix failing downgrade (#7285)
 
 ### 7.1.2.6 20191214
 

diff --git a/tasmota/settings.ino b/tasmota/settings.ino
@@ -491,7 +491,7 @@ void UpdateQuickPowerCycle(bool update)
 char aws_mqtt_host[66];
 char aws_mqtt_user[1] { 0 };
 
-const uint32_t settings_text_size = 457;  // Settings.flag4 (1E0) - Settings.ota_url (017)
+const uint32_t settings_text_size = 699;  // Settings.display_model (2D2) - Settings.ota_url (017)
 
 uint32_t GetSettingsTextLen(void)
 {
@@ -1367,7 +1367,7 @@ void SettingsDelta(void)
       Settings.ex_energy_power_delta = 0;
     }
     if (Settings.version < 0x06060015) {
-      if ((EX_WIFI_SMARTCONFIG == Settings.sta_config) || (EX_WIFI_WPSCONFIG == Settings.sta_config)) {
+      if ((EX_WIFI_SMARTCONFIG == Settings.ex_sta_config) || (EX_WIFI_WPSCONFIG == Settings.ex_sta_config)) {
         Settings.ex_sta_config = WIFI_MANAGER;
       }
     }

diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
@@ -23,6 +23,6 @@
 const uint32_t VERSION = 0x07020000;
 
 // Lowest compatible version
-const uint32_t VERSION_COMPATIBLE = 0x06000000;
+const uint32_t VERSION_COMPATIBLE = 0x00000000;
 
 #endif  // _TASMOTA_VERSION_H_