Move #include "ArduinoLog.h" to hasplib.h

include/hasp_conf.h

@@ -4,8 +4,6 @@
 #ifndef HASP_CONF_H
 #define HASP_CONF_H
 
-#include "ArduinoLog.h"
-
 #ifdef USE_CONFIG_OVERRIDE
 #include "user_config_override.h"
 #endif

src/drv/touch/touch_driver_analog.h

@@ -5,12 +5,11 @@
 #define HASP_ANALOG_TOUCH_DRIVER_H
 
 #ifdef ARDUINO
+#include <Arduino.h>
+#include "ArduinoLog.h"
 #include "hasp_conf.h"
 
-#include <Arduino.h>
 #include "hasp_drv_analogTouch.h"
-#include "ArduinoLog.h"
-
 #include "touch_driver.h" // base class
 
 #include "../../hasp/hasp.h" // for hasp_sleep_state

src/drv/touch/touch_driver_ft6336u.h

@@ -5,12 +5,12 @@
 #define HASP_FT6336T_TOUCH_DRIVER_H
 
 #ifdef ARDUINO
+#include <Arduino.h>
+#include "ArduinoLog.h"
 #include "hasp_conf.h"
 
-#include <Arduino.h>
 #include <Wire.h>
 #include "FT6336U.h"
-#include "ArduinoLog.h"
 
 #include "touch_driver.h" // base class
 #include "touch_helper.h" // i2c scanner

src/drv/touch/touch_driver_gslx680.h

@@ -5,12 +5,12 @@
 #define HASP_GSL1680_TOUCH_DRIVER_H
 
 #ifdef ARDUINO
+#include <Arduino.h>
+#include "ArduinoLog.h"
 #include "hasp_conf.h"
 
-#include <Arduino.h>
 #include <Wire.h>
 #include "GSL2038.h"
-#include "ArduinoLog.h"
 
 #include "touch_driver.h" // base class
 #include "touch_helper.h" // i2c scanner

src/drv/touch/touch_driver_gt911.h

@@ -5,12 +5,12 @@
 #define HASP_GT911_TOUCH_DRIVER_H
 
 #ifdef ARDUINO
+#include <Arduino.h>
+#include "ArduinoLog.h"
 #include "hasp_conf.h"
 
-#include <Arduino.h>
 #include <Wire.h>
 #include "Goodix.h"
-#include "ArduinoLog.h"
 
 #include "touch_driver.h" // base class
 #include "touch_helper.h" // i2c scanner

src/drv/touch/touch_driver_stmpe610.h

@@ -8,7 +8,6 @@
 #include <Arduino.h>
 #include <SPI.h>
 #include "Adafruit_STMPE610.h"
-#include "ArduinoLog.h"
 
 #include "touch_driver.h" // base class
 

src/drv/touch/touch_helper.h

@@ -6,8 +6,10 @@
 
 #ifdef ARDUINO
 #include <Arduino.h>
-#include <Wire.h>
 #include "ArduinoLog.h"
+#include "hasp_conf.h"
+
+#include <Wire.h>
 #include "hasp_debug.h"
 
 void touch_scan(TwoWire& i2c)

src/hasp/hasp_attribute.cpp

@@ -1,10 +1,6 @@
 /* MIT License - Copyright (c) 2019-2022 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#ifdef ARDUINO
-#include "ArduinoLog.h"
-#endif
-
 #include "hasplib.h"
 #include "hasp_attribute_helper.h"
 

src/hasp/hasp_object.cpp

@@ -11,10 +11,6 @@
  *
  ******************************************************************************************** */
 
-#ifdef ARDUINO
-#include "ArduinoLog.h"
-#endif
-
 #include "hasplib.h"
 
 const char** btnmatrix_default_map;            // memory pointer to lvgl default btnmatrix map

src/hasp_debug.cpp

@@ -9,7 +9,6 @@
 #include "hasp_macro.h"
 
 #if(!defined(WINDOWS)) && (!defined(POSIX))
-#include "ArduinoLog.h"
 
 #define debug_print(io, ...) io->printf(__VA_ARGS__)
 #define debug_newline(io) io->println()

src/hasp_debug.h

@@ -4,6 +4,10 @@
 #ifndef HASP_DEBUG_H
 #define HASP_DEBUG_H
 
+#ifdef ARDUINO
+#include "ArduinoLog.h"
+#endif
+
 #include "hasp_conf.h"
 
 #include "ArduinoJson.h"
@@ -14,8 +18,6 @@
 #include "lang/lang.h"
 
 #if(!defined(WINDOWS)) && (!defined(POSIX))
-#include "ArduinoLog.h"
-
 /* ===== Default Event Processors ===== */
 void debugSetup(JsonObject settings);
 

src/hasp_filesystem.cpp

@@ -1,6 +1,10 @@
 /* MIT License - Copyright (c) 2019-2022 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
+#ifdef ARDUINO
+#include "ArduinoLog.h"
+#endif
+
 #include "hasp_conf.h" // include first
 
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0

src/hasplib.h

@@ -3,6 +3,11 @@
 
 #ifdef ARDUINO
 #include <Arduino.h>
+#include "ArduinoLog.h"
+#endif
+
+#ifdef USE_CONFIG_OVERRIDE
+#include "user_config_override.h"
 #endif
 
 #include <cstdlib>

src/main_arduino.cpp

@@ -8,7 +8,6 @@
 #include "sys/net/hasp_network.h"
 #include "sys/net/hasp_time.h"
 #include "dev/device.h"
-#include "ArduinoLog.h"
 
 #if HASP_USE_CONFIG > 0
 #include "hasp_debug.h"

src/sys/net/hasp_time.cpp

@@ -3,8 +3,8 @@
 
 #include <Arduino.h>
 #include "ArduinoLog.h"
-
 #include "hasp_conf.h"
+
 #include "hal/hasp_hal.h"
 #include "hasp_debug.h"
 #include "hasp_config.h"