Skip to content

Commit

Permalink
fixup!
Browse files Browse the repository at this point in the history
  • Loading branch information
salkinium committed Apr 5, 2021
1 parent 73c47c5 commit f0c2660
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
7 changes: 5 additions & 2 deletions examples/nucleo_l452re/lvgl/lv_conf_local.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@
#define LV_COLOR_DEPTH 16

// Enable logging at INFO level
#define LV_USE_LOG 1
#define LV_USE_LOG 1
#define LV_LOG_LEVEL LV_LOG_LEVEL_INFO

// Enable a bigger font
#define LV_FONT_MONTSERRAT_36 1
#define LV_FONT_MONTSERRAT_36 1

// Disable anti-aliasing
#define LV_ANTIALIAS 0
4 changes: 4 additions & 0 deletions examples/stm32f469_discovery/lvgl/lv_conf_local.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

#ifndef LV_CONF_H
# error "Don't include this file directly, use 'lv_conf.h' instead!"
#endif

// Maximal resolutions
#define LV_HOR_RES_MAX 800
#define LV_VER_RES_MAX 480
Expand Down
12 changes: 7 additions & 5 deletions ext/lvgl/lv_conf.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,27 @@ typedef int16_t lv_coord_t;
*=========================*/

/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */
#define LV_MEM_CUSTOM 1
#define LV_MEM_CUSTOM 1

/*===================
* HAL settings
*==================*/

/* 1: use a custom tick source.
* It removes the need to manually update the tick with `lv_tick_inc`) */
#define LV_TICK_CUSTOM 1
#define LV_TICK_CUSTOM_INCLUDE <lv_modm_clock.h> /*Header for the system time function*/
#define LV_TICK_CUSTOM_SYS_TIME_EXPR (lv_modm_clock_now()) /*Expression evaluating to current system time in ms*/
#define LV_TICK_CUSTOM 1
/*Header for the system time function*/
#define LV_TICK_CUSTOM_INCLUDE <lv_modm_clock.h>
/*Expression evaluating to current system time in ms*/
#define LV_TICK_CUSTOM_SYS_TIME_EXPR (lv_modm_clock_now())

/*================
* Log settings
*===============*/

/* 1: Print the log with 'printf';
* 0: user need to register a callback with `lv_log_register_print_cb`*/
# define LV_LOG_PRINTF 0
#define LV_LOG_PRINTF 0

/*--END OF LV_CONF_H--*/

Expand Down

0 comments on commit f0c2660

Please sign in to comment.