Skip to content

Commit a00a8d3

Browse files
committed
Remove new font, draw with lvgl
1 parent b9786dd commit a00a8d3

File tree

5 files changed

+2
-17
lines changed

5 files changed

+2
-17
lines changed

src/displayapp/DisplayApp.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "displayapp/screens/Weather.h"
3131
#include "displayapp/screens/PassKey.h"
3232
#include "displayapp/screens/Error.h"
33-
#include "displayapp/screens/Symbols.h"
3433

3534
#include "drivers/Cst816s.h"
3635
#include "drivers/St7789.h"

src/displayapp/fonts/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
2-
jetbrains_mono_extrabold_compressed lv_font_sys_48 lv_font_sys_80
2+
jetbrains_mono_extrabold_compressed lv_font_sys_48
33
open_sans_light fontawesome_weathericons)
44
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
55
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")

src/displayapp/fonts/fonts.json

-10
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,6 @@
6464
"bpp": 1,
6565
"size": 48
6666
},
67-
"lv_font_sys_80": {
68-
"sources": [
69-
{
70-
"file": "material-design-icons/MaterialIcons-Regular.ttf",
71-
"range": "0xe897"
72-
}
73-
],
74-
"bpp": 1,
75-
"size": 80
76-
},
7767
"fontawesome_weathericons": {
7868
"sources": [
7969
{

src/displayapp/screens/Symbols.h

-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ namespace Pinetime {
6464

6565
static constexpr const char* flashlight = "\xEF\x80\x8B";
6666
static constexpr const char* paintbrushLg = "\xEE\x90\x8A";
67-
68-
// wake-up screenlock icon, from material icons
69-
static constexpr const char* lock = "\xEE\xA2\x97";
7067
}
7168
}
7269
}

src/libs/lv_conf.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
419419
LV_FONT_DECLARE(jetbrains_mono_76) \
420420
LV_FONT_DECLARE(open_sans_light) \
421421
LV_FONT_DECLARE(fontawesome_weathericons) \
422-
LV_FONT_DECLARE(lv_font_sys_48) \
423-
LV_FONT_DECLARE(lv_font_sys_80)
422+
LV_FONT_DECLARE(lv_font_sys_48)
424423

425424
/* Enable it if you have fonts with a lot of characters.
426425
* The limit depends on the font size, font face and bpp

0 commit comments

Comments
 (0)