regenerate the fonts

2017-12-08 15:56:01 +01:00
parent 4138785a4e
commit 7fb2974259
43 changed files with 43 additions and 43 deletions
--- a/lv_misc/lv_fonts/dejavu_10.h
+++ b/lv_misc/lv_fonts/dejavu_10.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_10

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_10;

--- a/lv_misc/lv_fonts/dejavu_10_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_10_CYRILLIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_10_cyrillic;

--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_A

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_10_latin_ext_a;

--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_10_LATIN_EXT_B

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_10_latin_ext_b;

--- a/lv_misc/lv_fonts/dejavu_10_sup.h
+++ b/lv_misc/lv_fonts/dejavu_10_sup.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_10_SUP

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_10_sup;

--- a/lv_misc/lv_fonts/dejavu_20.h
+++ b/lv_misc/lv_fonts/dejavu_20.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_20

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_20;

--- a/lv_misc/lv_fonts/dejavu_20_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_20_CYRILLIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_20_cyrillic;

--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_A

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_20_latin_ext_a;

--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_20_LATIN_EXT_B

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_20_latin_ext_b;

--- a/lv_misc/lv_fonts/dejavu_20_sup.h
+++ b/lv_misc/lv_fonts/dejavu_20_sup.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_20_SUP

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_20_sup;

--- a/lv_misc/lv_fonts/dejavu_30.h
+++ b/lv_misc/lv_fonts/dejavu_30.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_30

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_30;

--- a/lv_misc/lv_fonts/dejavu_30_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_30_CYRILLIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_30_cyrillic;

--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_A

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_30_latin_ext_a;

--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_30_LATIN_EXT_B

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_30_latin_ext_b;

--- a/lv_misc/lv_fonts/dejavu_30_sup.h
+++ b/lv_misc/lv_fonts/dejavu_30_sup.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_30_SUP

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_30_sup;

--- a/lv_misc/lv_fonts/dejavu_60.h
+++ b/lv_misc/lv_fonts/dejavu_60.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_60

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_60;

--- a/lv_misc/lv_fonts/dejavu_60_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_60_CYRILLIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_60_cyrillic;

--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_A

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_60_latin_ext_a;

--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_60_LATIN_EXT_B

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_60_latin_ext_b;

--- a/lv_misc/lv_fonts/dejavu_60_sup.h
+++ b/lv_misc/lv_fonts/dejavu_60_sup.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_60_SUP

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_60_sup;

--- a/lv_misc/lv_fonts/dejavu_80.h
+++ b/lv_misc/lv_fonts/dejavu_80.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_80

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_80;

--- a/lv_misc/lv_fonts/dejavu_80_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_80_CYRILLIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_80_cyrillic;

--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_A

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_80_latin_ext_a;

--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_80_LATIN_EXT_B

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_80_latin_ext_b;

--- a/lv_misc/lv_fonts/dejavu_80_sup.h
+++ b/lv_misc/lv_fonts/dejavu_80_sup.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_DEJAVU_80_SUP

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_dejavu_80_sup;

--- a/lv_misc/lv_fonts/symbol_10_basic.h
+++ b/lv_misc/lv_fonts/symbol_10_basic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_10_BASIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_10_basic;

--- a/lv_misc/lv_fonts/symbol_10_feedback.h
+++ b/lv_misc/lv_fonts/symbol_10_feedback.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_10_FEEDBACK

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_10_feedback;

--- a/lv_misc/lv_fonts/symbol_10_file.h
+++ b/lv_misc/lv_fonts/symbol_10_file.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_10_FILE

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_10_file;

--- a/lv_misc/lv_fonts/symbol_20_basic.h
+++ b/lv_misc/lv_fonts/symbol_20_basic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_20_BASIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_20_basic;

--- a/lv_misc/lv_fonts/symbol_20_feedback.h
+++ b/lv_misc/lv_fonts/symbol_20_feedback.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_20_FEEDBACK

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_20_feedback;

--- a/lv_misc/lv_fonts/symbol_20_file.h
+++ b/lv_misc/lv_fonts/symbol_20_file.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_20_FILE

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_20_file;

--- a/lv_misc/lv_fonts/symbol_30_basic.h
+++ b/lv_misc/lv_fonts/symbol_30_basic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_30_BASIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_30_basic;

--- a/lv_misc/lv_fonts/symbol_30_feedback.h
+++ b/lv_misc/lv_fonts/symbol_30_feedback.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_30_FEEDBACK

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_30_feedback;

--- a/lv_misc/lv_fonts/symbol_30_file.h
+++ b/lv_misc/lv_fonts/symbol_30_file.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_30_FILE

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_30_file;

--- 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 TXT_UTF8 == 0
+#if LV_TXT_UTF8 == 0
    192,        /*First letter's unicode */
    207,        /*Last letter's unicode */
 #else
--- 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 TXT_UTF8 == 0
+#if LV_TXT_UTF8 == 0
    208,        /*First letter's unicode */
    223,        /*Last letter's unicode */
 #else
--- 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 TXT_UTF8 == 0
+#if LV_TXT_UTF8 == 0
    224,        /*First letter's unicode */
    255,        /*Last letter's unicode */
 #else
--- a/lv_misc/lv_fonts/symbol_60_basic.h
+++ b/lv_misc/lv_fonts/symbol_60_basic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_60_BASIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_60_basic;

--- a/lv_misc/lv_fonts/symbol_60_feedback.h
+++ b/lv_misc/lv_fonts/symbol_60_feedback.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_60_FEEDBACK

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_60_feedback;

--- a/lv_misc/lv_fonts/symbol_60_file.h
+++ b/lv_misc/lv_fonts/symbol_60_file.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_60_FILE

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_60_file;

--- a/lv_misc/lv_fonts/symbol_80_basic.h
+++ b/lv_misc/lv_fonts/symbol_80_basic.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_80_BASIC

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_80_basic;

--- a/lv_misc/lv_fonts/symbol_80_feedback.h
+++ b/lv_misc/lv_fonts/symbol_80_feedback.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_80_FEEDBACK

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_80_feedback;

--- a/lv_misc/lv_fonts/symbol_80_file.h
+++ b/lv_misc/lv_fonts/symbol_80_file.h
@@ -7,7 +7,7 @@
 #if USE_LV_FONT_SYMBOL_80_FILE

 #include <stdint.h>
-#include "lvgl/lv_misc/lv_font.h"
+#include "../lv_font.h"

 extern lv_font_t lv_font_symbol_80_file;