From 91b788dc57626e89534068b1179c04a6d0affe56 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 8 Dec 2017 08:59:37 +0100 Subject: [PATCH] minor fixes --- lv_conf_templ.h | 4 ++-- lv_misc/lv_fonts/dejavu_40.h | 2 +- lv_misc/lv_fonts/dejavu_40_cyrillic.h | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_a.h | 2 +- lv_misc/lv_fonts/dejavu_40_latin_ext_b.h | 2 +- lv_misc/lv_fonts/dejavu_40_sup.h | 2 +- lv_misc/lv_fonts/symbol_40_basic.c | 2 +- lv_misc/lv_fonts/symbol_40_basic.h | 2 +- lv_misc/lv_fonts/symbol_40_feedback.c | 2 +- lv_misc/lv_fonts/symbol_40_feedback.h | 2 +- lv_misc/lv_fonts/symbol_40_file.c | 2 +- lv_misc/lv_fonts/symbol_40_file.h | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lv_conf_templ.h b/lv_conf_templ.h index b5af79455..594c3d015 100644 --- a/lv_conf_templ.h +++ b/lv_conf_templ.h @@ -73,11 +73,11 @@ #define LV_TXT_UTF8 1 #define LV_TXT_BREAK_CHARS " ,.;:-_" /*Can break texts on these chars*/ -/*Graphics feature usage*/ +/*Feature usage*/ #define USE_LV_ANIMATION 1 /*1: disable all animations*/ #define USE_LV_SHADOW 1 /*1: disable shadows*/ #define USE_LV_GROUP 1 /*1: Enable object groups (for keyboards)*/ -#define USE_LV_GPU 0 /*1: Enable GPU interface*/ +#define USE_LV_GPU 1 /*1: Enable GPU interface*/ #define USE_LV_FILESYSTEM 1 /*1: Enable file system (required by images aka. lv_img)*/ /*================== diff --git a/lv_misc/lv_fonts/dejavu_40.h b/lv_misc/lv_fonts/dejavu_40.h index a1ad18ce8..e289b0b2c 100644 --- a/lv_misc/lv_fonts/dejavu_40.h +++ b/lv_misc/lv_fonts/dejavu_40.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_DEJAVU_40 #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_40; diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.h b/lv_misc/lv_fonts/dejavu_40_cyrillic.h index f0c2a46aa..df2c5e0e4 100644 --- a/lv_misc/lv_fonts/dejavu_40_cyrillic.h +++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_DEJAVU_40_CYRILLIC #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_40_cyrillic; diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h index c23c18f3c..9b6ffa04a 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_A #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_40_latin_ext_a; diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h index 1e8cf2af0..4b4aa5d5b 100644 --- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h +++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_DEJAVU_40_LATIN_EXT_B #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_40_latin_ext_b; diff --git a/lv_misc/lv_fonts/dejavu_40_sup.h b/lv_misc/lv_fonts/dejavu_40_sup.h index 95e7cdeec..447434675 100644 --- a/lv_misc/lv_fonts/dejavu_40_sup.h +++ b/lv_misc/lv_fonts/dejavu_40_sup.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_DEJAVU_40_SUP #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_dejavu_40_sup; diff --git a/lv_misc/lv_fonts/symbol_40_basic.c b/lv_misc/lv_fonts/symbol_40_basic.c index 0befd35d1..a580d899d 100644 --- a/lv_misc/lv_fonts/symbol_40_basic.c +++ b/lv_misc/lv_fonts/symbol_40_basic.c @@ -612,7 +612,7 @@ static const uint8_t symbol_40_basic_width[] = lv_font_t lv_font_symbol_40_basic = { -#if LV_TXT_UTF8 == 0 +#if TXT_UTF8 == 0 192, /*First letter's unicode */ 207, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_40_basic.h b/lv_misc/lv_fonts/symbol_40_basic.h index ef38d54eb..e154ee86e 100644 --- a/lv_misc/lv_fonts/symbol_40_basic.h +++ b/lv_misc/lv_fonts/symbol_40_basic.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_SYMBOL_40_BASIC #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_40_basic; diff --git a/lv_misc/lv_fonts/symbol_40_feedback.c b/lv_misc/lv_fonts/symbol_40_feedback.c index bac209a63..1c82c9064 100644 --- a/lv_misc/lv_fonts/symbol_40_feedback.c +++ b/lv_misc/lv_fonts/symbol_40_feedback.c @@ -654,7 +654,7 @@ static const uint8_t symbol_40_feedback_width[] = lv_font_t lv_font_symbol_40_feedback = { -#if LV_TXT_UTF8 == 0 +#if TXT_UTF8 == 0 208, /*First letter's unicode */ 223, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_40_feedback.h b/lv_misc/lv_fonts/symbol_40_feedback.h index fdbf88a89..557d056dc 100644 --- a/lv_misc/lv_fonts/symbol_40_feedback.h +++ b/lv_misc/lv_fonts/symbol_40_feedback.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_SYMBOL_40_FEEDBACK #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_40_feedback; diff --git a/lv_misc/lv_fonts/symbol_40_file.c b/lv_misc/lv_fonts/symbol_40_file.c index aa472560e..c7d50a66e 100644 --- a/lv_misc/lv_fonts/symbol_40_file.c +++ b/lv_misc/lv_fonts/symbol_40_file.c @@ -908,7 +908,7 @@ static const uint8_t symbol_40_file_width[] = lv_font_t lv_font_symbol_40_file = { -#if LV_TXT_UTF8 == 0 +#if TXT_UTF8 == 0 224, /*First letter's unicode */ 255, /*Last letter's unicode */ #else diff --git a/lv_misc/lv_fonts/symbol_40_file.h b/lv_misc/lv_fonts/symbol_40_file.h index e21a88cad..e4e320744 100644 --- a/lv_misc/lv_fonts/symbol_40_file.h +++ b/lv_misc/lv_fonts/symbol_40_file.h @@ -7,7 +7,7 @@ #if USE_LV_FONT_SYMBOL_40_FILE #include -#include "lvgl/lv_misc/lv_font.h" +#include "../lv_font.h" extern lv_font_t lv_font_symbol_40_file;