Header cleanup

lib/lv_drv_fsmc_ili9341/fsmc_ili9341.cpp

@@ -6,10 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "fsmc_ili9341.h"
 
 #if USE_FSMC_ILI9341 > 0
 
+#include "fsmc_ili9341.h"
+
 #include <stdbool.h>
 #include <Arduino.h>
 #include <SPI.h>

src/hasp.cpp

@@ -2,8 +2,7 @@
    For full license information read the LICENSE file in the project folder */
 
 #include "hasp_conf.h"
-#include <Arduino.h>
+
-#include "ArduinoLog.h"
 #include "ArduinoJson.h"
 #include "StreamUtils.h" // For EEPromStream
 

src/hasp_config.h

@@ -4,6 +4,7 @@
 #ifndef HASP_CONFIG_H
 #define HASP_CONFIG_H
 
+#include "hasp_conf.h"
 #include "ArduinoJson.h"
 #include "hasp_debug.h" // for TAG_CONF
 

src/hasp_debug.cpp

@@ -13,14 +13,11 @@
 
 =========================================================================== */
 
-#include "ArduinoJson.h"
+#include "hasp_conf.h"
-#include "ArduinoLog.h"
 #include "ConsoleInput.h"
 #include "lvgl.h"
 //#include "time.h"
 
-#include "hasp_conf.h"
-
 #if defined(ARDUINO_ARCH_ESP8266)
 #include <sntp.h> // sntp_servermode_dhcp()
 #include <ESP8266WiFi.h>

src/hasp_dispatch.cpp

@@ -1,8 +1,6 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
 #include "StringStream.h"
 #include "CharStream.h"
 

src/hasp_dispatch.h

@@ -6,8 +6,6 @@
 
 #include "ArduinoJson.h"
 
-#define LOG_CMND_CTR "CMND: "
-
 enum hasp_event_t { // even = released, odd = pressed
     HASP_EVENT_OFF  = 0,
     HASP_EVENT_ON   = 1,

src/hasp_ethernet_esp32.cpp

@@ -1,9 +1,6 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include <Arduino.h>
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
 
 #include "hasp_conf.h"
 #include "hasp_hal.h"

src/hasp_ethernet_stm32.cpp

@@ -1,12 +1,9 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include <Arduino.h>
+#include "hasp_conf.h"
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
 
 #include "hasp_debug.h"
-#include "hasp_conf.h"
 #include "hasp_hal.h"
 
 #if HASP_USE_ETHERNET > 0 && !defined(ARDUINO_ARCH_ESP32)

src/hasp_gpio.cpp

@@ -1,8 +1,6 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "Arduino.h"
-#include "ArduinoLog.h"
 
 #include "AceButton.h"
 #include "lv_conf.h" // For timing defines

src/hasp_gui.cpp

@@ -1,8 +1,7 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "Ticker.h"
+#include "hasp_conf.h"
-#include "ArduinoLog.h"
 
 #include "lv_conf.h"
 #include "lvgl.h"
@@ -25,7 +24,6 @@
 
 //#include "lv_zifont.h"
 
-#include "hasp_conf.h"
 #include "hasp_debug.h"
 #include "hasp_config.h"
 #include "hasp_dispatch.h"
@@ -36,6 +34,8 @@
 //#include "lv_ex_conf.h"
 //#include "tpcal.h"
 
+#include "Ticker.h"
+
 #if HASP_USE_PNGDECODE > 0
 #include "png_decoder.h"
 #endif
@@ -408,8 +408,8 @@ bool IRAM_ATTR my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t *
     touched = Touch_getXY(&touchX, &touchY, false);
 #else
     // xpt2046_alt_drv_read(indev_driver, data);
-    xpt2046_read(indev_driver, data);
+    // xpt2046_read(indev_driver, data);
-    if(data->state && guiSleeping != HASP_SLEEP_OFF) guiCheckSleep();
+    // if(data->state && guiSleeping != HASP_SLEEP_OFF) guiCheckSleep();
     return false;
 #endif
 

src/hasp_http.cpp

@@ -2,7 +2,6 @@
    For full license information read the LICENSE file in the project folder */
 
 //#include "webServer.h"
-#include "Arduino.h"
 #include "ArduinoJson.h"
 #include "ArduinoLog.h"
 #include "lvgl.h"

src/hasp_http.h

@@ -4,8 +4,7 @@
 #ifndef HASP_HTTP_H
 #define HASP_HTTP_H
 
-#include <Arduino.h>
+#include "hasp_conf.h"
-#include "ArduinoJson.h"
 
 void httpSetup();
 void IRAM_ATTR httpLoop(void);

src/hasp_mdns.cpp

@@ -1,11 +1,9 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
+#include "hasp_conf.h"
 #if HASP_USE_MDNS > 0
 
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
-
 #if defined(ARDUINO_ARCH_ESP32)
 #include <ESPmDNS.h>
 #elif defined(ARDUINO_ARCH_ESP8266)
@@ -13,8 +11,6 @@
 // MDNSResponder::hMDNSService hMDNSService;
 #endif
 
-#include "hasp_conf.h"
-
 #include "hasp_config.h"
 #include "hasp_debug.h"
 

src/hasp_mqtt.cpp

@@ -4,9 +4,6 @@
 #include "hasp_conf.h"
 #if HASP_USE_MQTT > 0
 
-#include <Arduino.h>
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
 #include "PubSubClient.h"
 
 #include "hasp_mqtt.h"

src/hasp_oobe.cpp

@@ -2,9 +2,6 @@
    For full license information read the LICENSE file in the project folder */
 
 #include "hasp_conf.h"
-#include <Arduino.h>
-#include "ArduinoJson.h"
-#include "ArduinoLog.h"
 
 #include "lvgl.h"
 #if LVGL_VERSION_MAJOR != 7

src/hasp_ota.cpp

@@ -3,10 +3,6 @@
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 
-#include <Arduino.h>
-#include <ArduinoOTA.h>
-#include "ArduinoJson.h"
-
 #include "hasp_conf.h"
 
 #include "hasp_debug.h"
@@ -24,6 +20,8 @@
 #include <WiFi.h>
 #endif
 
+#include <ArduinoOTA.h>
+
 static WiFiClient otaClient;
 std::string otaUrl           = "http://ota.netwize.be";
 int16_t otaPort              = HASP_OTA_PORT;

src/hasp_slave.cpp

@@ -1,12 +1,12 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
+#include "hasp_conf.h"
 #if HASP_USE_TASMOTA_SLAVE > 0
 
 #include "hasp_slave.h"
-#include <Arduino.h>
 #include "ArduinoJson.h"
-#include "ArduinoLog.h"
+
 #include "hasp_dispatch.h"
 #include "hasp_gui.h"
 #include "hasp_hal.h"

src/hasp_slave.h

@@ -15,7 +15,6 @@ void slave_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const char * at
 void slave_send_input(uint8_t id, const char * payload);
 void slave_send_statusupdate();
 
-
 void slaveSetup();
 void IRAM_ATTR slaveLoop(void);
 

src/hasp_telnet.cpp

@@ -4,9 +4,7 @@
 #include "hasp_conf.h"
 #if HASP_USE_TELNET > 0
 
-#include "Arduino.h"
 #include "ArduinoJson.h"
-#include "ArduinoLog.h"
 #include "ConsoleInput.h"
 
 #include "hasp_debug.h"

src/hasp_tft.cpp

@@ -2,17 +2,17 @@
    For full license information read the LICENSE file in the project folder */
 
 #include "ArduinoJson.h"
-#include "ArduinoLog.h"
 
 #ifndef USE_FSMC
 
-#include "TFT_eSPI.h"
+#include "hasp_conf.h"
-
 #include "hasp_tft.h"
 #include "hasp_hal.h"
 #include "hasp_gpio.h" // PinNames
 #include "hasp_debug.h"
 
+#include "TFT_eSPI.h"
+
 #if defined(ARDUINO_ARCH_ESP8266)
 ADC_MODE(ADC_VCC); // tftShowConfig measures the voltage on the pin
 #endif

src/main.cpp

@@ -1,10 +1,8 @@
 /* MIT License - Copyright (c) 2020 Francis Van Roie
    For full license information read the LICENSE file in the project folder */
 
-#include "hasp_conf.h" // load first
 #include <Arduino.h>
-
+#include "hasp_conf.h" // load first
-#include "hasp_conf.h"
 
 #include "hasp_debug.h"
 #include "hasp_config.h"