From 01d23a33d44695dd21235c4f41d1e005158a8749 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Sat, 2 May 2020 03:27:07 +0200
Subject: [PATCH] Fix halRestart

---
 src/hasp_dispatch.cpp |  2 +-
 src/hasp_hal.cpp      | 18 +++++++++---------
 src/hasp_hal.h        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hasp_dispatch.cpp b/src/hasp_dispatch.cpp
index 132966f7..6a23747f 100644
--- a/src/hasp_dispatch.cpp
+++ b/src/hasp_dispatch.cpp
@@ -298,7 +298,7 @@ void dispatchReboot(bool saveConfig)
     Log.verbose(F("-------------------------------------"));
     Log.notice(F("STOP: Properly Rebooting the MCU now!"));
     Serial.flush();
-    //halRestart();
+    halRestart();
 }
 
 void dispatch_button(uint8_t id, const char * event)
diff --git a/src/hasp_hal.cpp b/src/hasp_hal.cpp
index 83e7a363..672e7ba5 100644
--- a/src/hasp_hal.cpp
+++ b/src/hasp_hal.cpp
@@ -11,15 +11,6 @@
 #if defined(ARDUINO_ARCH_ESP32)
 #include <rom/rtc.h> // needed to get the ResetInfo
 
-void halRestart(void)
-{
-#if defined(ESP32) || defined(ESP8266)
-    ESP.restart();
-#else
-    NVIC_SystemReset();
-#endif
-}
-
 // Compatibility function for ESP8266 getRestInfo
 String esp32ResetReason(uint8_t cpuid)
 {
@@ -90,6 +81,15 @@ String esp32ResetReason(uint8_t cpuid)
 }
 #endif
 
+void halRestart(void)
+{
+#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
+    ESP.restart();
+#else
+    NVIC_SystemReset();
+#endif
+}
+
 String halGetResetInfo()
 {
 #if defined(ARDUINO_ARCH_ESP32)
diff --git a/src/hasp_hal.h b/src/hasp_hal.h
index 23ac6501..97f85f0a 100644
--- a/src/hasp_hal.h
+++ b/src/hasp_hal.h
@@ -3,12 +3,12 @@
 
 #include <Arduino.h>
 
+void halRestart(void);
 uint8_t halGetHeapFragmentation(void);
 String halGetResetInfo(void);
 size_t halGetMaxFreeBlock(void);
 size_t halGetFreeHeap(void);
 String halGetCoreVersion(void);
 String halGetChipModel();
-void halRestart(void);
 
 #endif
\ No newline at end of file