From b7afda6cc923606091da64ce4f5905840879f5b4 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Tue, 12 Apr 2022 23:49:26 +0200
Subject: [PATCH] Add custom/my_custom.h to hasplib.h

---
 src/custom/my_custom_fan_template.cpp |  1 -
 src/custom/my_custom_template.cpp     |  1 -
 src/hasp/hasp_dispatch.cpp            |  4 ----
 src/hasp/hasp_font.cpp                |  2 +-
 src/hasp/hasp_task.cpp                |  4 ----
 src/hasplib.h                         |  4 ++++
 src/main_arduino.cpp                  |  4 ----
 src/main_sdl2.cpp                     | 10 +---------
 src/sys/gpio/hasp_gpio.cpp            |  4 ----
 9 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/custom/my_custom_fan_template.cpp b/src/custom/my_custom_fan_template.cpp
index c1066130..8318bffe 100644
--- a/src/custom/my_custom_fan_template.cpp
+++ b/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°)
diff --git a/src/custom/my_custom_template.cpp b/src/custom/my_custom_template.cpp
index c12308bd..8c4917f4 100644
--- a/src/custom/my_custom_template.cpp
+++ b/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()
 {
diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp
index 8f938f30..1570081c 100644
--- a/src/hasp/hasp_dispatch.cpp
+++ b/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;
diff --git a/src/hasp/hasp_font.cpp b/src/hasp/hasp_font.cpp
index ba9b980c..dd5d2e64 100644
--- a/src/hasp/hasp_font.cpp
+++ b/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;
diff --git a/src/hasp/hasp_task.cpp b/src/hasp/hasp_task.cpp
index e73eb809..24028915 100644
--- a/src/hasp/hasp_task.cpp
+++ b/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
diff --git a/src/hasplib.h b/src/hasplib.h
index aa61b276..1eec533f 100644
--- a/src/hasplib.h
+++ b/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
\ No newline at end of file
diff --git a/src/main_arduino.cpp b/src/main_arduino.cpp
index f2264136..b082a27f 100644
--- a/src/main_arduino.cpp
+++ b/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;
diff --git a/src/main_sdl2.cpp b/src/main_sdl2.cpp
index 7d6abafd..c7f3a97e 100644
--- a/src/main_sdl2.cpp
+++ b/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;
 
diff --git a/src/sys/gpio/hasp_gpio.cpp b/src/sys/gpio/hasp_gpio.cpp
index 0d2c5786..9ddc6182 100644
--- a/src/sys/gpio/hasp_gpio.cpp
+++ b/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