From 063611314777d4dd9dc8c25905f19f8b25f510aa Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 15 Nov 2019 21:30:59 +0100
Subject: [PATCH] Revert "Version bump 7.0.0.5"

This reverts commit edcc17c41bf107f73914664a26981310c8c53872.
---
 tasmota/_changelog.ino        |  3 ---
 tasmota/settings.ino          | 10 ----------
 tasmota/support_wifi.ino      |  1 -
 tasmota/tasmota.ino           |  3 ++-
 tasmota/tasmota_version.h     |  2 +-
 tasmota/xdrv_29_deepsleep.ino |  3 ++-
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/tasmota/_changelog.ino b/tasmota/_changelog.ino
index bd00958ef..f7c53a1f9 100644
--- a/tasmota/_changelog.ino
+++ b/tasmota/_changelog.ino
@@ -1,7 +1,4 @@
 /*********************************************************************************************\
- * 7.0.0.5 20191115
- * Add one time flash sdk reset on initial execution solving possible SDK wifi releated issues
- *
  * 7.0.0.4 20191108
  * Add command WifiPower 0 .. 20.5 to set Wifi Output Power which will be default set to 17dBm
  * Change supported PCF8574 I2C address range to 0x20 - 0x26 allowing other I2C devices with address 0x27 to be used at the same time
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 2e4796b29..ae442069b 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -231,12 +231,6 @@ void RtcRebootSave(void)
   }
 }
 
-void RtcRebootReset(void)
-{
-  RtcReboot.fast_reboot_count = 0;
-  RtcRebootSave();
-}
-
 void RtcRebootLoad(void)
 {
   ESP.rtcUserMemoryRead(100 - sizeof(RTCRBT), (uint32_t*)&RtcReboot, sizeof(RTCRBT));  // 0x280
@@ -1154,10 +1148,6 @@ void SettingsDelta(void)
     if (Settings.version < 0x07000004) {
       Settings.wifi_output_power = 170;
     }
-    if (Settings.version < 0x07000005) {
-      restart_flag = 213;  // Perform a sdk wifi parameter reset and restart
-    }
-
     Settings.version = VERSION;
     SettingsSave(1);
   }
diff --git a/tasmota/support_wifi.ino b/tasmota/support_wifi.ino
index 4451047bd..f90d7cff1 100644
--- a/tasmota/support_wifi.ino
+++ b/tasmota/support_wifi.ino
@@ -615,7 +615,6 @@ void WifiShutdown(void)
 void EspRestart(void)
 {
   WifiShutdown();
-  RtcRebootReset();
 //  ESP.restart();            // This results in exception 3 on restarts on core 2.3.0
   ESP.reset();
 }
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 4d50d9cf7..2f7979ccb 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -816,7 +816,8 @@ void PerformEverySecond(void)
   }
 
   if (BOOT_LOOP_TIME == uptime) {
-    RtcRebootReset();
+    RtcReboot.fast_reboot_count = 0;
+    RtcRebootSave();
 
 #ifdef USE_DEEPSLEEP
     if (!(DeepSleepEnabled() && !Settings.flag3.bootcount_update)) {
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 50a0ac045..9cd601086 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,6 +20,6 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x07000005;
+const uint32_t VERSION = 0x07000004;
 
 #endif  // _TASMOTA_VERSION_H_
diff --git a/tasmota/xdrv_29_deepsleep.ino b/tasmota/xdrv_29_deepsleep.ino
index 11987518c..6afc247ff 100644
--- a/tasmota/xdrv_29_deepsleep.ino
+++ b/tasmota/xdrv_29_deepsleep.ino
@@ -62,7 +62,8 @@ bool DeepSleepEnabled(void)
 void DeepSleepInit(void)
 {
   if (DeepSleepEnabled()) {
-    RtcRebootReset();
+    RtcReboot.fast_reboot_count = 0;
+    RtcRebootSave();
     if ((RtcSettings.ultradeepsleep > MAX_DEEPSLEEP_CYCLE) && (RtcSettings.ultradeepsleep < 1700000000)) {
       // Go back to sleep after 60 minutes if requested deepsleep has not been reached
       RtcSettings.ultradeepsleep = RtcSettings.ultradeepsleep - MAX_DEEPSLEEP_CYCLE;