From b95e2d78f1387d1fc4b88853e40e9ee84d0a8149 Mon Sep 17 00:00:00 2001
From: arovak <arovak@netwize.be>
Date: Mon, 5 Apr 2021 23:34:54 +0200
Subject: [PATCH] rearrange some includes and defines

---
 src/dev/esp32/esp32.cpp      | 3 ++-
 src/sys/net/hasp_network.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/dev/esp32/esp32.cpp b/src/dev/esp32/esp32.cpp
index 837a6bad..d591a407 100644
--- a/src/dev/esp32/esp32.cpp
+++ b/src/dev/esp32/esp32.cpp
@@ -7,13 +7,14 @@
 #include <Esp.h>
 #include "esp_system.h"
 
+#include "hasp_conf.h"
+
 #include "../device.h"
 #include "esp32.h"
 
 #include "driver/adc.h"
 #include "esp_adc_cal.h"
 
-#include "hasp_conf.h"
 #include "hasp_debug.h"
 #include "hasp/hasp_utilities.h"
 
diff --git a/src/sys/net/hasp_network.cpp b/src/sys/net/hasp_network.cpp
index 1001a5d6..bdbc49c0 100644
--- a/src/sys/net/hasp_network.cpp
+++ b/src/sys/net/hasp_network.cpp
@@ -6,9 +6,6 @@
 // #ifdef USE_CONFIG_OVERRIDE
 // #include "user_config_override.h"
 // #endif
-#ifndef MYTZ
-#define MYTZ "EST5EDT,M3.2.0/2,M11.1.0"
-#endif
 #include <Arduino.h>
 #include "ArduinoLog.h"
 
@@ -20,6 +17,10 @@
 #include "hasp/hasp.h"
 #include "sys/svc/hasp_mdns.h"
 
+#ifndef MYTZ
+#define MYTZ "EST5EDT,M3.2.0/2,M11.1.0"
+#endif
+
 #if HASP_USE_ETHERNET > 0 || HASP_USE_WIFI > 0
 void networkStart(void)
 {