Replace all ESP.restart() calls

OpenShock · Feb 4, 2025 · 69bd74e · 69bd74e · github-actions · Feb 4, 2025
1 parent 8651074
commit 69bd74e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/src/serial/command_handlers/domain.cpp b/src/serial/command_handlers/domain.cpp
@@ -4,6 +4,8 @@
 #include "http/HTTPRequestManager.h"
 #include "serialization/JsonAPI.h"
 
+#include <esp_system.h>
+
 #include <string>
 
 const char* const TAG = "Serial::CommandHandlers::Domain";
@@ -57,7 +59,7 @@ void _handleDomainCommand(std::string_view arg, bool isAutomated) {
   SERPR_SUCCESS("Saved config, restarting...");
 
   // Restart to use the new domain
-  ESP.restart();
+  esp_restart();
 }
 
 OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::DomainHandler() {

diff --git a/src/serial/command_handlers/factoryreset.cpp b/src/serial/command_handlers/factoryreset.cpp
@@ -2,14 +2,16 @@
 
 #include "config/Config.h"
 
+#include <esp_system.h>
+
 void _handleFactoryResetCommand(std::string_view arg, bool isAutomated)
 {
   (void)arg;
 
   ::Serial.println("Resetting to factory defaults...");
   OpenShock::Config::FactoryReset();
   ::Serial.println("Restarting...");
-  ESP.restart();
+  esp_restart();
 }
 
 OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::FactoryResetHandler()

diff --git a/src/serial/command_handlers/hostname.cpp b/src/serial/command_handlers/hostname.cpp
@@ -2,6 +2,8 @@
 
 #include "config/Config.h"
 
+#include <esp_system.h>
+
 #include <string>
 
 const char* const TAG = "Serial::CommandHandlers::Domain";
@@ -21,7 +23,7 @@ void _handleHostnameCommand(std::string_view arg, bool isAutomated) {
   bool result = OpenShock::Config::SetWiFiHostname(arg);
   if (result) {
     SERPR_SUCCESS("Saved config, restarting...");
-    ESP.restart();
+    esp_restart();
   } else {
     SERPR_ERROR("Failed to save config");
   }

diff --git a/src/serial/command_handlers/jsonconfig.cpp b/src/serial/command_handlers/jsonconfig.cpp
@@ -2,6 +2,8 @@
 
 #include "config/Config.h"
 
+#include <esp_system.h>
+
 void _handleJsonConfigCommand(std::string_view arg, bool isAutomated) {
   if (arg.empty()) {
     // Get raw config
@@ -18,7 +20,7 @@ void _handleJsonConfigCommand(std::string_view arg, bool isAutomated) {
 
   SERPR_SUCCESS("Saved config, restarting...");
 
-  ESP.restart();
+  esp_restart();
 }
 
 OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::JsonConfigHandler() {

diff --git a/src/serial/command_handlers/rawconfig.cpp b/src/serial/command_handlers/rawconfig.cpp
@@ -3,6 +3,8 @@
 #include "config/Config.h"
 #include "util/Base64Utils.h"
 
+#include <esp_system.h>
+
 #include <vector>
 
 void _handleRawConfigCommand(std::string_view arg, bool isAutomated) {
@@ -38,7 +40,7 @@ void _handleRawConfigCommand(std::string_view arg, bool isAutomated) {
 
   SERPR_SUCCESS("Saved config, restarting...");
 
-  ESP.restart();
+  esp_restart();
 }
 
 OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::RawConfigHandler() {

diff --git a/src/serial/command_handlers/restart.cpp b/src/serial/command_handlers/restart.cpp
@@ -1,12 +1,12 @@
 #include "serial/command_handlers/common.h"
 
-#include <Arduino.h>
+#include <esp_system.h>
 
 void _handleRestartCommand(std::string_view arg, bool isAutomated) {
   (void)arg;
 
   ::Serial.println("Restarting ESP...");
-  ESP.restart();
+  esp_restart();
 }
 
 OpenShock::Serial::CommandGroup OpenShock::Serial::CommandHandlers::RestartHandler() {