From 6441a68355a589b0e34b60b29234264e7185f3eb Mon Sep 17 00:00:00 2001
From: Maxim Prokhorov <prokhorov.max@outlook.com>
Date: Sat, 11 Mar 2023 16:14:52 +0300
Subject: [PATCH] rpn: separate sleep operators

---
 code/espurna/rpnrules.cpp | 49 +++++++++++++--------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/code/espurna/rpnrules.cpp b/code/espurna/rpnrules.cpp
index 5b9c1ab9..483d9882 100644
--- a/code/espurna/rpnrules.cpp
+++ b/code/espurna/rpnrules.cpp
@@ -1135,22 +1135,19 @@ void init(rpn_context& context) {
 
 namespace system {
 
-void sleep(uint64_t duration, RFMode mode);
+using SystemSleepAction = bool(*)(sleep::Microseconds);
 
-void scheduleSleep(uint64_t duration, RFMode mode) {
-    espurnaRegisterOnce([duration, mode]() {
-        sleep(duration, mode);
-    });
-}
+rpn_error with_sleep_duration(rpn_context& ctxt, SystemSleepAction action) {
+    auto value = rpn_stack_pop(ctxt).checkedToUint();
+    if (!value.ok()) {
+        return value.error();
+    }
 
-void sleep(uint64_t duration, RFMode mode) {
-    if (wifi_get_opmode() != NULL_MODE) {
-        wifiTurnOff();
-        scheduleSleep(duration, mode);
-        return;
+    if (!action(sleep::Microseconds{ value.value() })) {
+        return rpn_operator_error::CannotContinue;
     }
 
-    ESP.deepSleep(duration, mode);
+    return 0;
 }
 
 void init(rpn_context& context) {
@@ -1181,28 +1178,14 @@ void init(rpn_context& context) {
         return 0;
     });
 
-    rpn_operator_set(context, "sleep", 2, [](rpn_context& ctxt) -> rpn_error {
-        static bool once { false };
-        if (once) {
-            return rpn_operator_error::CannotContinue;
-        }
-
-        auto value = rpn_stack_pop(ctxt).checkedToUint();
-        if (!value.ok()) {
-            return value.error();
-        }
-
-        uint64_t duration = value.value();
-        if (!duration) {
-            return rpn_operator_error::CannotContinue;
-        }
-
-        auto mode = rpn_stack_pop(ctxt).toUint();
-
-        once = true;
-        sleep(duration * 1000000ull, static_cast<RFMode>(mode));
+    rpn_operator_set(context, "light_sleep", 1, [](rpn_context& ctxt) -> rpn_error {
+        return with_sleep_duration(ctxt, [](sleep::Microseconds time) -> bool {
+            return instantLightSleep(time);
+        });
+    });
 
-        return 0;
+    rpn_operator_set(context, "deep_sleep", 1, [](rpn_context& ctxt) -> rpn_error {
+        return with_sleep_duration(ctxt, instantDeepSleep);
     });
 
     rpn_operator_set(context, "mem?", 0, [](rpn_context& ctxt) -> rpn_error {