[system] sleep: avoid trying to turn off multiple times before going into sleep

Author: avtolstoy

system/src/system_sleep.cpp

@@ -196,7 +196,6 @@ int system_sleep_ext(const hal_sleep_config_t* config, hal_wakeup_source_base_t*
 
 #if HAL_PLATFORM_WIFI
     if (wifiResume) {
-        SPARK_WLAN_SLEEP = 0;
         system_sleep_network_resume(NETWORK_INTERFACE_WIFI_STA);
     }
 #endif // HAL_PLATFORM_WIFI

system/src/system_sleep_compat.cpp

@@ -171,8 +171,11 @@ int system_sleep_impl(Spark_Sleep_TypeDef sleepMode, long seconds, uint32_t para
                 RESET_REASON_NONE, seconds);
     }
 
+    bool networkTurnedOff = false;
+
     if (network_sleep_flag(param) || SLEEP_MODE_WLAN == sleepMode) {
         network_suspend();
+        networkTurnedOff = true;
     }
 
     switch (sleepMode)
@@ -193,17 +196,14 @@ int system_sleep_impl(Spark_Sleep_TypeDef sleepMode, long seconds, uint32_t para
             break;
 
         case SLEEP_MODE_DEEP:
-            if (network_sleep_flag(param))
-            {
-                network_disconnect(0, NETWORK_DISCONNECT_REASON_SLEEP, NULL);
-                network_off(0, 0, 0, NULL);
-            }
             return system_sleep_enter_standby_compat(seconds, param);
 
 #if HAL_PLATFORM_SETUP_BUTTON_UX
         case SLEEP_MODE_SOFTPOWEROFF:
-            network_disconnect(0, NETWORK_DISCONNECT_REASON_SLEEP, NULL);
-            network_off(0, 0, 0, NULL);
+            if (!networkTurnedOff) {
+                network_disconnect(0, NETWORK_DISCONNECT_REASON_SLEEP, NULL);
+                network_off(0, 0, 0, NULL);
+            }
             return system_sleep_enter_standby_compat(seconds, param);
 #endif
     }