From 2de1f4363c6b6d48856d54daddc9ca3adb3c83ac Mon Sep 17 00:00:00 2001 From: Gabor Date: Mon, 16 Jan 2017 13:53:39 +0100 Subject: [PATCH] symbols: define the simbols in symbol_def.h instead of font.h --- lv_misc/font.h | 28 ---------------------------- lv_misc/fonts/symbol_def.h | 4 +--- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/lv_misc/font.h b/lv_misc/font.h index 72a474c6f..50755e401 100644 --- a/lv_misc/font.h +++ b/lv_misc/font.h @@ -16,34 +16,6 @@ /********************* * DEFINES *********************/ -#if USE_FONT_SYMBOL_30 || USE_FONT_SYMBOL_60 -#define SYMBOL_DRIVE "a" -#define SYMBOL_FILE "b" -#define SYMBOL_FOLDER "c" -#define SYMBOL_DELETE "d" -#define SYMBOL_SAVE "e" -#define SYMBOL_EDIT "f" -#define SYMBOL_OK "g" -#define SYMBOL_CLOSE "h" -#define SYMBOL_DOWN "i" -#define SYMBOL_LEFT "j" -#define SYMBOL_RIGHT "k" -#define SYMBOL_UP "l" -#define SYMBOL_BT "m" -#define SYMBOL_THERM "n" -#define SYMBOL_GPS "o" -#define SYMBOL_WARN "p" -#define SYMBOL_INFO "q" -#define SYMBOL_BATT1 "r" -#define SYMBOL_BATT2 "s" -#define SYMBOL_BATT3 "t" -#define SYMBOL_BATT4 "u" -#define SYMBOL_BATTCH "v" -#define SYMBOL_HELP "w" -#define SYMBOL_POWER "x" -#define SYMBOL_SETUP "y" -#define SYMBOL_WIFI "z" -#endif /********************** * TYPEDEFS diff --git a/lv_misc/fonts/symbol_def.h b/lv_misc/fonts/symbol_def.h index 6d9ae9637..aad1df986 100644 --- a/lv_misc/fonts/symbol_def.h +++ b/lv_misc/fonts/symbol_def.h @@ -4,10 +4,8 @@ /*Use ISO8859-1 encoding in the IDE*/ #include "lv_conf.h" -#if USE_FONT_SYMBOL_30 != 0 +#if USE_FONT_SYMBOL_30 != 0 || USE_FONT_SYMBOL_60 != 0 -#include -#include "../font.h" #define SYMBOL_DRIVE "a" #define SYMBOL_FILE "b"