jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 05:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add libraries to hasplib

Browse Source
This commit is contained in:
fvanroie 2022-04-12 02:36:14 +02:00
parent 70c58213de
commit c402a9932e
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hasp_gui.cpp
View File

@ -26,23 +26,6 @@
//#include "tpcal.h" //#include "tpcal.h"
//#include "Ticker.h" //#include "Ticker.h"
#include "lv_freetype.h"
#if HASP_USE_PNGDECODE > 0
#include "lv_png.h"
#endif
#if HASP_USE_BMPDECODE > 0
#include "lv_bmp.h"
#endif
#if HASP_USE_GIFDECODE > 0
#include "lv_gif.h"
#endif
#if HASP_USE_JPGDECODE > 0
#include "lv_sjpg.h"
#endif
#define BACKLIGHT_CHANNEL 0 // pwm channel 0-15 #define BACKLIGHT_CHANNEL 0 // pwm channel 0-15
@ -218,8 +201,8 @@ static inline void gui_init_tft(void)
// Initialize TFT // Initialize TFT
LOG_TRACE(TAG_TFT, F(D_SERVICE_STARTING)); LOG_TRACE(TAG_TFT, F(D_SERVICE_STARTING));
gui_start_tft(); gui_start_tft();
haspTft.show_info(); haspTft.show_info();
#ifdef USE_DMA_TO_TFT #ifdef USE_DMA_TO_TFT
LOG_VERBOSE(TAG_TFT, F("DMA : " D_SETTING_ENABLED)); LOG_VERBOSE(TAG_TFT, F("DMA : " D_SETTING_ENABLED));
#else #else
@ -257,6 +240,9 @@ static inline void gui_init_freetype()
{ {
// #ifdef 1 || USE_LVGL_FREETYPE // #ifdef 1 || USE_LVGL_FREETYPE
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#if(HASP_USE_FREETYPE > 0)
if(lv_freetype_init(USE_LVGL_FREETYPE_MAX_FACES, USE_LVGL_FREETYPE_MAX_SIZES, if(lv_freetype_init(USE_LVGL_FREETYPE_MAX_FACES, USE_LVGL_FREETYPE_MAX_SIZES,
hasp_use_psram() ? USE_LVGL_FREETYPE_MAX_BYTES_PSRAM : USE_LVGL_FREETYPE_MAX_BYTES)) { hasp_use_psram() ? USE_LVGL_FREETYPE_MAX_BYTES_PSRAM : USE_LVGL_FREETYPE_MAX_BYTES)) {
LOG_VERBOSE(TAG_FONT, F("FreeType v%d.%d.%d " D_SERVICE_STARTED), FREETYPE_MAJOR, FREETYPE_MINOR, LOG_VERBOSE(TAG_FONT, F("FreeType v%d.%d.%d " D_SERVICE_STARTED), FREETYPE_MAJOR, FREETYPE_MINOR,
@ -264,6 +250,9 @@ static inline void gui_init_freetype()
} else { } else {
LOG_ERROR(TAG_FONT, F("FreeType " D_SERVICE_START_FAILED)); LOG_ERROR(TAG_FONT, F("FreeType " D_SERVICE_START_FAILED));
} }
#else
LOG_VERBOSE(TAG_FONT, F("FreeType " D_SERVICE_DISABLED));
#endif
#elif defined(WINDOWS) || defined(POSIX) #elif defined(WINDOWS) || defined(POSIX)
#else #else
@ -297,6 +286,7 @@ void guiSetup()
{ {
// Initialize hardware drivers // Initialize hardware drivers
gui_init_tft(); gui_init_tft();
haspDevice.show_info(); // debug info + preload app flash size
// Initialize LVGL // Initialize LVGL
LOG_TRACE(TAG_LVGL, F(D_SERVICE_STARTING)); LOG_TRACE(TAG_LVGL, F(D_SERVICE_STARTING));

20
src/hasplib.h
View File

@ -29,3 +29,23 @@
#include "hasp/lv_theme_hasp.h" #include "hasp/lv_theme_hasp.h"
#include "ArduinoJson.h" #include "ArduinoJson.h"
#if HASP_USE_FREETYPE > 0
#include "lv_freetype.h"
#endif
#if HASP_USE_PNGDECODE > 0
#include "lv_png.h"
#endif
#if HASP_USE_BMPDECODE > 0
#include "lv_bmp.h"
#endif
#if HASP_USE_GIFDECODE > 0
#include "lv_gif.h"
#endif
#if HASP_USE_JPGDECODE > 0
#include "lv_sjpg.h"
#endif