Refactored everything.

include/display/lv_fonts/lv_font_builtin.h

@@ -0,0 +1,150 @@
+/**
+ * @file lv_font_builtin.h
+ *
+ */
+
+#ifndef LV_FONT_BUILTIN_H
+#define LV_FONT_BUILTIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *     INCLUDES
+ *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "display/lv_conf.h"
+#endif
+
+#include "display/lv_misc/lv_font.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Initialize the built-in fonts
+ */
+void lv_font_builtin_init(void);
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *  FONT DECLARATIONS
+ **********************/
+
+/*10 px */
+#if USE_LV_FONT_DEJAVU_10
+LV_FONT_DECLARE(lv_font_dejavu_10);
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_10_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_10_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_10_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_10
+LV_FONT_DECLARE(lv_font_symbol_10);
+#endif
+
+/*20 px */
+#if USE_LV_FONT_DEJAVU_20
+LV_FONT_DECLARE(lv_font_dejavu_20);
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_20_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_20_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_20_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_20
+LV_FONT_DECLARE(lv_font_symbol_20);
+#endif
+
+/*30 px */
+#if USE_LV_FONT_DEJAVU_30
+LV_FONT_DECLARE(lv_font_dejavu_30);
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_30_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_30_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_30_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_30
+LV_FONT_DECLARE(lv_font_symbol_30);
+#endif
+
+/*40 px */
+#if USE_LV_FONT_DEJAVU_40
+LV_FONT_DECLARE(lv_font_dejavu_40);
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_LATIN_SUP
+LV_FONT_DECLARE(lv_font_dejavu_40_latin_sup);
+#endif
+
+#if USE_LV_FONT_DEJAVU_40_CYRILLIC
+LV_FONT_DECLARE(lv_font_dejavu_40_cyrillic);
+#endif
+
+#if USE_LV_FONT_SYMBOL_40
+LV_FONT_DECLARE(lv_font_symbol_40);
+#endif
+
+#if USE_LV_FONT_MONOSPACE_8
+LV_FONT_DECLARE(lv_font_monospace_8);
+#endif
+
+#if USE_PROS_FONT_DEJAVU_MONO_10
+LV_FONT_DECLARE(pros_font_dejavu_mono_10);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_10_LATIN_SUP
+LV_FONT_DECLARE(pros_font_dejavu_mono_10_latin_sup);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_20
+LV_FONT_DECLARE(pros_font_dejavu_mono_20);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_20_LATIN_SUP
+LV_FONT_DECLARE(pros_font_dejavu_mono_20_latin_sup);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_30
+LV_FONT_DECLARE(pros_font_dejavu_mono_30);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_30_LATIN_SUP
+LV_FONT_DECLARE(pros_font_dejavu_mono_30_latin_sup);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_40
+LV_FONT_DECLARE(pros_font_dejavu_mono_40);
+#endif
+#if USE_PROS_FONT_DEJAVU_MONO_40_LATIN_SUP
+LV_FONT_DECLARE(pros_font_dejavu_mono_40_latin_sup);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_FONT_BUILTIN_H*/

include/display/lv_fonts/lv_fonts.mk

@@ -0,0 +1,23 @@
+CSRCS += lv_font_builtin.c
+CSRCS += lv_font_dejavu_10.c
+CSRCS += lv_font_dejavu_20.c
+CSRCS += lv_font_dejavu_30.c
+CSRCS += lv_font_dejavu_40.c
+CSRCS += lv_font_dejavu_10_cyrillic.c
+CSRCS += lv_font_dejavu_20_cyrillic.c
+CSRCS += lv_font_dejavu_30_cyrillic.c
+CSRCS += lv_font_dejavu_40_cyrillic.c
+CSRCS += lv_font_dejavu_10_latin_sup.c
+CSRCS += lv_font_dejavu_20_latin_sup.c
+CSRCS += lv_font_dejavu_30_latin_sup.c
+CSRCS += lv_font_dejavu_40_latin_sup.c
+CSRCS += lv_font_symbol_10.c
+CSRCS += lv_font_symbol_20.c
+CSRCS += lv_font_symbol_30.c
+CSRCS += lv_font_symbol_40.c
+CSRCS += lv_font_monospace_8.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_fonts
+VPATH += :$(LVGL_DIR)/lvgl/lv_fonts
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_fonts"