From 85e7f07ef465c59ac0a7d610bd647b23e3e80a8e Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 12 Nov 2020 11:48:13 +0100
Subject: [PATCH] Move ESP32 APP_NORMAL_SLEEP

Move ESP32 APP_NORMAL_SLEEP to correct location
---
 tasmota/my_user_config.h  |  4 +---
 tasmota/tasmota_globals.h | 11 +++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index 3f0d450c0..2e4798142 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -262,9 +262,7 @@
 #define APP_BLINKTIME          10                // [BlinkTime] Time in 0.1 Sec to blink/toggle power for relay 1
 #define APP_BLINKCOUNT         10                // [BlinkCount] Number of blinks (0 = 32000)
 
-#ifndef APP_NORMAL_SLEEP                         // ESP32 with BT needs API sleep! Platformio "-DAPP_NORMAL_SLEEP=true"
-  #define APP_NORMAL_SLEEP     false             // [SetOption60] Enable normal sleep instead of dynamic sleep
-#endif
+#define APP_NORMAL_SLEEP       false             // [SetOption60] Enable normal sleep instead of dynamic sleep
 #define APP_SLEEP              0                 // [Sleep] Sleep time to lower energy consumption (0 = Off, 1 - 250 mSec),
 #define PWM_MAX_SLEEP          10                // Sleep will be lowered to this value when light is on, to avoid flickering, and when buzzer is on for better on/off period accuracy
 
diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index cfb5315b7..6b9495cb0 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -34,7 +34,7 @@ extern "C" {
 #endif
 
 #include <esp-knx-ip.h> // KNX Header files have to be global else compile fails -> lib/headers
-#ifdef USE_KNX 
+#ifdef USE_KNX
 void KNX_CB_Action(message_t const &msg, void *arg);
 #endif  // USE_KNX
 
@@ -318,7 +318,7 @@ const char kWebColors[] PROGMEM =
   COLOR_TIMER_TAB_TEXT "|" COLOR_TIMER_TAB_BACKGROUND "|" COLOR_TITLE_TEXT;
 
 /*********************************************************************************************\
- * ESP8266 vs ESP32 related parameters
+ * ESP8266 specific parameters
 \*********************************************************************************************/
 
 #ifdef ESP8266
@@ -344,6 +344,10 @@ const char kWebColors[] PROGMEM =
 
 #endif  // ESP8266
 
+/*********************************************************************************************\
+ * ESP32 specific parameters
+\*********************************************************************************************/
+
 #ifdef ESP32
 
 #ifndef MODULE
@@ -353,6 +357,9 @@ const char kWebColors[] PROGMEM =
 #define FALLBACK_MODULE             WEMOS          // [Module2] Select default module on fast reboot where USER_MODULE is user template
 #endif
 
+#undef APP_NORMAL_SLEEP                            // ESP32 with BT needs API sleep! Platformio "-DAPP_NORMAL_SLEEP=true"
+#define APP_NORMAL_SLEEP            false          // [SetOption60] Enable normal sleep instead of dynamic sleep
+
 #ifndef ARDUINO_ESP32_RELEASE
 #define ARDUINO_CORE_RELEASE        "STAGE"
 #else