Cleanup headers

src/hasp/hasp.cpp

@@ -1,6 +1,10 @@
 /* MIT License - Copyright (c) 2019-2021 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
+#include "hasplib.h"
+#include "lv_theme_hasp.h"
+#include "dev/device.h"
+
 #ifdef ARDUINO
 #include "ArduinoLog.h"
 #endif
@@ -15,9 +19,6 @@
 #include "StreamUtils.h" // For EEPromStream
 #endif
 
-#include "hasplib.h"
-#include "lv_theme_hasp.h"
-
 #if HASP_USE_DEBUG > 0
 #include "../hasp_debug.h"
 #endif
@@ -29,8 +30,6 @@
 //#include "hasp_filesystem.h" included in hasp_conf.h
 #endif
 
-#include "dev/device.h"
-
 #if HASP_USE_EEPROM > 0
 #include "EEPROM.h"
 #endif

src/hasp_config.cpp

@@ -3,13 +3,12 @@
 
 #if HASP_USE_CONFIG > 0
 
-#include "StreamUtils.h" // For EEPromStream
-
 #include "hasplib.h"
 
 #include "hasp_config.h"
 #include "hasp_debug.h"
 #include "hasp_gui.h"
+#include "hal/hasp_hal.h"
 
 //#include "hasp_ota.h" included in conf
 //#include "hasp_filesystem.h" included in conf
@@ -22,6 +21,8 @@
 #include "EEPROM.h"
 #endif
 
+#include "StreamUtils.h" // For EEPromStream
+
 extern uint16_t dispatchTelePeriod;
 extern uint32_t dispatchLastMillis;
 

src/hasp_config.h

@@ -6,8 +6,7 @@
 #ifndef HASP_CONFIG_H
 #define HASP_CONFIG_H
 
-#include "hasp_conf.h"
-#include "ArduinoJson.h"
+#include "hasplib.h"
 #include "hasp_debug.h" // for TAG_CONF
 
 /* ===== Default Event Processors ===== */

src/hasp_debug.cpp

@@ -1,15 +1,12 @@
 /* MIT License - Copyright (c) 2019-2021 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "ArduinoJson.h"
-#include "lvgl.h"
+#include "hasplib.h"
 #include <sys/time.h>
 
 #include "lang/lang.h"
-#include "hasp_conf.h"
 #include "hasp_debug.h"
 #include "hasp_macro.h"
-#include "hasp/hasp.h"
 
 #if(!defined(WINDOWS)) && (!defined(POSIX))
 #include "ArduinoLog.h"

src/hasp_gui.h

@@ -4,8 +4,7 @@
 #ifndef HASP_GUI_H
 #define HASP_GUI_H
 
-#include "ArduinoJson.h"
-#include "lvgl.h"
+#include "hasplib.h"
 
 struct gui_conf_t
 {

src/hasplib.h

@@ -1,3 +1,7 @@
+#ifdef ARDUINO
+#include <Arduino.h>
+#endif
+
 #include <cstdlib>
 #include <cctype>
 #include <string>

src/sys/svc/hasp_http.cpp

@@ -2,9 +2,8 @@
    For full license information read the LICENSE file in the project folder */
 
 //#include "webServer.h"
-#include "ArduinoJson.h"
+#include "hasplib.h"
 #include "ArduinoLog.h"
-#include "lvgl.h"
 
 #if defined(ARDUINO_ARCH_ESP32)
 #include "Update.h"
@@ -12,16 +11,11 @@
 
 #include "hasp_conf.h"
 #include "dev/device.h"
-
-#include "hasp_gui.h"
-#include "hasp/hasp_dispatch.h"
-#include "hasp_debug.h"
-#include "hasp_config.h"
 #include "hal/hasp_hal.h"
 
-#include "hasp/hasp_dispatch.h"
-#include "hasp/hasp_page.h"
-#include "hasp/hasp.h"
+#include "hasp_gui.h"
+#include "hasp_debug.h"
+#include "hasp_config.h"
 
 #if HASP_USE_HTTP > 0
 

src/sys/svc/hasp_slave.cpp

@@ -1,17 +1,14 @@
 /* MIT License - Copyright (c) 2019-2021 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "hasp_conf.h"
+#include "hasplib.h"
 #if HASP_USE_TASMOTA_CLIENT > 0
 
 #include "hasp_slave.h"
-#include "ArduinoJson.h"
 
-#include "hasp_dispatch.h"
 #include "hasp_gui.h"
 #include "hasp_hal.h"
 #include "hasp_config.h"
-#include "hasp.h"
 #include "tasmotaSlave.h"
 
 // set RX and TX pins

src/sys/svc/hasp_telnet.cpp

@@ -1,11 +1,10 @@
 /* MIT License - Copyright (c) 2019-2021 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "hasp_conf.h"
+#include "hasplib.h"
 
 #if HASP_USE_TELNET > 0
 
-#include "ArduinoJson.h"
 #include "ConsoleInput.h"
 
 #include "hasp_debug.h"

src/sys/svc/hasp_telnet.h

@@ -6,8 +6,7 @@
 
 #if HASP_USE_TELNET > 0
 
-#include "hasp_conf.h"
-#include "ArduinoJson.h"
+#include "hasplib.h"
 
 /* ===== Default Event Processors ===== */
 void telnetSetup();