From 2d6cef7c45d21c3e8f71543b864bed2f49831ea1 Mon Sep 17 00:00:00 2001
From: Hamed <Hamed.t@live.com>
Date: Fri, 3 Feb 2023 18:17:20 +0330
Subject: [PATCH 1/4] add light sleep support in button actions

---
 code/espurna/button.cpp     |  8 ++++++++
 code/espurna/button.h       |  1 +
 code/espurna/config/types.h |  2 ++
 code/espurna/wifi.cpp       | 21 +++++++++++++++++++++
 code/espurna/wifi.h         |  1 +
 5 files changed, 33 insertions(+)

diff --git a/code/espurna/button.cpp b/code/espurna/button.cpp
index 525d9c5180..1e6040f0cf 100644
--- a/code/espurna/button.cpp
+++ b/code/espurna/button.cpp
@@ -21,6 +21,7 @@ Copyright (C) 2019-2021 by Maxim Prokhorov <prokhorov dot max at outlook dot com
 #include "relay.h"
 #include "system.h"
 #include "ws.h"
+#include "wifi.h"
 
 #include "mcp23s08_pin.h"
 
@@ -1180,6 +1181,13 @@ void buttonEvent(size_t id, ButtonEvent event) {
 #endif
         break;
 
+    case ButtonAction::Sleep:
+         if (lightState())
+         {
+            _buttonRelayAction(id, ButtonAction::Off);
+         } else {lightSleep();}
+         
+        break;
     case ButtonAction::None:
         break;
 
diff --git a/code/espurna/button.h b/code/espurna/button.h
index c28cc43eb4..1a2b5b3d13 100644
--- a/code/espurna/button.h
+++ b/code/espurna/button.h
@@ -45,6 +45,7 @@ enum class ButtonAction {
     BrightnessDecrease,
     DisplayOn,
     Custom,
+    Sleep,
     FanLow,
     FanMedium,
     FanHigh,
diff --git a/code/espurna/config/types.h b/code/espurna/config/types.h
index 581801314f..871a0702b3 100644
--- a/code/espurna/config/types.h
+++ b/code/espurna/config/types.h
@@ -30,6 +30,7 @@
 #define BUTTON_ACTION_DIM_UP          ButtonAction::BrightnessIncrease
 #define BUTTON_ACTION_DIM_DOWN        ButtonAction::BrightnessDecrease
 #define BUTTON_ACTION_DISPLAY_ON      ButtonAction::DisplayOn
+#define BUTTON_ACTION_SLEEP           ButtonAction::Sleep
 #define BUTTON_ACTION_CUSTOM          ButtonAction::Custom
 #define BUTTON_ACTION_FAN_LOW         ButtonAction::FanLow
 #define BUTTON_ACTION_FAN_MEDIUM      ButtonAction::FanMedium
@@ -49,6 +50,7 @@
 #define BUTTON_MODE_DIM_UP            BUTTON_ACTION_DIM_UP
 #define BUTTON_MODE_DIM_DOWN          BUTTON_ACTION_DIM_DOWN
 #define BUTTON_MODE_DISPLAY_ON        BUTTON_ACTION_DISPLAY_ON
+#define BUTTON_MODE_SLEEP             BUTTON_ACTION_SLEEP
 
 // compat definitions for DebounceEvent
 #define BUTTON_PUSHBUTTON           ButtonMask::Pushbutton
diff --git a/code/espurna/wifi.cpp b/code/espurna/wifi.cpp
index 556212998a..310451191c 100644
--- a/code/espurna/wifi.cpp
+++ b/code/espurna/wifi.cpp
@@ -355,6 +355,23 @@ bool sleep() {
     return false;
 }
 
+void lightSleep()
+{
+    wifiDisconnect();
+    wifiTurnOff();
+    wifi_station_disconnect();
+    wifi_set_opmode_current(NULL_MODE);
+    wifi_fpm_set_sleep_type(LIGHT_SLEEP_T);
+    yield();
+    wifi_fpm_open();
+    yield();
+    gpio_pin_wakeup_enable(GPIO_ID_PIN(BUTTON_WAKEUP_PIN), GPIO_PIN_INTR_LOLEVEL);
+    wifi_fpm_do_sleep(0xFFFFFFF);
+    delay(10);
+    wifi_fpm_close();
+    wifiTurnOn();
+}
+
 bool wakeup() {
     if (wifi_fpm_get_sleep_type() != NONE_SLEEP_T) {
         wifi_fpm_do_wakeup();
@@ -3041,3 +3058,7 @@ IPAddress wifiApIp() {
 void wifiSetup() {
     espurna::wifi::setup();
 }
+
+void lightSleep() {
+    espurna::wifi::lightSleep();
+}
diff --git a/code/espurna/wifi.h b/code/espurna/wifi.h
index 4de43e64c1..6892c0bc49 100644
--- a/code/espurna/wifi.h
+++ b/code/espurna/wifi.h
@@ -105,3 +105,4 @@ void wifiApCheck();
 
 void wifiRegister(espurna::wifi::EventCallback);
 void wifiSetup();
+void lightSleep();

From e0995e36944a922f583c17cac719858618f6eb20 Mon Sep 17 00:00:00 2001
From: HamedTa <hamed.t@live.com>
Date: Fri, 3 Feb 2023 18:39:45 +0330
Subject: [PATCH 2/4] Add a default value to wakeup button pin

---
 code/espurna/config/defaults.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/espurna/config/defaults.h b/code/espurna/config/defaults.h
index e89cad5731..38947a7d27 100644
--- a/code/espurna/config/defaults.h
+++ b/code/espurna/config/defaults.h
@@ -206,6 +206,10 @@
 #define BUTTON8_PIN         GPIO_NONE
 #endif
 
+#ifndef BUTTON_WAKEUP_PIN
+#define BUTTON_WAKEUP_PIN     BUTTON1_PIN
+#endif
+
 #ifndef BUTTON1_PIN_TYPE
 #define BUTTON1_PIN_TYPE    GPIO_TYPE_HARDWARE
 #endif

From be925ef57ae6f8275932076a3276047c759422c8 Mon Sep 17 00:00:00 2001
From: HamedTa <hamed.t@live.com>
Date: Fri, 3 Feb 2023 19:13:28 +0330
Subject: [PATCH 3/4] Remove light status check before go to light Sleep

---
 code/espurna/button.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/espurna/button.cpp b/code/espurna/button.cpp
index 1e6040f0cf..ea306cfe2d 100644
--- a/code/espurna/button.cpp
+++ b/code/espurna/button.cpp
@@ -1182,10 +1182,7 @@ void buttonEvent(size_t id, ButtonEvent event) {
         break;
 
     case ButtonAction::Sleep:
-         if (lightState())
-         {
-            _buttonRelayAction(id, ButtonAction::Off);
-         } else {lightSleep();}
+        lightSleep();
          
         break;
     case ButtonAction::None:

From d2a69f1fd02749d1d1d93f4be8d3f12b73b4c3e5 Mon Sep 17 00:00:00 2001
From: HamedTa <hamed.t@live.com>
Date: Fri, 3 Feb 2023 21:15:18 +0330
Subject: [PATCH 4/4] Update wifi.cpp

---
 code/espurna/wifi.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/espurna/wifi.cpp b/code/espurna/wifi.cpp
index 310451191c..22d239739e 100644
--- a/code/espurna/wifi.cpp
+++ b/code/espurna/wifi.cpp
@@ -357,9 +357,6 @@ bool sleep() {
 
 void lightSleep()
 {
-    wifiDisconnect();
-    wifiTurnOff();
-    wifi_station_disconnect();
     wifi_set_opmode_current(NULL_MODE);
     wifi_fpm_set_sleep_type(LIGHT_SLEEP_T);
     yield();