Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

move lv_fonts from lv_misc next to lv_misc

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-07-07 12:21:36 +02:00
parent 90679c2cf5
commit a6ee4a680c
69 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lv_core/lv_group.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_core/lv_obj.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_core/lv_vdb.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_draw/lv_draw.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

6
lv_draw/lv_draw_arc.c
View File

@ -70,15 +70,11 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
if(start_angle <= end_angle) deg_test = deg_test_norm;
else deg_test = deg_test_inv;
// Good, may not be the fastest
// Does not draw overlapping pixels
if(deg_test(270, start_angle, end_angle)) hor_line(center_x - r_out + 1, center_y, mask, thickness - 1, color, opa); // Left Middle
if(deg_test(90, start_angle, end_angle)) hor_line(center_x + r_in, center_y, mask, thickness - 1, color, opa); // Right Middle
if(deg_test(180, start_angle, end_angle)) ver_line(center_x, center_y - r_out + 1, mask, thickness - 1, color, opa); // Top Middle
if(deg_test(0, start_angle, end_angle)) ver_line(center_x, center_y + r_in, mask, thickness - 1, color, opa); // Bottom middle
lv_point_t last_corner_out = { -r_out, -r_out};
uint32_t r_out_sqr = r_out * r_out;
uint32_t r_in_sqr = r_in * r_in;
int16_t xi;
@ -153,7 +149,7 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, cons
#if LV_ANTIALIAS
/*TODO*/
#endif

2
lv_draw/lv_draw_rbasic.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_draw/lv_draw_vbasic.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_misc/lv_fonts/lv_font_dejavu_10.c → lv_fonts/lv_font_dejavu_10.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_10 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_10_cyrillic.c → lv_fonts/lv_font_dejavu_10_cyrillic.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_10_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_10_latin_sup.c → lv_fonts/lv_font_dejavu_10_latin_sup.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_10_LATIN_SUP != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_20.c → lv_fonts/lv_font_dejavu_20.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_20 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_20_cyrillic.c → lv_fonts/lv_font_dejavu_20_cyrillic.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_20_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_20_latin_sup.c → lv_fonts/lv_font_dejavu_20_latin_sup.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_20_LATIN_SUP != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_30.c → lv_fonts/lv_font_dejavu_30.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_30 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_30_cyrillic.c → lv_fonts/lv_font_dejavu_30_cyrillic.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_30_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_30_latin_sup.c → lv_fonts/lv_font_dejavu_30_latin_sup.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_30_LATIN_SUP != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_40.c → lv_fonts/lv_font_dejavu_40.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_40 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_40_cyrillic.c → lv_fonts/lv_font_dejavu_40_cyrillic.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_40_CYRILLIC != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_dejavu_40_latin_sup.c → lv_fonts/lv_font_dejavu_40_latin_sup.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_DEJAVU_40_LATIN_SUP != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_symbol_10.c → lv_fonts/lv_font_symbol_10.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_SYMBOL_10 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_symbol_20.c → lv_fonts/lv_font_symbol_20.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_SYMBOL_20 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_symbol_30.c → lv_fonts/lv_font_symbol_30.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_SYMBOL_30 != 0 /*Can be enabled in lv_conf.h*/

2
lv_misc/lv_fonts/lv_font_symbol_40.c → lv_fonts/lv_font_symbol_40.c
View File

@ -1,5 +1,5 @@
#include "../lv_font.h"
#include "../lv_misc/lv_font.h"
#if USE_LV_FONT_SYMBOL_40 != 0 /*Can be enabled in lv_conf.h*/

6
lv_misc/lv_fonts/lv_fonts.mk → lv_fonts/lv_fonts.mk
View File

@ -15,7 +15,7 @@ CSRCS += lv_font_symbol_20.c
CSRCS += lv_font_symbol_30.c
CSRCS += lv_font_symbol_40.c
DEPPATH += --dep-path lvgl/lv_misc/lv_fonts
VPATH += :lvgl/lv_misc/lv_fonts
DEPPATH += --dep-path lvgl/lv_fonts
VPATH += :lvgl/lv_fonts
CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_misc/lv_fonts"
CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_fonts"

2
lv_hal/lv_hal_tick.c
View File

@ -6,7 +6,7 @@
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_misc/lv_anim.h
View File

@ -14,7 +14,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_misc/lv_color.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

12
lv_misc/lv_font.h
View File

@ -14,7 +14,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"
@ -24,7 +24,7 @@ extern "C" {
#include <stddef.h>
#include <stdbool.h>
#include "lv_fonts/lv_symbol_def.h"
#include "../lv_misc/lv_symbol_def.h"
/*********************
* DEFINES
@ -102,6 +102,14 @@ const uint8_t * lv_font_get_bitmap(const lv_font_t * font_p, uint32_t letter);
uint8_t lv_font_get_width(const lv_font_t * font_p, uint32_t letter);
/**
* Get the width of the letter without overwriting it with the `monospace` attribute
* @param font_p pointer to a font
* @param letter an UNICODE character code
* @return the width of a letter
*/
uint8_t lv_font_get_real_width(const lv_font_t * font_p, uint32_t letter);
/**
* Get the height of a font
* @param font_p pointer to a font

2
lv_misc/lv_log.c
View File

@ -10,7 +10,7 @@
#if USE_LV_LOG
#if LV_LOG_PRINTF
#include <string.h>
#include <stdio.h>
#endif
/*********************
* DEFINES

2
lv_misc/lv_mem.h
View File

@ -14,7 +14,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

1
lv_misc/lv_misc.mk
View File

@ -10,6 +10,7 @@ CSRCS += lv_color.c
CSRCS += lv_txt.c
CSRCS += lv_ufs.c
CSRCS += lv_math.c
CSRCS += lv_log.c
DEPPATH += --dep-path lvgl/lv_misc
VPATH += :lvgl/lv_misc

7
lv_misc/lv_fonts/lv_symbol_def.h → lv_misc/lv_symbol_def.h
View File

@ -4,8 +4,11 @@
#ifdef __cplusplus
extern "C" {
#endif
#include "../../../lv_conf.h"
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"
#endif
/*
* With no UTF-8 support (192-255)

2
lv_misc/lv_task.h
View File

@ -14,7 +14,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_misc/lv_txt.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_misc/lv_ufs.h
View File

@ -15,7 +15,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_bar.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_btn.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_btnm.h
View File

@ -14,7 +14,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_cb.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_chart.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_cont.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_ddlist.c
View File

@ -14,7 +14,7 @@
#include "../lv_core/lv_group.h"
#include "../lv_core/lv_indev.h"
#include "../lv_themes/lv_theme.h"
#include "../lv_misc/lv_fonts/lv_symbol_def.h"
#include "../lv_misc/lv_symbol_def.h"
#include "../lv_misc/lv_anim.h"
/*********************

2
lv_objx/lv_ddlist.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_gauge.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

4
lv_objx/lv_img.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"
@ -23,7 +23,7 @@ extern "C" {
#include "../lv_core/lv_obj.h"
#include "../lv_misc/lv_fs.h"
#include "../lv_misc/lv_fonts/lv_symbol_def.h"
#include "../lv_misc/lv_symbol_def.h"
#include "lv_label.h"
#include "../lv_draw/lv_draw.h"

2
lv_objx/lv_kb.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

4
lv_objx/lv_label.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"
@ -24,7 +24,7 @@ extern "C" {
#include "../lv_core/lv_obj.h"
#include "../lv_misc/lv_font.h"
#include "../lv_misc/lv_txt.h"
#include "../lv_misc/lv_fonts/lv_symbol_def.h"
#include "../lv_misc/lv_symbol_def.h"
/*********************
* DEFINES

2
lv_objx/lv_led.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_line.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_list.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_lmeter.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_mbox.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_objx.mk
View File

@ -5,7 +5,7 @@ CSRCS += lv_ddlist.c
CSRCS += lv_kb.c
CSRCS += lv_line.c
CSRCS += lv_mbox.c
CSRCS += lv_preloader.c
CSRCS += lv_preload.c
CSRCS += lv_roller.c
CSRCS += lv_tabview.c
CSRCS += lv_btn.c

2
lv_objx/lv_objx_templ.h
View File

@ -21,7 +21,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_page.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_roller.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_slider.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_sw.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_ta.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_tabview.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_objx/lv_win.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_alien.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_default.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_material.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_mono.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_night.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_templ.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"

2
lv_themes/lv_theme_zen.h
View File

@ -13,7 +13,7 @@ extern "C" {
/*********************
* INCLUDES
*********************/
#if LV_CONF_INCLUDE_SIMPLE
#ifdef LV_CONF_INCLUDE_SIMPLE
#include "lv_conf.h"
#else
#include "../../lv_conf.h"