Add custom/my_custom.h to hasplib.h

src/custom/my_custom_fan_template.cpp

@@ -16,7 +16,6 @@
 #if defined(HASP_USE_CUSTOM) && false // <-- set this to true in your code
 
 #include "hasp_debug.h"
-#include "custom/my_custom.h"
 
 uint16_t fanspeed       = 0;   // rotation off by default (the time between angle turns in ms)
 uint16_t fanangle       = 450; // default angle of one turn (0.1 degree precision, so this means 45°)

src/custom/my_custom_template.cpp

@@ -9,7 +9,6 @@
 #if defined(HASP_USE_CUSTOM) && false // <-- set this to true in your code
 
 #include "hasp_debug.h"
-#include "custom/my_custom.h"
 
 void custom_setup()
 {

src/hasp/hasp_dispatch.cpp

@@ -41,10 +41,6 @@
 #include "hasp_config.h"
 #endif
 
-#if defined(HASP_USE_CUSTOM)
-#include "custom/my_custom.h"
-#endif
-
 dispatch_conf_t dispatch_setings = {.teleperiod = 300};
 
 uint16_t dispatchSecondsToNextTeleperiod = 0;

src/hasp/hasp_font.cpp

@@ -102,7 +102,7 @@ static lv_font_t* font_add_to_list(const char* payload)
     if(!font) return NULL;
     LOG_VERBOSE(TAG_FONT, F("Loaded font %s size %d"), filename, font->line_height);
 
-    /* allox payload str */
+    /* alloc payload str */
     size_t len = strlen(payload);
     name_p     = (char*)calloc(sizeof(char), len + 1);
     if(!name_p) return NULL;

src/hasp/hasp_task.cpp

@@ -16,10 +16,6 @@ For full license information read the LICENSE file in the project folder */
 #include "hasp_gui.h"
 #endif
 
-#if defined(HASP_USE_CUSTOM)
-#include "custom/my_custom.h"
-#endif
-
 #ifdef HASP_USE_STAT_COUNTER
 extern uint16_t statLoopCounter; // measures the average looptime
 #endif

src/hasplib.h

@@ -48,4 +48,8 @@
 
 #if HASP_USE_JPGDECODE > 0
 #include "lv_sjpg.h"
+#endif
+
+#if defined(HASP_USE_CUSTOM)
+#include "custom/my_custom.h"
 #endif

src/main_arduino.cpp

@@ -20,10 +20,6 @@
 #include "hasp_gui.h"
 #endif
 
-#if defined(HASP_USE_CUSTOM)
-#include "custom/my_custom.h"
-#endif
-
 bool isConnected;
 uint8_t mainLoopCounter        = 0;
 unsigned long mainLastLoopTime = 0;

src/main_sdl2.cpp

@@ -22,24 +22,16 @@
 #include <cstdlib>
 #include <iostream>
 
-#include "hasp_conf.h"
+#include "hasplib.h"
 
-#include "lvgl.h"
 // #include "app_hal.h"
 #include "display/monitor.h"
 
 #include "hasp_debug.h"
 #include "hasp_gui.h"
 
-#include "hasp/hasp_dispatch.h"
-#include "hasp/hasp.h"
-
 #include "dev/device.h"
 
-#if defined(HASP_USE_CUSTOM)
-#include "custom/my_custom.h"
-#endif
-
 bool isConnected;
 bool isRunning = 1;
 

src/sys/gpio/hasp_gpio.cpp

@@ -8,10 +8,6 @@
 #include "hasp_gpio.h"
 #include "hasp_config.h"
 
-#if defined(HASP_USE_CUSTOM)
-#include "custom/my_custom.h"
-#endif
-
 #ifdef ARDUINO_ARCH_ESP8266
 #define INPUT_PULLDOWN INPUT
 #endif