jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set default HASP_LOG_LEVEL=LOG_LEVEL_TRACE

Browse Source
This commit is contained in:
fvanroie 2021-04-18 21:42:04 +02:00
parent 3a58762009
commit 208d352af4
4 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/hasp_macro.h
View File

@ -6,7 +6,7 @@
#else #else
#define LOG_OUTPUT(...) Log.output(...) #define LOG_OUTPUT(...) Log.output(...)
#if HASP_LOG_LEVEL > LOG_LEVEL_FATAL #if HASP_LOG_LEVEL >= LOG_LEVEL_FATAL
#define LOG_FATAL(...) \ #define LOG_FATAL(...) \
Log.fatal(__VA_ARGS__); \ Log.fatal(__VA_ARGS__); \
while(true) { \ while(true) { \
@ -17,49 +17,49 @@
} while(0) } while(0)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_ALERT #if HASP_LOG_LEVEL >= LOG_LEVEL_ALERT
#define LOG_ALERT(...) Log.alert(__VA_ARGS__) #define LOG_ALERT(...) Log.alert(__VA_ARGS__)
#else #else
#define LOG_ALERT(...) #define LOG_ALERT(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_CRITICAL #if HASP_LOG_LEVEL >= LOG_LEVEL_CRITICAL
#define LOG_CRITICAL(...) Log.critical(__VA_ARGS__) #define LOG_CRITICAL(...) Log.critical(__VA_ARGS__)
#else #else
#define LOG_CRITICAL(...) #define LOG_CRITICAL(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_ERROR #if HASP_LOG_LEVEL >= LOG_LEVEL_ERROR
#define LOG_ERROR(...) Log.error(__VA_ARGS__) #define LOG_ERROR(...) Log.error(__VA_ARGS__)
#else #else
#define LOG_ERROR(...) #define LOG_ERROR(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_WARNING #if HASP_LOG_LEVEL >= LOG_LEVEL_WARNING
#define LOG_WARNING(...) Log.warning(__VA_ARGS__) #define LOG_WARNING(...) Log.warning(__VA_ARGS__)
#else #else
#define LOG_WARNING(...) #define LOG_WARNING(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_INFO #if HASP_LOG_LEVEL >= LOG_LEVEL_INFO
#define LOG_INFO(...) Log.notice(__VA_ARGS__) #define LOG_INFO(...) Log.notice(__VA_ARGS__)
#else #else
#define LOG_INFO(...) #define LOG_INFO(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_TRACE #if HASP_LOG_LEVEL >= LOG_LEVEL_TRACE
#define LOG_TRACE(...) Log.trace(__VA_ARGS__) #define LOG_TRACE(...) Log.trace(__VA_ARGS__)
#else #else
#define LOG_TRACE(...) #define LOG_TRACE(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_VERBOSE #if HASP_LOG_LEVEL >= LOG_LEVEL_VERBOSE
#define LOG_VERBOSE(...) Log.verbose(__VA_ARGS__) #define LOG_VERBOSE(...) Log.verbose(__VA_ARGS__)
#else #else
#define LOG_VERBOSE(...) #define LOG_VERBOSE(...)
#endif #endif
#if HASP_LOG_LEVEL > LOG_LEVEL_DEBUG #if HASP_LOG_LEVEL >= LOG_LEVEL_DEBUG
#define LOG_DEBUG(...) Log.debug(__VA_ARGS__) #define LOG_DEBUG(...) Log.debug(__VA_ARGS__)
#else #else
#define LOG_DEBUG(...) #define LOG_DEBUG(...)

42
include/lv_comp_conf.h
View File

@ -1,42 +0,0 @@
/**
* @file lv_comp_conf.h
*
*/
/*
* COPY THIS FILE AS `lv_comp_conf.h` NEXT TO the `lvgl` FOLDER
*/
#if 1 /*Set it to "1" to enable content*/
#ifndef LV_COMP_CONF_H
#define LV_COMP_CONF_H
#define LV_USE_CALENDAR 1
#define LV_USE_CALENDAR_HEADER_ARROW 1
#define LV_USE_COLORWHEEL 1
#define LV_USE_KEYBOARD 1
#define LV_USE_LED 1
#define LV_LED_BRIGHT_MIN 0
#define LV_LED_BRIGHT_MAX 255
#define LV_USE_LIST 1
#define LV_USE_MSGBOX 1
#define LV_USE_SPINBOX 1
#define LV_USE_SPINNER 1
#define LV_USE_TABVIEW 1
#define LV_USE_TILEVIEW 1
#define LV_USE_WIN 1
#endif /*LV_COMP_CONF_H*/
#endif /*End of "Content enable"*/

2
platformio.ini
View File

@ -61,7 +61,7 @@ build_flags =
-D HASP_VER_MAJ=0 -D HASP_VER_MAJ=0
-D HASP_VER_MIN=5 -D HASP_VER_MIN=5
-D HASP_VER_REV=0 -D HASP_VER_REV=0
-D HASP_LOG_LEVEL=9 -D HASP_LOG_LEVEL=LOG_LEVEL_TRACE
${override.build_flags} ${override.build_flags}
; -- Shared library dependencies in all environments ; -- Shared library dependencies in all environments

4
src/hasp/hasp.cpp
View File

@ -136,15 +136,15 @@ bool hasp_update_sleep_state()
void hasp_enable_wakeup_touch() void hasp_enable_wakeup_touch()
{ {
LOG_VERBOSE(TAG_HASP, F("Wakeup touch enabled"));
lv_obj_set_click(lv_disp_get_layer_sys(NULL), true); // enable first touch lv_obj_set_click(lv_disp_get_layer_sys(NULL), true); // enable first touch
lv_obj_set_event_cb(lv_disp_get_layer_sys(NULL), wakeup_event_handler); lv_obj_set_event_cb(lv_disp_get_layer_sys(NULL), wakeup_event_handler);
LOG_INFO(TAG_HASP, F("Wakeup touch enabled"));
} }
void hasp_disable_wakeup_touch() void hasp_disable_wakeup_touch()
{ {
LOG_VERBOSE(TAG_HASP, F("Wakeup touch disabled"));
lv_obj_set_click(lv_disp_get_layer_sys(NULL), false); // disable first touch lv_obj_set_click(lv_disp_get_layer_sys(NULL), false); // disable first touch
LOG_INFO(TAG_HASP, F("Wakeup touch disabled"));
} }
/** /**