diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 819ad072..3467013d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -479,8 +479,6 @@ list(APPEND SOURCE_FILES displayapp/LittleVgl.cpp displayapp/lv_pinetime_theme.c - displayapp/fonts/bebas_neue_120.c - displayapp/fonts/teko_28.c systemtask/SystemTask.cpp systemtask/SystemMonitor.cpp diff --git a/src/displayapp/fonts/BebasNeue-Regular.ttf b/src/displayapp/fonts/BebasNeue-Regular.ttf deleted file mode 100644 index 76e22b8b..00000000 Binary files a/src/displayapp/fonts/BebasNeue-Regular.ttf and /dev/null differ diff --git a/src/displayapp/fonts/BebasNeue_OFL.txt b/src/displayapp/fonts/BebasNeue_OFL.txt deleted file mode 100644 index da957148..00000000 --- a/src/displayapp/fonts/BebasNeue_OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright © 2010 by Dharma Type. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/displayapp/fonts/Teko-Light.ttf b/src/displayapp/fonts/Teko-Light.ttf deleted file mode 100644 index 679f0137..00000000 Binary files a/src/displayapp/fonts/Teko-Light.ttf and /dev/null differ diff --git a/src/displayapp/fonts/Teko_OFL.txt b/src/displayapp/fonts/Teko_OFL.txt deleted file mode 100644 index 6dd80965..00000000 --- a/src/displayapp/fonts/Teko_OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2014, Indian Type Foundry (info@indiantypefoundry.com). - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/displayapp/fonts/bebas_neue_120.c b/src/displayapp/fonts/bebas_neue_120.c deleted file mode 100644 index 3938a2e5..00000000 --- a/src/displayapp/fonts/bebas_neue_120.c +++ /dev/null @@ -1,659 +0,0 @@ -/******************************************************************************* - * Size: 120 px - * Bpp: 1 - * Opts: - ******************************************************************************/ - -#ifdef LV_LVGL_H_INCLUDE_SIMPLE -#include "lvgl.h" -#else -#include "lvgl/lvgl.h" -#endif - -#ifndef BEBAS_NEUE_120 -#define BEBAS_NEUE_120 1 -#endif - -#if BEBAS_NEUE_120 - -/*----------------- - * BITMAPS - *----------------*/ - -/*Store the image of the glyphs*/ -static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { - /* U+0030 "0" */ - 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xff, - 0xf8, 0x0, 0x0, 0x7f, 0xff, 0xfe, 0x0, 0x1, - 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, - 0xc0, 0x7, 0xff, 0xff, 0xff, 0xe0, 0xf, 0xff, - 0xff, 0xff, 0xf0, 0xf, 0xff, 0xff, 0xff, 0xf0, - 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, - 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x7f, - 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0x81, 0xff, - 0xfe, 0x7f, 0xfe, 0x0, 0x7f, 0xfe, 0x7f, 0xfc, - 0x0, 0x3f, 0xfe, 0xff, 0xfc, 0x0, 0x3f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xfc, - 0x0, 0x3f, 0xff, 0x7f, 0xfc, 0x0, 0x3f, 0xfe, - 0x7f, 0xfe, 0x0, 0x7f, 0xfe, 0x7f, 0xff, 0x81, - 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x3f, - 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, - 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0xf, 0xff, - 0xff, 0xff, 0xf0, 0xf, 0xff, 0xff, 0xff, 0xf0, - 0x7, 0xff, 0xff, 0xff, 0xe0, 0x3, 0xff, 0xff, - 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x0, - 0x7f, 0xff, 0xfe, 0x0, 0x0, 0x1f, 0xff, 0xf8, - 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, - - /* U+0031 "1" */ - 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x7, 0xfc, 0x0, - 0x1, 0xff, 0x80, 0x0, 0x3f, 0xf0, 0x0, 0xf, - 0xfe, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x7f, 0xf8, - 0x0, 0x1f, 0xff, 0x0, 0xf, 0xff, 0xe0, 0x3, - 0xff, 0xfc, 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3f, 0xfe, 0x0, - 0x7, 0xff, 0xc0, 0x0, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7f, 0xfc, - 0x0, 0xf, 0xff, 0x80, 0x1, 0xff, 0xf0, 0x0, - 0x3f, 0xfe, 0x0, 0x7, 0xff, 0xc0, 0x0, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0x0, 0x3, 0xff, 0xe0, - 0x0, 0x7f, 0xfc, 0x0, 0xf, 0xff, 0x80, 0x1, - 0xff, 0xf0, 0x0, 0x3f, 0xfe, 0x0, 0x7, 0xff, - 0xc0, 0x0, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0x0, - 0x3, 0xff, 0xe0, 0x0, 0x7f, 0xfc, 0x0, 0xf, - 0xff, 0x80, 0x1, 0xff, 0xf0, 0x0, 0x3f, 0xfe, - 0x0, 0x7, 0xff, 0xc0, 0x0, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7f, - 0xfc, 0x0, 0xf, 0xff, 0x80, 0x1, 0xff, 0xf0, - 0x0, 0x3f, 0xfe, 0x0, 0x7, 0xff, 0xc0, 0x0, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0x0, 0x3, 0xff, - 0xe0, 0x0, 0x7f, 0xfc, 0x0, 0xf, 0xff, 0x80, - 0x1, 0xff, 0xf0, 0x0, 0x3f, 0xfe, 0x0, 0x7, - 0xff, 0xc0, 0x0, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0x0, 0x3, 0xff, 0xe0, 0x0, 0x7f, 0xfc, 0x0, - 0xf, 0xff, 0x80, 0x1, 0xff, 0xf0, 0x0, 0x3f, - 0xfe, 0x0, 0x7, 0xff, 0xc0, 0x0, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0x0, 0x3, 0xff, 0xe0, 0x0, - 0x7f, 0xfc, 0x0, 0xf, 0xff, 0x80, 0x1, 0xff, - 0xf0, 0x0, 0x3f, 0xfe, 0x0, 0x7, 0xff, 0xc0, - 0x0, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0x0, 0x3, - 0xff, 0xe0, 0x0, 0x7f, 0xfc, 0x0, 0xf, 0xff, - 0x80, 0x1, 0xff, 0xf0, - - /* U+0032 "2" */ - 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, - 0xe0, 0x0, 0x1, 0xff, 0xff, 0xf0, 0x0, 0xf, - 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf8, - 0x0, 0xff, 0xff, 0xff, 0xf8, 0x3, 0xff, 0xff, - 0xff, 0xf8, 0xf, 0xff, 0xff, 0xff, 0xf8, 0x1f, - 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xff, 0xff, 0xff, - 0xf0, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff, 0xff, - 0xff, 0xff, 0xe7, 0xff, 0xf8, 0x3f, 0xff, 0xcf, - 0xff, 0xc0, 0x1f, 0xff, 0x9f, 0xff, 0x0, 0x1f, - 0xff, 0x7f, 0xfe, 0x0, 0x3f, 0xff, 0xff, 0xf8, - 0x0, 0x7f, 0xff, 0xff, 0xf0, 0x0, 0x7f, 0xff, - 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, 0xc0, 0x1, - 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, - 0x0, 0x7, 0xff, 0xff, 0xfe, 0x0, 0xf, 0xff, - 0xff, 0xfc, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x3f, 0xff, 0xff, 0xf0, 0x0, 0x7f, 0xff, 0xff, - 0xe0, 0x1, 0xff, 0xff, 0xff, 0xc0, 0x3, 0xff, - 0xef, 0xff, 0x80, 0x7, 0xff, 0xc0, 0x0, 0x0, - 0xf, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, 0x0, - 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x1, 0xff, - 0xf8, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, - 0xf, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xff, 0x80, - 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x1, 0xff, - 0xfc, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, - 0xf, 0xff, 0xc0, 0x0, 0x0, 0x3f, 0xff, 0x80, - 0x0, 0x0, 0xff, 0xfe, 0x0, 0x0, 0x1, 0xff, - 0xf8, 0x0, 0x0, 0x7, 0xff, 0xf0, 0x0, 0x0, - 0x1f, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xff, 0x0, - 0x0, 0x1, 0xff, 0xfc, 0x0, 0x0, 0x7, 0xff, - 0xf8, 0x0, 0x0, 0x1f, 0xff, 0xe0, 0x0, 0x0, - 0x7f, 0xff, 0x80, 0x0, 0x1, 0xff, 0xfe, 0x0, - 0x0, 0x3, 0xff, 0xf8, 0x0, 0x0, 0xf, 0xff, - 0xe0, 0x0, 0x0, 0x3f, 0xff, 0x80, 0x0, 0x0, - 0xff, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xf8, 0x0, - 0x0, 0x7, 0xff, 0xf0, 0x0, 0x0, 0x1f, 0xff, - 0xc0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, - 0xff, 0xfc, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, - 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0xf, 0xff, - 0x80, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, - 0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, - 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, - 0xc0, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0, - 0x1f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, - 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, - 0xf8, 0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff, - 0xfb, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, - 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xdf, - 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, - 0xff, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, - 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xfb, - 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, - 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xc0, - - /* U+0033 "3" */ - 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, - 0xe0, 0x0, 0x1, 0xff, 0xff, 0xf0, 0x0, 0xf, - 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf8, - 0x0, 0xff, 0xff, 0xff, 0xf8, 0x3, 0xff, 0xff, - 0xff, 0xf8, 0xf, 0xff, 0xff, 0xff, 0xf8, 0x1f, - 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xff, 0xff, 0xff, - 0xf0, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff, 0xff, - 0xff, 0xff, 0xe7, 0xff, 0xf8, 0x3f, 0xff, 0xcf, - 0xff, 0xc0, 0x1f, 0xff, 0x9f, 0xff, 0x0, 0x1f, - 0xff, 0x7f, 0xfe, 0x0, 0x3f, 0xff, 0xff, 0xf8, - 0x0, 0x3f, 0xff, 0xff, 0xf0, 0x0, 0x7f, 0xff, - 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, 0xc0, 0x1, - 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, - 0x0, 0x7, 0xff, 0xff, 0xfe, 0x0, 0xf, 0xff, - 0xff, 0xfc, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, - 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, - 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, - 0x7, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xff, 0x0, - 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0xff, - 0xfc, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, - 0xf, 0xff, 0xe0, 0x0, 0x3f, 0xff, 0xff, 0x80, - 0x0, 0x7f, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, - 0xf8, 0x0, 0x1, 0xff, 0xff, 0xe0, 0x0, 0x3, - 0xff, 0xff, 0x0, 0x0, 0x7, 0xff, 0xfc, 0x0, - 0x0, 0xf, 0xff, 0xfe, 0x0, 0x0, 0x1f, 0xff, - 0xfe, 0x0, 0x0, 0x3f, 0xff, 0xfe, 0x0, 0x0, - 0x7f, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, 0xfe, - 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0, 0x3, - 0xff, 0xfc, 0x0, 0x0, 0x1, 0xff, 0xfc, 0x0, - 0x0, 0x1, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, - 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, - 0x7, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, 0xc0, - 0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x1f, - 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, - 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, - 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x3, - 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, 0xff, 0xfe, - 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf0, 0x0, - 0x7f, 0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, - 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, - 0xff, 0xff, 0x0, 0xf, 0xff, 0xff, 0xff, 0x0, - 0x1f, 0xff, 0xbf, 0xfe, 0x0, 0x3f, 0xfe, 0x7f, - 0xfe, 0x0, 0xff, 0xfc, 0xff, 0xff, 0x7, 0xff, - 0xf9, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, - 0xff, 0xff, 0xc3, 0xff, 0xff, 0xff, 0xff, 0x83, - 0xff, 0xff, 0xff, 0xfe, 0x7, 0xff, 0xff, 0xff, - 0xfc, 0x7, 0xff, 0xff, 0xff, 0xf0, 0x7, 0xff, - 0xff, 0xff, 0xc0, 0x7, 0xff, 0xff, 0xff, 0x0, - 0x7, 0xff, 0xff, 0xfc, 0x0, 0x3, 0xff, 0xff, - 0xf0, 0x0, 0x1, 0xff, 0xff, 0x0, 0x0, 0x0, - 0x7f, 0xf0, 0x0, 0x0, - - /* U+0034 "4" */ - 0x0, 0x0, 0x0, 0xff, 0xfc, 0x0, 0x0, 0x0, - 0xf, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x7f, 0xff, - 0x0, 0x0, 0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, - 0x0, 0x3f, 0xff, 0xc0, 0x0, 0x0, 0x3, 0xff, - 0xfe, 0x0, 0x0, 0x0, 0x1f, 0xff, 0xf0, 0x0, - 0x0, 0x0, 0xff, 0xff, 0x80, 0x0, 0x0, 0xf, - 0xff, 0xfc, 0x0, 0x0, 0x0, 0x7f, 0xff, 0xe0, - 0x0, 0x0, 0x7, 0xff, 0xff, 0x0, 0x0, 0x0, - 0x3f, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xff, - 0xc0, 0x0, 0x0, 0x1f, 0xff, 0xfe, 0x0, 0x0, - 0x0, 0xff, 0xff, 0xf0, 0x0, 0x0, 0xf, 0xff, - 0xff, 0x80, 0x0, 0x0, 0x7f, 0xff, 0xfc, 0x0, - 0x0, 0x7, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x3f, - 0xff, 0xff, 0x0, 0x0, 0x1, 0xff, 0xff, 0xf8, - 0x0, 0x0, 0x1f, 0xff, 0xff, 0xc0, 0x0, 0x0, - 0xff, 0xff, 0xfe, 0x0, 0x0, 0xf, 0xff, 0xff, - 0xf0, 0x0, 0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, - 0x3, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x3f, 0xfb, - 0xff, 0xe0, 0x0, 0x1, 0xff, 0xdf, 0xff, 0x0, - 0x0, 0x1f, 0xfc, 0xff, 0xf8, 0x0, 0x0, 0xff, - 0xe7, 0xff, 0xc0, 0x0, 0xf, 0xff, 0x3f, 0xfe, - 0x0, 0x0, 0x7f, 0xf1, 0xff, 0xf0, 0x0, 0x3, - 0xff, 0x8f, 0xff, 0x80, 0x0, 0x3f, 0xf8, 0x7f, - 0xfc, 0x0, 0x1, 0xff, 0xc3, 0xff, 0xe0, 0x0, - 0x1f, 0xfe, 0x1f, 0xff, 0x0, 0x0, 0xff, 0xe0, - 0xff, 0xf8, 0x0, 0x7, 0xff, 0x7, 0xff, 0xc0, - 0x0, 0x7f, 0xf8, 0x3f, 0xfe, 0x0, 0x3, 0xff, - 0x81, 0xff, 0xf0, 0x0, 0x3f, 0xfc, 0xf, 0xff, - 0x80, 0x1, 0xff, 0xc0, 0x7f, 0xfc, 0x0, 0x1f, - 0xfe, 0x3, 0xff, 0xe0, 0x0, 0xff, 0xf0, 0x1f, - 0xff, 0x0, 0x7, 0xff, 0x0, 0xff, 0xf8, 0x0, - 0x7f, 0xf8, 0x7, 0xff, 0xc0, 0x3, 0xff, 0x80, - 0x3f, 0xfe, 0x0, 0x3f, 0xfc, 0x1, 0xff, 0xf0, - 0x1, 0xff, 0xe0, 0xf, 0xff, 0x80, 0xf, 0xfe, - 0x0, 0x7f, 0xfc, 0x0, 0xff, 0xf0, 0x3, 0xff, - 0xe0, 0x7, 0xff, 0x0, 0x1f, 0xff, 0x0, 0x7f, - 0xf8, 0x0, 0xff, 0xf8, 0x3, 0xff, 0xc0, 0x7, - 0xff, 0xc0, 0x3f, 0xfc, 0x0, 0x3f, 0xfe, 0x1, - 0xff, 0xe0, 0x1, 0xff, 0xf0, 0xf, 0xff, 0x0, - 0xf, 0xff, 0x80, 0xff, 0xf0, 0x0, 0x7f, 0xfc, - 0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x80, 0x0, 0x0, 0x3f, - 0xfe, 0x0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, - 0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x0, - 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x3, 0xff, 0xe0, - 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, - 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7, 0xff, - 0xc0, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, - 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xf, - 0xff, 0x80, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, - 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x0, - 0x1f, 0xff, 0x0, 0x0, 0x0, 0x0, 0xff, 0xf8, - 0x0, - - /* U+0035 "5" */ - 0x3f, 0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, - 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xff, - 0xff, 0xff, 0xff, 0xc3, 0xff, 0xff, 0xff, 0xff, - 0x87, 0xff, 0xff, 0xff, 0xff, 0xf, 0xff, 0xff, - 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x3f, - 0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, - 0xf0, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, - 0xff, 0xff, 0xc3, 0xff, 0xc0, 0x0, 0x0, 0x7, - 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, - 0x0, 0x1f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfc, - 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0, 0x1, - 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, - 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, - 0x80, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, - 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, - 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, - 0xf0, 0x1f, 0xe0, 0x3, 0xff, 0xe0, 0xff, 0xf8, - 0x7, 0xff, 0xc7, 0xff, 0xf8, 0xf, 0xff, 0x9f, - 0xff, 0xf8, 0x1f, 0xff, 0x7f, 0xff, 0xf8, 0x3f, - 0xfe, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff, - 0xf0, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, - 0xff, 0xff, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xe7, - 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, - 0xff, 0xbf, 0xff, 0xe0, 0xff, 0xff, 0x7f, 0xff, - 0x0, 0x7f, 0xff, 0xff, 0xfc, 0x0, 0x7f, 0xff, - 0xff, 0xf8, 0x0, 0xff, 0xff, 0xff, 0xe0, 0x0, - 0xff, 0xff, 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, - 0x80, 0x3, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, - 0xff, 0xfe, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, - 0x1f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, - 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, - 0xf8, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, - 0x3, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, 0xc0, - 0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x1f, - 0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xf0, - 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, - 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x3, - 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, 0xff, 0xfe, - 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xf0, 0x0, - 0x7f, 0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, - 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, - 0xff, 0xff, 0x80, 0xf, 0xff, 0xdf, 0xff, 0x0, - 0x1f, 0xff, 0x3f, 0xff, 0x0, 0x7f, 0xfe, 0x7f, - 0xff, 0x83, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, - 0xf8, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xff, - 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff, 0x3, - 0xff, 0xff, 0xff, 0xfe, 0x3, 0xff, 0xff, 0xff, - 0xf8, 0x3, 0xff, 0xff, 0xff, 0xe0, 0x3, 0xff, - 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xfe, 0x0, - 0x1, 0xff, 0xff, 0xf0, 0x0, 0x0, 0xff, 0xff, - 0x80, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, - - /* U+0036 "6" */ - 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x1f, 0xff, - 0xf8, 0x0, 0x0, 0x7f, 0xff, 0xfe, 0x0, 0x1, - 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, - 0xc0, 0x7, 0xff, 0xff, 0xff, 0xe0, 0xf, 0xff, - 0xff, 0xff, 0xf0, 0x1f, 0xff, 0xff, 0xff, 0xf8, - 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, - 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x7f, - 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0x81, 0xff, - 0xfe, 0x7f, 0xff, 0x0, 0x7f, 0xfe, 0x7f, 0xfe, - 0x0, 0x3f, 0xfe, 0xff, 0xfc, 0x0, 0x3f, 0xff, - 0xff, 0xfc, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x0, 0x0, - 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, - 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, - 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, - 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8, - 0x0, 0x0, 0x0, 0xff, 0xf8, 0x7, 0xfc, 0x0, - 0xff, 0xf8, 0x1f, 0xff, 0x0, 0xff, 0xf8, 0x7f, - 0xff, 0xc0, 0xff, 0xf8, 0xff, 0xff, 0xe0, 0xff, - 0xf9, 0xff, 0xff, 0xf0, 0xff, 0xfb, 0xff, 0xff, - 0xf8, 0xff, 0xfb, 0xff, 0xff, 0xf8, 0xff, 0xff, - 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xfc, - 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, - 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, - 0xff, 0x81, 0xff, 0xfe, 0xff, 0xfe, 0x0, 0x7f, - 0xff, 0xff, 0xfc, 0x0, 0x3f, 0xff, 0xff, 0xfc, - 0x0, 0x3f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xfc, - 0x0, 0x3f, 0xff, 0x7f, 0xfc, 0x0, 0x3f, 0xfe, - 0x7f, 0xfe, 0x0, 0x7f, 0xfe, 0x7f, 0xff, 0x81, - 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x3f, - 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, - 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0xf, 0xff, - 0xff, 0xff, 0xf0, 0xf, 0xff, 0xff, 0xff, 0xf0, - 0x7, 0xff, 0xff, 0xff, 0xe0, 0x3, 0xff, 0xff, - 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x0, - 0x7f, 0xff, 0xfe, 0x0, 0x0, 0x1f, 0xff, 0xf8, - 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, - - /* U+0037 "7" */ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1f, - 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, - 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, - 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, - 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, - 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, - 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, - 0x0, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xf8, - 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x1, - 0xff, 0xf0, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, - 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, - 0xe0, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, - 0x7, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, 0xc0, - 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x7, - 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0x80, 0x0, - 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, - 0x80, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0, - 0x1f, 0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, - 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, - 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, - 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xfe, - 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, - 0x7f, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xfc, 0x0, - 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, - 0xf8, 0x0, 0x0, 0x1, 0xff, 0xf8, 0x0, 0x0, - 0x1, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, 0xf0, - 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x3, - 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0, 0x0, - 0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff, - 0xe0, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, - 0x7, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, - 0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x0, 0xf, - 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0x80, 0x0, - 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xff, - 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, - 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, - 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, - 0xfe, 0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, - 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x7f, 0xfc, - 0x0, 0x0, 0x0, 0xff, 0xfc, 0x0, 0x0, 0x0, - 0xff, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, - 0x0, 0x1, 0xff, 0xf8, 0x0, 0x0, 0x1, 0xff, - 0xf8, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, - 0x1, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xf0, - 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x3, - 0xff, 0xe0, 0x0, 0x0, - - /* U+0038 "8" */ - 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, - 0xfe, 0x0, 0x0, 0xf, 0xff, 0xff, 0xc0, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xfe, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x1f, - 0xff, 0xff, 0xff, 0xe0, 0x1f, 0xff, 0xff, 0xff, - 0xf8, 0xf, 0xff, 0xff, 0xff, 0xfc, 0xf, 0xff, - 0xff, 0xff, 0xff, 0x7, 0xff, 0xff, 0xff, 0xff, - 0x87, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff, 0xfc, - 0xf, 0xff, 0xf1, 0xff, 0xf8, 0x1, 0xff, 0xf8, - 0xff, 0xf8, 0x0, 0x7f, 0xfc, 0xff, 0xfc, 0x0, - 0x3f, 0xff, 0x7f, 0xfc, 0x0, 0xf, 0xff, 0xbf, - 0xfe, 0x0, 0x7, 0xff, 0xdf, 0xff, 0x0, 0x3, - 0xff, 0xef, 0xff, 0x80, 0x1, 0xff, 0xf7, 0xff, - 0xc0, 0x0, 0xff, 0xfb, 0xff, 0xe0, 0x0, 0x7f, - 0xfd, 0xff, 0xf0, 0x0, 0x3f, 0xfe, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0x7f, 0xfc, 0x0, 0xf, 0xff, - 0xbf, 0xfe, 0x0, 0x7, 0xff, 0xdf, 0xff, 0x0, - 0x3, 0xff, 0xef, 0xff, 0x80, 0x1, 0xff, 0xf7, - 0xff, 0xc0, 0x0, 0xff, 0xfb, 0xff, 0xe0, 0x0, - 0x7f, 0xf8, 0xff, 0xf0, 0x0, 0x3f, 0xfc, 0x7f, - 0xfc, 0x0, 0x3f, 0xfe, 0x3f, 0xfe, 0x0, 0x1f, - 0xff, 0xf, 0xff, 0x80, 0x1f, 0xff, 0x7, 0xff, - 0xf0, 0x3f, 0xff, 0x81, 0xff, 0xff, 0xff, 0xff, - 0x80, 0xff, 0xff, 0xff, 0xff, 0x80, 0x3f, 0xff, - 0xff, 0xff, 0x80, 0xf, 0xff, 0xff, 0xff, 0x80, - 0x3, 0xff, 0xff, 0xff, 0x80, 0x0, 0x7f, 0xff, - 0xff, 0x80, 0x0, 0xff, 0xff, 0xff, 0xe0, 0x0, - 0xff, 0xff, 0xff, 0xf8, 0x0, 0xff, 0xff, 0xff, - 0xfe, 0x0, 0xff, 0xff, 0xff, 0xff, 0x80, 0xff, - 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, - 0xf8, 0x7f, 0xff, 0x83, 0xff, 0xfc, 0x3f, 0xff, - 0x0, 0x7f, 0xff, 0x3f, 0xff, 0x0, 0x1f, 0xff, - 0x9f, 0xff, 0x0, 0x7, 0xff, 0xcf, 0xff, 0x80, - 0x3, 0xff, 0xef, 0xff, 0x80, 0x0, 0xff, 0xff, - 0xff, 0xc0, 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, - 0x3f, 0xff, 0xff, 0xf0, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0, 0x7, - 0xff, 0xff, 0xfe, 0x0, 0x3, 0xff, 0xff, 0xff, - 0x0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x0, 0xff, - 0xff, 0xff, 0xc0, 0x0, 0x7f, 0xff, 0xff, 0xe0, - 0x0, 0x3f, 0xff, 0xff, 0xf0, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0xf, 0xff, 0xff, 0xfc, 0x0, - 0x7, 0xff, 0xff, 0xfe, 0x0, 0x3, 0xff, 0xff, - 0xff, 0x0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x0, - 0xff, 0xff, 0xff, 0xe0, 0x0, 0xff, 0xff, 0xff, - 0xf0, 0x0, 0x7f, 0xfe, 0xff, 0xfc, 0x0, 0x7f, - 0xfe, 0x7f, 0xff, 0x0, 0x7f, 0xff, 0x3f, 0xff, - 0xe0, 0xff, 0xff, 0x9f, 0xff, 0xff, 0xff, 0xff, - 0xc7, 0xff, 0xff, 0xff, 0xff, 0xc3, 0xff, 0xff, - 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xe0, - 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0xff, 0xff, - 0xff, 0xf0, 0x7, 0xff, 0xff, 0xff, 0xf0, 0x1, - 0xff, 0xff, 0xff, 0xf0, 0x0, 0x7f, 0xff, 0xff, - 0xe0, 0x0, 0xf, 0xff, 0xff, 0xe0, 0x0, 0x1, - 0xff, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xfe, 0x0, - 0x0, - - /* U+0039 "9" */ - 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x1f, 0xff, - 0xf8, 0x0, 0x0, 0x7f, 0xff, 0xfe, 0x0, 0x1, - 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, - 0xc0, 0x7, 0xff, 0xff, 0xff, 0xe0, 0xf, 0xff, - 0xff, 0xff, 0xf0, 0xf, 0xff, 0xff, 0xff, 0xf0, - 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, - 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x7f, - 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0x81, 0xff, - 0xfe, 0x7f, 0xfe, 0x0, 0x7f, 0xfe, 0x7f, 0xfc, - 0x0, 0x3f, 0xfe, 0xff, 0xfc, 0x0, 0x3f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, - 0x0, 0x1f, 0xff, 0xff, 0xfc, 0x0, 0x3f, 0xff, - 0xff, 0xfc, 0x0, 0x3f, 0xff, 0xff, 0xfe, 0x0, - 0x7f, 0xff, 0x7f, 0xff, 0x81, 0xff, 0xff, 0x7f, - 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, - 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, - 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, - 0x1f, 0xff, 0xff, 0xdf, 0xff, 0x1f, 0xff, 0xff, - 0xdf, 0xff, 0xf, 0xff, 0xff, 0x9f, 0xff, 0x7, - 0xff, 0xff, 0x1f, 0xff, 0x3, 0xff, 0xfe, 0x1f, - 0xff, 0x0, 0xff, 0xf8, 0x1f, 0xff, 0x0, 0x3f, - 0xe0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, - 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, - 0x1f, 0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, - 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0x1f, - 0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, - 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, - 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, - 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff, 0xff, - 0xf8, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0, 0x1f, - 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff, 0xfc, - 0x0, 0x3f, 0xfe, 0x7f, 0xfc, 0x0, 0x7f, 0xfe, - 0x7f, 0xfe, 0x0, 0xff, 0xfe, 0x7f, 0xff, 0x81, - 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x3f, - 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, - 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff, - 0xff, 0xff, 0xf8, 0xf, 0xff, 0xff, 0xff, 0xf0, - 0x7, 0xff, 0xff, 0xff, 0xe0, 0x3, 0xff, 0xff, - 0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0x80, 0x0, - 0x7f, 0xff, 0xfe, 0x0, 0x0, 0x1f, 0xff, 0xf8, - 0x0, 0x0, 0x3, 0xff, 0xc0, 0x0 -}; - - -/*--------------------- - * GLYPH DESCRIPTION - *--------------------*/ - -static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { - {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */, - {.bitmap_index = 0, .adv_w = 768, .box_w = 40, .box_h = 86, .ofs_x = 4, .ofs_y = -1}, - {.bitmap_index = 430, .adv_w = 768, .box_w = 27, .box_h = 84, .ofs_x = 10, .ofs_y = 0}, - {.bitmap_index = 714, .adv_w = 768, .box_w = 39, .box_h = 85, .ofs_x = 5, .ofs_y = 0}, - {.bitmap_index = 1129, .adv_w = 768, .box_w = 39, .box_h = 86, .ofs_x = 4, .ofs_y = -1}, - {.bitmap_index = 1549, .adv_w = 768, .box_w = 45, .box_h = 84, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 2022, .adv_w = 768, .box_w = 39, .box_h = 85, .ofs_x = 5, .ofs_y = -1}, - {.bitmap_index = 2437, .adv_w = 768, .box_w = 40, .box_h = 86, .ofs_x = 4, .ofs_y = -1}, - {.bitmap_index = 2867, .adv_w = 768, .box_w = 40, .box_h = 84, .ofs_x = 4, .ofs_y = 0}, - {.bitmap_index = 3287, .adv_w = 768, .box_w = 41, .box_h = 86, .ofs_x = 3, .ofs_y = -1}, - {.bitmap_index = 3728, .adv_w = 768, .box_w = 40, .box_h = 86, .ofs_x = 4, .ofs_y = -1} -}; - -/*--------------------- - * CHARACTER MAPPING - *--------------------*/ - - - -/*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ - { - .range_start = 48, .range_length = 10, .glyph_id_start = 1, - .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY - } -}; - - - -/*-------------------- - * ALL CUSTOM DATA - *--------------------*/ - -#if LV_VERSION_CHECK(8, 0, 0) -/*Store all the custom data of the font*/ -static lv_font_fmt_txt_glyph_cache_t cache; -static const lv_font_fmt_txt_dsc_t font_dsc = { -#else -static lv_font_fmt_txt_dsc_t font_dsc = { -#endif - .glyph_bitmap = glyph_bitmap, - .glyph_dsc = glyph_dsc, - .cmaps = cmaps, - .kern_dsc = NULL, - .kern_scale = 0, - .cmap_num = 1, - .bpp = 1, - .kern_classes = 0, - .bitmap_format = 0, -#if LV_VERSION_CHECK(8, 0, 0) - .cache = &cache -#endif -}; - - -/*----------------- - * PUBLIC FONT - *----------------*/ - -/*Initialize a public general font descriptor*/ -#if LV_VERSION_CHECK(8, 0, 0) -const lv_font_t bebas_neue_120 = { -#else -lv_font_t bebas_neue_120 = { -#endif - .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ - .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ - .line_height = 86, /*The maximum line height required by the font*/ - .base_line = 1, /*Baseline measured from the bottom of the line*/ -#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) - .subpx = LV_FONT_SUBPX_NONE, -#endif -#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 - .underline_position = -5, - .underline_thickness = 10, -#endif - .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ -}; - - - -#endif /*#if BEBAS_NEUE_120*/ - diff --git a/src/displayapp/fonts/teko_28.c b/src/displayapp/fonts/teko_28.c deleted file mode 100644 index e72d7ddb..00000000 --- a/src/displayapp/fonts/teko_28.c +++ /dev/null @@ -1,453 +0,0 @@ -/******************************************************************************* - * Size: 28 px - * Bpp: 1 - * Opts: - ******************************************************************************/ - -#ifdef LV_LVGL_H_INCLUDE_SIMPLE -#include "lvgl.h" -#else -#include "lvgl/lvgl.h" -#endif - -#ifndef TEKO_28 -#define TEKO_28 1 -#endif - -#if TEKO_28 - -/*----------------- - * BITMAPS - *----------------*/ - -/*Store the image of the glyphs*/ -static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { - /* U+0020 " " */ - 0x0, - - /* U+0030 "0" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0031 "1" */ - 0xf3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, - 0x33, - - /* U+0032 "2" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x60, 0xc1, 0x86, 0xc, - 0x38, 0x61, 0xc3, 0x6, 0x18, 0x30, 0xc1, 0xfc, - - /* U+0033 "3" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x60, 0xc1, 0x83, 0x3c, - 0xc, 0x18, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0034 "4" */ - 0x6, 0x6, 0x3, 0x1, 0x81, 0x80, 0xc0, 0xe0, - 0x60, 0x30, 0x31, 0x98, 0xcc, 0x6c, 0x37, 0xfc, - 0xc, 0x6, 0x3, 0x1, 0x80, - - /* U+0035 "5" */ - 0xff, 0x83, 0x6, 0xc, 0x18, 0x30, 0x7e, 0x6, - 0xc, 0x18, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0036 "6" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf0, 0x60, 0xfd, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0037 "7" */ - 0xfe, 0xc, 0x38, 0x60, 0xc1, 0x86, 0xc, 0x18, - 0x30, 0xc1, 0x83, 0x6, 0x18, 0x30, 0x60, 0xc0, - - /* U+0038 "8" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0x7d, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0039 "9" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, - 0xfc, 0x18, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0041 "A" */ - 0x1c, 0xe, 0x7, 0x82, 0xc3, 0x61, 0xb0, 0xd8, - 0x64, 0x33, 0x19, 0x88, 0xcc, 0x67, 0xf3, 0x9, - 0x86, 0xc3, 0x61, 0xe0, 0xc0, - - /* U+0042 "B" */ - 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xc3, 0xfe, - - /* U+0043 "C" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0x30, 0x60, 0xc1, - 0x83, 0x6, 0xc, 0x18, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0044 "D" */ - 0xfe, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xc3, 0xfe, - - /* U+0045 "E" */ - 0xff, 0x83, 0x6, 0xc, 0x18, 0x30, 0x60, 0xfd, - 0x83, 0x6, 0xc, 0x18, 0x30, 0x60, 0xc1, 0xfc, - - /* U+0046 "F" */ - 0xff, 0x83, 0x6, 0xc, 0x18, 0x30, 0x60, 0xfd, - 0x83, 0x6, 0xc, 0x18, 0x30, 0x60, 0xc1, 0x80, - - /* U+0047 "G" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0x30, 0x60, 0xc1, - 0x9f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0048 "H" */ - 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xc3, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, - 0xc3, 0xc3, - - /* U+0049 "I" */ - 0xff, 0xff, 0xff, 0xff, 0xf0, - - /* U+004A "J" */ - 0x6, 0xc, 0x18, 0x30, 0x60, 0xc1, 0x83, 0x6, - 0xc, 0x18, 0x30, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+004B "K" */ - 0xc3, 0xc6, 0xc6, 0xce, 0xcc, 0xcc, 0xd8, 0xd8, - 0xf0, 0xf0, 0xd8, 0xd8, 0xcc, 0xcc, 0xcc, 0xc6, - 0xc6, 0xc3, - - /* U+004C "L" */ - 0xc3, 0xc, 0x30, 0xc3, 0xc, 0x30, 0xc3, 0xc, - 0x30, 0xc3, 0xc, 0x30, 0xc3, 0xf0, - - /* U+004D "M" */ - 0xe1, 0xf8, 0x7e, 0x1f, 0x87, 0xe1, 0xfc, 0xff, - 0x3f, 0x4b, 0xd2, 0xf7, 0xbd, 0xef, 0x33, 0xcc, - 0xf3, 0x3c, 0xf, 0x3, 0xc0, 0xf0, 0x30, - - /* U+004E "N" */ - 0xe3, 0xe3, 0xe3, 0xe3, 0xf3, 0xf3, 0xd3, 0xd3, - 0xdb, 0xdb, 0xcb, 0xcb, 0xcf, 0xcf, 0xc7, 0xc7, - 0xc7, 0xc3, - - /* U+004F "O" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0050 "P" */ - 0xfd, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0xfb, 0x6, 0xc, 0x18, 0x30, 0x60, 0xc1, 0x80, - - /* U+0051 "Q" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - 0x30, 0x60, 0x60, - - /* U+0052 "R" */ - 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, - 0xc6, 0xfc, 0xc8, 0xcc, 0xcc, 0xcc, 0xc6, 0xc6, - 0xc6, 0xc3, - - /* U+0053 "S" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0x30, 0x60, 0x7c, - 0xc, 0x18, 0x30, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0054 "T" */ - 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x18, 0x18, - - /* U+0055 "U" */ - 0xc7, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc6, 0xf8, - - /* U+0056 "V" */ - 0xc1, 0xe0, 0xd0, 0xcc, 0x66, 0x33, 0x19, 0x8c, - 0xc6, 0x62, 0x13, 0xd, 0x86, 0xc3, 0x61, 0xb0, - 0xd8, 0x28, 0x1c, 0xe, 0x0, - - /* U+0057 "W" */ - 0xc3, 0x87, 0x87, 0xd, 0x8e, 0x1b, 0x1c, 0x36, - 0x38, 0x4c, 0x59, 0x98, 0xb3, 0x31, 0x66, 0x66, - 0xcc, 0x4d, 0x98, 0xd9, 0x31, 0xb2, 0x43, 0x44, - 0x86, 0x8f, 0xd, 0x1e, 0x1e, 0x3c, 0x1c, 0x78, - 0x38, 0x70, - - /* U+0058 "X" */ - 0x61, 0xb1, 0x98, 0xc6, 0x63, 0x61, 0xb0, 0x78, - 0x38, 0xc, 0xe, 0x7, 0x2, 0xc3, 0x61, 0x99, - 0x8c, 0xc6, 0x61, 0xe0, 0xc0, - - /* U+0059 "Y" */ - 0xc3, 0xc3, 0xc3, 0x42, 0x66, 0x66, 0x66, 0x24, - 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, - 0x18, 0x18, - - /* U+005A "Z" */ - 0xfe, 0xc, 0x18, 0x60, 0xc1, 0x6, 0xc, 0x10, - 0x60, 0xc1, 0x6, 0xc, 0x10, 0x60, 0xc1, 0xfc, - - /* U+0061 "a" */ - 0x7f, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x6f, 0xc0, - - /* U+0062 "b" */ - 0xc1, 0x83, 0x6, 0xc, 0x1f, 0xb1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, 0x8f, - 0xf0, - - /* U+0063 "c" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x18, 0x30, 0x60, 0xc1, - 0x83, 0x1e, 0x3c, 0x6f, 0x80, - - /* U+0064 "d" */ - 0x6, 0xc, 0x18, 0x30, 0x6f, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, 0x8d, - 0xf8, - - /* U+0065 "e" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xff, 0xe0, 0xc1, - 0x83, 0x1e, 0x3c, 0x6f, 0x80, - - /* U+0066 "f" */ - 0x3b, 0x18, 0xc6, 0x7d, 0x8c, 0x63, 0x18, 0xc6, - 0x31, 0x8c, 0x63, 0x18, - - /* U+0067 "g" */ - 0x7f, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x6f, 0xc1, 0x83, 0x7, 0xf8, - - /* U+0068 "h" */ - 0xc1, 0x83, 0x6, 0xc, 0x1f, 0xb1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, 0x8f, - 0x18, - - /* U+0069 "i" */ - 0xc0, 0x3f, 0xff, 0xff, 0xfc, - - /* U+006A "j" */ - 0x60, 0x0, 0xdb, 0x6d, 0xb6, 0xdb, 0x6d, 0xb6, - 0xf0, - - /* U+006B "k" */ - 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc7, 0xc6, 0xc6, - 0xcc, 0xcc, 0xd8, 0xd8, 0xd8, 0xd8, 0xcc, 0xcc, - 0xc6, 0xc6, 0xc7, - - /* U+006C "l" */ - 0xff, 0xff, 0xff, 0xff, 0xfc, - - /* U+006D "m" */ - 0xff, 0xec, 0x63, 0xc6, 0x3c, 0x63, 0xc6, 0x3c, - 0x63, 0xc6, 0x3c, 0x63, 0xc6, 0x3c, 0x63, 0xc6, - 0x3c, 0x63, 0xc6, 0x3c, 0x63, - - /* U+006E "n" */ - 0xfd, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x78, 0xc0, - - /* U+006F "o" */ - 0x7d, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x6f, 0x80, - - /* U+0070 "p" */ - 0xfd, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x7f, 0xb0, 0x60, 0xc1, 0x80, - - /* U+0071 "q" */ - 0x7f, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x6f, 0xc1, 0x83, 0x6, 0xc, - - /* U+0072 "r" */ - 0xff, 0x31, 0x8c, 0x63, 0x18, 0xc6, 0x31, 0x8c, - 0x60, - - /* U+0073 "s" */ - 0x7b, 0x3c, 0xf3, 0xc3, 0xc, 0x1f, 0xc, 0x30, - 0xf3, 0xcd, 0xe0, - - /* U+0074 "t" */ - 0x63, 0x19, 0xf6, 0x31, 0x8c, 0x63, 0x18, 0xc6, - 0x31, 0x8c, 0x38, - - /* U+0075 "u" */ - 0xc7, 0x8f, 0x1e, 0x3c, 0x78, 0xf1, 0xe3, 0xc7, - 0x8f, 0x1e, 0x3c, 0x6f, 0xc0, - - /* U+0076 "v" */ - 0xc3, 0xc6, 0x46, 0x66, 0x66, 0x66, 0x66, 0x64, - 0x6c, 0x2c, 0x3c, 0x3c, 0x3c, 0x3c, - - /* U+0077 "w" */ - 0xc3, 0xf, 0xe, 0x34, 0x78, 0xd9, 0xe2, 0x67, - 0x99, 0x9e, 0x66, 0x69, 0x99, 0x26, 0x24, 0xd8, - 0xf3, 0x43, 0xcf, 0xf, 0x3c, 0x3c, 0xf0, 0xf1, - 0xc0, - - /* U+0078 "x" */ - 0x63, 0x31, 0x8d, 0x86, 0xc3, 0x40, 0xe0, 0x60, - 0x38, 0x1c, 0x1b, 0xd, 0x8c, 0xc6, 0x36, 0x18, - - /* U+0079 "y" */ - 0xc3, 0xc3, 0xc2, 0xc6, 0x66, 0x66, 0x66, 0x66, - 0x64, 0x2c, 0x3c, 0x3c, 0x3c, 0x3c, 0x8, 0x18, - 0x18, 0x70, - - /* U+007A "z" */ - 0xfc, 0x30, 0x86, 0x18, 0x43, 0xc, 0x21, 0x84, - 0x10, 0xc3, 0xf0 -}; - - -/*--------------------- - * GLYPH DESCRIPTION - *--------------------*/ - -static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { - {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */, - {.bitmap_index = 0, .adv_w = 58, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 1, .adv_w = 162, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 17, .adv_w = 95, .box_w = 4, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 26, .adv_w = 130, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 42, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 58, .adv_w = 146, .box_w = 9, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 79, .adv_w = 144, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 95, .adv_w = 158, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 111, .adv_w = 115, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 127, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 143, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 159, .adv_w = 154, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 180, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 198, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 214, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 232, .adv_w = 141, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 248, .adv_w = 136, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 264, .adv_w = 157, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 280, .adv_w = 171, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 298, .adv_w = 89, .box_w = 2, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 303, .adv_w = 135, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 319, .adv_w = 155, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 337, .adv_w = 121, .box_w = 6, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 351, .adv_w = 213, .box_w = 10, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 374, .adv_w = 169, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 392, .adv_w = 161, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 408, .adv_w = 155, .box_w = 7, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 424, .adv_w = 161, .box_w = 7, .box_h = 21, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 443, .adv_w = 163, .box_w = 8, .box_h = 18, .ofs_x = 2, .ofs_y = 0}, - {.bitmap_index = 461, .adv_w = 146, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 477, .adv_w = 125, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 495, .adv_w = 163, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 511, .adv_w = 143, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 532, .adv_w = 246, .box_w = 15, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 566, .adv_w = 150, .box_w = 9, .box_h = 18, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 587, .adv_w = 143, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 605, .adv_w = 122, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 621, .adv_w = 147, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 634, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 651, .adv_w = 146, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 664, .adv_w = 147, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 681, .adv_w = 148, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 694, .adv_w = 88, .box_w = 5, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 706, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 722, .adv_w = 149, .box_w = 7, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 739, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 744, .adv_w = 71, .box_w = 3, .box_h = 23, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 753, .adv_w = 146, .box_w = 8, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 772, .adv_w = 71, .box_w = 2, .box_h = 19, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 777, .adv_w = 225, .box_w = 12, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 798, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 811, .adv_w = 152, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 824, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 840, .adv_w = 147, .box_w = 7, .box_h = 18, .ofs_x = 1, .ofs_y = -4}, - {.bitmap_index = 856, .adv_w = 95, .box_w = 5, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 865, .adv_w = 133, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 876, .adv_w = 88, .box_w = 5, .box_h = 17, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 887, .adv_w = 149, .box_w = 7, .box_h = 14, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 900, .adv_w = 125, .box_w = 8, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 914, .adv_w = 227, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 939, .adv_w = 141, .box_w = 9, .box_h = 14, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 955, .adv_w = 138, .box_w = 8, .box_h = 18, .ofs_x = 0, .ofs_y = -4}, - {.bitmap_index = 973, .adv_w = 119, .box_w = 6, .box_h = 14, .ofs_x = 1, .ofs_y = 0} -}; - -/*--------------------- - * CHARACTER MAPPING - *--------------------*/ - - - -/*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = -{ - { - .range_start = 32, .range_length = 1, .glyph_id_start = 1, - .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY - }, - { - .range_start = 48, .range_length = 10, .glyph_id_start = 2, - .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY - }, - { - .range_start = 65, .range_length = 26, .glyph_id_start = 12, - .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY - }, - { - .range_start = 97, .range_length = 26, .glyph_id_start = 38, - .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY - } -}; - - - -/*-------------------- - * ALL CUSTOM DATA - *--------------------*/ - -#if LV_VERSION_CHECK(8, 0, 0) -/*Store all the custom data of the font*/ -static lv_font_fmt_txt_glyph_cache_t cache; -static const lv_font_fmt_txt_dsc_t font_dsc = { -#else -static lv_font_fmt_txt_dsc_t font_dsc = { -#endif - .glyph_bitmap = glyph_bitmap, - .glyph_dsc = glyph_dsc, - .cmaps = cmaps, - .kern_dsc = NULL, - .kern_scale = 0, - .cmap_num = 4, - .bpp = 1, - .kern_classes = 0, - .bitmap_format = 0, -#if LV_VERSION_CHECK(8, 0, 0) - .cache = &cache -#endif -}; - - -/*----------------- - * PUBLIC FONT - *----------------*/ - -/*Initialize a public general font descriptor*/ -#if LV_VERSION_CHECK(8, 0, 0) -const lv_font_t teko_28 = { -#else -lv_font_t teko_28 = { -#endif - .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ - .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ - .line_height = 23, /*The maximum line height required by the font*/ - .base_line = 4, /*Baseline measured from the bottom of the line*/ -#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) - .subpx = LV_FONT_SUBPX_NONE, -#endif -#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 - .underline_position = -2, - .underline_thickness = 1, -#endif - .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ -}; - - - -#endif /*#if TEKO_28*/ - diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index c6429111..dfd29f9f 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -159,37 +159,49 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, timeContainer = lv_obj_create(lv_scr_act(), nullptr); lv_obj_set_style_local_bg_opa(timeContainer, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); - lv_obj_set_size(timeContainer, 185, 185); - lv_obj_align(timeContainer, lv_scr_act(), LV_ALIGN_CENTER, 0, -10); + lv_obj_set_size(timeContainer, 110, 145); + lv_obj_align(timeContainer, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); labelHour = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_font(labelHour, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &bebas_neue_120); + lv_obj_set_style_local_text_font(labelHour, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed); lv_label_set_text(labelHour, "01"); - lv_obj_align(labelHour, timeContainer, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_obj_align(labelHour, timeContainer, LV_ALIGN_IN_TOP_MID, 0, 5); labelMinutes = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_font(labelMinutes, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &bebas_neue_120); + lv_obj_set_style_local_text_font(labelMinutes, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed); lv_label_set_text(labelMinutes, "00"); lv_obj_align(labelMinutes, timeContainer, LV_ALIGN_IN_BOTTOM_MID, 0, 0); labelTimeAmPm = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_font(labelTimeAmPm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &teko_28); + lv_obj_set_style_local_text_font(labelTimeAmPm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_label_set_text(labelTimeAmPm, ""); + lv_obj_align(labelTimeAmPm, timeContainer, LV_ALIGN_OUT_RIGHT_TOP, 0, 15); - labelDate = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(labelDate, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); - lv_obj_set_style_local_text_font(labelDate, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &teko_28); - lv_obj_align(labelDate, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -1, 0); - lv_label_set_text(labelDate, "Mon 01"); + dateContainer = lv_obj_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_bg_opa(dateContainer, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); + lv_obj_set_size(dateContainer, 40, 50); + lv_obj_align(dateContainer, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 5); + + labelDateDay = lv_label_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_text_color(labelDateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); + lv_obj_set_style_local_text_font(labelDateDay, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); + lv_obj_align(labelDateDay, dateContainer, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_label_set_text(labelDateDay, "Mon"); + + labelDateNum = lv_label_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_text_color(labelDateNum, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); + lv_obj_set_style_local_text_font(labelDateNum, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); + lv_obj_align(labelDateNum, dateContainer, LV_ALIGN_IN_BOTTOM_MID, 0, 0); + lv_label_set_text(labelDateNum, "01"); bleIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); lv_label_set_text(bleIcon, Symbols::bluetooth); - lv_obj_align(bleIcon, labelDate, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); + lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 7); stepValue = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); - lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &teko_28); + lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 10, 0); lv_label_set_text(stepValue, "0"); @@ -432,13 +444,16 @@ void WatchFaceInfineat::Refresh() { if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) { lv_label_set_text(labelTimeAmPm, ampmChar); - lv_obj_align(labelTimeAmPm, labelHour, LV_ALIGN_OUT_RIGHT_TOP, 5, 20); + lv_obj_align(labelTimeAmPm, timeContainer, LV_ALIGN_OUT_RIGHT_TOP, 0, 10); + lv_obj_align(labelHour, timeContainer, LV_ALIGN_IN_TOP_MID, 0, 5); + lv_obj_align(labelMinutes, timeContainer, LV_ALIGN_IN_BOTTOM_MID, 0, 0); } if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) { - lv_label_set_text_fmt(labelDate, "%s %02d", dateTimeController.DayOfWeekShortToStringLow(), day); - lv_obj_align(labelDate, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, 0, 0); - lv_obj_set_size(labelDate, 5, 5); + lv_label_set_text_fmt(labelDateDay, "%s", dateTimeController.DayOfWeekShortToStringLow()); + lv_label_set_text_fmt(labelDateNum, "%02d", day); + lv_obj_align(labelDateDay, dateContainer, LV_ALIGN_IN_TOP_MID, 0, 0); + lv_obj_align(labelDateNum, dateContainer, LV_ALIGN_IN_BOTTOM_MID, 0, 0); currentYear = year; currentMonth = month; diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index c7e21379..da9d9964 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -93,7 +93,9 @@ namespace Pinetime { lv_obj_t* labelHour; lv_obj_t* labelMinutes; lv_obj_t* labelTimeAmPm; - lv_obj_t* labelDate; + lv_obj_t* dateContainer; + lv_obj_t* labelDateDay; + lv_obj_t* labelDateNum; lv_obj_t* bleIcon; lv_obj_t* stepIcon; lv_obj_t* stepValue; diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 7cabcdba..73109c5a 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -418,9 +418,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in LV_FONT_DECLARE(jetbrains_mono_42) \ LV_FONT_DECLARE(jetbrains_mono_76) \ LV_FONT_DECLARE(open_sans_light) \ - LV_FONT_DECLARE(lv_font_sys_48) \ - LV_FONT_DECLARE(bebas_neue_120) \ - LV_FONT_DECLARE(teko_28) + LV_FONT_DECLARE(lv_font_sys_48) /* Enable it if you have fonts with a lot of characters. * The limit depends on the font size, font face and bpp