mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
Remove new font, draw with lvgl
This commit is contained in:
parent
0954e3b2b0
commit
2a8e953cb6
|
@ -30,7 +30,6 @@
|
||||||
#include "displayapp/screens/Weather.h"
|
#include "displayapp/screens/Weather.h"
|
||||||
#include "displayapp/screens/PassKey.h"
|
#include "displayapp/screens/PassKey.h"
|
||||||
#include "displayapp/screens/Error.h"
|
#include "displayapp/screens/Error.h"
|
||||||
#include "displayapp/screens/Symbols.h"
|
|
||||||
|
|
||||||
#include "drivers/Cst816s.h"
|
#include "drivers/Cst816s.h"
|
||||||
#include "drivers/St7789.h"
|
#include "drivers/St7789.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
|
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
|
||||||
jetbrains_mono_extrabold_compressed lv_font_sys_48 lv_font_sys_80
|
jetbrains_mono_extrabold_compressed lv_font_sys_48
|
||||||
open_sans_light fontawesome_weathericons)
|
open_sans_light fontawesome_weathericons)
|
||||||
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
|
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
|
||||||
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
|
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
|
||||||
|
|
|
@ -64,16 +64,6 @@
|
||||||
"bpp": 1,
|
"bpp": 1,
|
||||||
"size": 48
|
"size": 48
|
||||||
},
|
},
|
||||||
"lv_font_sys_80": {
|
|
||||||
"sources": [
|
|
||||||
{
|
|
||||||
"file": "material-design-icons/MaterialIcons-Regular.ttf",
|
|
||||||
"range": "0xe897"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"bpp": 1,
|
|
||||||
"size": 80
|
|
||||||
},
|
|
||||||
"fontawesome_weathericons": {
|
"fontawesome_weathericons": {
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -64,9 +64,6 @@ namespace Pinetime {
|
||||||
|
|
||||||
static constexpr const char* flashlight = "\xEF\x80\x8B";
|
static constexpr const char* flashlight = "\xEF\x80\x8B";
|
||||||
static constexpr const char* paintbrushLg = "\xEE\x90\x8A";
|
static constexpr const char* paintbrushLg = "\xEE\x90\x8A";
|
||||||
|
|
||||||
// wake-up screenlock icon, from material icons
|
|
||||||
static constexpr const char* lock = "\xEE\xA2\x97";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -419,8 +419,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
|
||||||
LV_FONT_DECLARE(jetbrains_mono_76) \
|
LV_FONT_DECLARE(jetbrains_mono_76) \
|
||||||
LV_FONT_DECLARE(open_sans_light) \
|
LV_FONT_DECLARE(open_sans_light) \
|
||||||
LV_FONT_DECLARE(fontawesome_weathericons) \
|
LV_FONT_DECLARE(fontawesome_weathericons) \
|
||||||
LV_FONT_DECLARE(lv_font_sys_48) \
|
LV_FONT_DECLARE(lv_font_sys_48)
|
||||||
LV_FONT_DECLARE(lv_font_sys_80)
|
|
||||||
|
|
||||||
/* Enable it if you have fonts with a lot of characters.
|
/* Enable it if you have fonts with a lot of characters.
|
||||||
* The limit depends on the font size, font face and bpp
|
* The limit depends on the font size, font face and bpp
|
||||||
|
|
Loading…
Reference in a new issue