scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Integration of lvgl : continued...

Browse source
This commit is contained in:
JF 2020-02-10 21:05:33 +01:00
parent a97faf8e9e
commit e65c9fa181
17 changed files with 1301 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/CMakeLists.txt
View file

@ -118,7 +118,6 @@ set(LVGL_SRC
libs/lvgl/src/lv_font/lv_font_fmt_txt.c
libs/lvgl/src/lv_font/lv_font_fmt_txt.h
libs/lvgl/src/lv_font/lv_font_roboto_16.c
libs/lvgl/src/lv_font/lv_font_roboto_28_compressed.c
libs/lvgl/src/lv_font/lv_symbol_def.h
libs/lvgl/src/lv_themes/lv_theme.c
@ -133,6 +132,10 @@ set(LVGL_SRC
libs/lvgl/src/lv_objx/lv_label.h
libs/lvgl/src/lv_objx/lv_label.c
libs/lvgl/src/lv_themes/lv_theme.c
libs/lvgl/src/lv_themes/lv_theme.h
libs/lvgl/src/lv_themes/lv_theme_night.h
libs/lvgl/src/lv_themes/lv_theme_night.c
)
@ -159,7 +162,9 @@ list(APPEND SOURCE_FILES
FreeRTOS/port_cmsis.c
${LVGL_SRC}
DisplayApp/lv_port_disp.cpp
DisplayApp/LittleVgl.cpp
DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
DisplayApp/Fonts/jetbrains_mono_bold_20.c
)
set(INCLUDE_FILES
@ -191,7 +196,7 @@ set(INCLUDE_FILES
libs/date/includes/date/ptz.h
libs/date/includes/date/tz_private.h
DisplayApp/lv_port_disp.h
DisplayApp/LittleVgl.h
)
include_directories(

2
src/Components/DateTime/DateTimeController.cpp
View file

@ -49,7 +49,7 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
previousSystickCounter = 0xffffff - (rest - systickCounter);
}
currentDateTime += std::chrono::seconds (correctedDelta);
currentDateTime += std::chrono::milliseconds (systickDelta*10);
auto dp = date::floor<date::days>(currentDateTime);
auto time = date::make_time(currentDateTime-dp);

21
src/DisplayApp/DisplayApp.cpp
View file

@ -12,18 +12,19 @@
#include <chrono>
#include <string>
#include <lvgl/lvgl.h>
#include "lv_port_disp.h"
using namespace Pinetime::Applications;
DisplayApp::DisplayApp(Pinetime::Drivers::St7789& lcd,
Pinetime::Components::Gfx& gfx,
Pinetime::Components::LittleVgl& lvgl,
Pinetime::Drivers::Cst816S& touchPanel,
Controllers::Battery &batteryController,
Controllers::Ble &bleController,
Controllers::DateTime &dateTimeController) :
lcd{lcd},
gfx{gfx},
lvgl{lvgl},
touchPanel{touchPanel},
batteryController{batteryController},
bleController{bleController},
@ -31,7 +32,7 @@ DisplayApp::DisplayApp(Pinetime::Drivers::St7789& lcd,
clockScreen{gfx},
messageScreen{gfx}{
msgQueue = xQueueCreate(queueSize, itemSize);
currentScreen = &messageScreen;
currentScreen = &clockScreen;
}
void DisplayApp::Start() {
@ -43,12 +44,15 @@ void DisplayApp::Process(void *instance) {
auto *app = static_cast<DisplayApp *>(instance);
NRF_LOG_INFO("DisplayApp task started!");
app->InitHw();
lv_init();
lv_port_disp_init();
while (1) {
lv_task_handler();
app->Refresh();
auto before = nrf_rtc_counter_get(portNRF_RTC_REG);
lv_task_handler();
auto after = nrf_rtc_counter_get(portNRF_RTC_REG);
NRF_LOG_INFO("duration : %d", (after-before));
}
}
@ -59,8 +63,6 @@ void DisplayApp::InitHw() {
nrf_gpio_pin_clear(pinLcdBacklight1);
nrf_gpio_pin_clear(pinLcdBacklight2);
nrf_gpio_pin_clear(pinLcdBacklight3);
}
uint32_t acc = 0;
@ -75,10 +77,10 @@ void DisplayApp::Refresh() {
break;
case States::Running:
RunningState();
queueTimeout = 1000;
queueTimeout = 1;
break;
}
/*
Messages msg;
if (xQueueReceive(msgQueue, &msg, queueTimeout)) {
switch (msg) {
@ -117,6 +119,7 @@ void DisplayApp::Refresh() {
break;
}
}
*/
}
bool first = true;

3
src/DisplayApp/DisplayApp.h
View file

@ -11,6 +11,7 @@
#include <Components/DateTime/DateTimeController.h>
#include "Fonts/lcdfont14.h"
#include "../drivers/Cst816s.h"
#include "LittleVgl.h"
#include <date/date.h>
#include <DisplayApp/Screens/Clock.h>
#include <DisplayApp/Screens/Message.h>
@ -25,6 +26,7 @@ namespace Pinetime {
enum class Messages : uint8_t {GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent} ;
DisplayApp(Pinetime::Drivers::St7789& lcd,
Pinetime::Components::Gfx& gfx,
Pinetime::Components::LittleVgl& lvgl,
Pinetime::Drivers::Cst816S&,
Controllers::Battery &batteryController,
Controllers::Ble &bleController,
@ -38,6 +40,7 @@ namespace Pinetime {
void InitHw();
Pinetime::Drivers::St7789& lcd;
Pinetime::Components::Gfx& gfx;
Pinetime::Components::LittleVgl lvgl;
const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
void Refresh();

594
src/DisplayApp/Fonts/jetbrains_mono_bold_20.c Normal file
View file

@ -0,0 +1,594 @@
#include "lvgl/lvgl.h"
/*******************************************************************************
* Size: 20 px
* Bpp: 1
* Opts:
******************************************************************************/
#ifndef JETBRAINS_MONO_BOLD_20
#define JETBRAINS_MONO_BOLD_20 1
#endif
#if JETBRAINS_MONO_BOLD_20
/*-----------------
* BITMAPS
*----------------*/
/*Store the image of the glyphs*/
static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
/* U+20 " " */
0x0,
/* U+21 "!" */
0xff, 0xff, 0xff, 0xe0, 0xf, 0xc0,
/* U+22 "\"" */
0xef, 0xdf, 0xbf, 0x7e, 0xfd, 0xc0,
/* U+23 "#" */
0x8, 0xc3, 0x10, 0x62, 0x3f, 0xf7, 0xfe, 0x23,
0x4, 0x61, 0x88, 0x31, 0x1f, 0xfb, 0xff, 0x19,
0x82, 0x30, 0xc4, 0x0,
/* U+24 "$" */
0x1c, 0x7, 0x3, 0xf1, 0xfe, 0xe3, 0xf8, 0x7e,
0x3, 0xe0, 0x7f, 0x7, 0xe0, 0x3c, 0x7, 0xe1,
0xfc, 0xf7, 0xf8, 0xfc, 0x1c, 0x7, 0x0,
/* U+25 "%" */
0x78, 0x1f, 0x83, 0x30, 0x66, 0x1f, 0xcc, 0xf2,
0x1, 0x80, 0xde, 0x67, 0xf8, 0xcc, 0x19, 0x83,
0x30, 0x7e, 0x7, 0x80,
/* U+26 "&" */
0x1e, 0x7, 0xe1, 0xce, 0x38, 0x7, 0x0, 0x70,
0x1e, 0x7, 0x66, 0xed, 0xdc, 0xf3, 0x9c, 0x73,
0xcf, 0xfc, 0xf9, 0x80,
/* U+27 "'" */
0xff, 0xff, 0xc0,
/* U+28 "(" */
0x2, 0x1c, 0xfb, 0xc7, 0x1e, 0x38, 0x70, 0xe1,
0xc3, 0x87, 0xe, 0x1c, 0x3c, 0x38, 0x38, 0x7c,
0x38,
/* U+29 ")" */
0x1, 0xc3, 0xc1, 0xc1, 0xc3, 0xc3, 0x87, 0xe,
0x1c, 0x38, 0x70, 0xe1, 0xc7, 0x8e, 0x79, 0xe3,
0x80,
/* U+2A "*" */
0xc, 0x3, 0x8, 0xc7, 0xb7, 0x7f, 0x83, 0x1,
0xe0, 0xcc, 0x73, 0x80, 0x0,
/* U+2B "+" */
0x1c, 0x7, 0x1, 0xc3, 0xff, 0xff, 0xc7, 0x1,
0xc0, 0x70, 0x1c, 0x0,
/* U+2C "," */
0x7b, 0x9c, 0xce, 0x60,
/* U+2D "-" */
0xff, 0xff,
/* U+2E "." */
0x6f, 0xf6,
/* U+2F "/" */
0x1, 0xc0, 0x60, 0x38, 0xe, 0x3, 0x1, 0xc0,
0x70, 0x18, 0xe, 0x3, 0x1, 0xc0, 0x70, 0x18,
0xe, 0x3, 0x80, 0xc0, 0x70, 0x18, 0xe, 0x0,
/* U+30 "0" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xfb, 0x7e,
0xdf, 0xb7, 0xed, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0x8f, 0x80,
/* U+31 "1" */
0x3c, 0x3e, 0x3f, 0x13, 0x81, 0xc0, 0xe0, 0x70,
0x38, 0x1c, 0xe, 0x7, 0x3, 0x8f, 0xff, 0xfc,
/* U+32 "2" */
0x1f, 0x1f, 0xef, 0x3f, 0x87, 0x1, 0xc0, 0x70,
0x38, 0x1e, 0xf, 0x7, 0x87, 0x83, 0xc0, 0xff,
0xff, 0xf0,
/* U+33 "3" */
0x7f, 0xdf, 0xf0, 0x3c, 0x1c, 0x1c, 0x7, 0xc1,
0xf8, 0xf, 0x1, 0xc0, 0x7e, 0x1d, 0x8f, 0x7f,
0x87, 0xc0,
/* U+34 "4" */
0x7, 0x7, 0x3, 0x83, 0x83, 0x81, 0xc1, 0xcf,
0xe7, 0xe3, 0xff, 0xff, 0xe0, 0x70, 0x38, 0x1c,
/* U+35 "5" */
0xff, 0x7f, 0xb8, 0x1c, 0xe, 0x7, 0x73, 0xfd,
0xcf, 0x3, 0x81, 0xc0, 0xfc, 0xff, 0xf1, 0xf0,
/* U+36 "6" */
0x6, 0x3, 0x1, 0xc0, 0x60, 0x30, 0x1b, 0xc7,
0xfb, 0xcf, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0x87, 0x80,
/* U+37 "7" */
0xff, 0xff, 0xfe, 0xb, 0x86, 0x1, 0x80, 0xc0,
0x30, 0x18, 0x6, 0x3, 0x80, 0xc0, 0x70, 0x18,
0xe, 0x0,
/* U+38 "8" */
0x3e, 0x1f, 0xce, 0x3b, 0x6, 0xe3, 0x9f, 0xc7,
0xf1, 0x8e, 0xc1, 0xf0, 0x7c, 0x1f, 0x8f, 0x7f,
0x8f, 0x80,
/* U+39 "9" */
0x1e, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
0x3d, 0xfe, 0x3d, 0x80, 0xc0, 0x60, 0x38, 0xc,
0x6, 0x0,
/* U+3A ":" */
0xff, 0x80, 0x0, 0xff, 0x80,
/* U+3B ";" */
0x7b, 0xde, 0x0, 0x0, 0x0, 0x7b, 0x9c, 0xce,
0x60,
/* U+3C "<" */
0x0, 0x81, 0xc3, 0xe7, 0xcf, 0x6, 0x3, 0xc0,
0x7c, 0xf, 0x81, 0xc0, 0x20,
/* U+3D "=" */
0xff, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xfe,
/* U+3E ">" */
0x0, 0x70, 0x3e, 0x7, 0xc0, 0xf8, 0xc, 0x1e,
0x7c, 0xf8, 0x70, 0x20, 0x0,
/* U+3F "?" */
0xfc, 0xfe, 0xf, 0x7, 0x7, 0xf, 0x3e, 0x3c,
0x30, 0x30, 0x0, 0x0, 0x70, 0x70,
/* U+40 "@" */
0x1f, 0x87, 0xf9, 0xc3, 0xf0, 0x3c, 0x77, 0x9f,
0xf3, 0x1e, 0x63, 0xcc, 0x79, 0x8f, 0x31, 0xe7,
0xfc, 0x77, 0xc0, 0x1c, 0x1, 0xf0, 0x1e, 0x0,
/* U+41 "A" */
0xf, 0x0, 0xf0, 0xf, 0x1, 0xf8, 0x19, 0x81,
0x98, 0x19, 0x83, 0x9c, 0x3f, 0xc3, 0xfc, 0x70,
0xe7, 0xe, 0x60, 0x66, 0x6,
/* U+42 "B" */
0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xcf,
0xe3, 0xfc, 0xe3, 0xb8, 0x7e, 0x1f, 0x8f, 0xff,
0xbf, 0xc0,
/* U+43 "C" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
0x3, 0x80, 0xe0, 0x38, 0xe, 0x1f, 0xcf, 0x7f,
0x8f, 0xc0,
/* U+44 "D" */
0xfe, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0x8f, 0xff,
0xbf, 0x80,
/* U+45 "E" */
0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0xfd,
0xfe, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
/* U+46 "F" */
0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0xff,
0xff, 0xe0, 0x70, 0x38, 0x1c, 0xe, 0x7, 0x0,
/* U+47 "G" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
0x7f, 0x9f, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0x87, 0x80,
/* U+48 "H" */
0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xff,
0xff, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
/* U+49 "I" */
0xff, 0xff, 0xc7, 0x3, 0x81, 0xc0, 0xe0, 0x70,
0x38, 0x1c, 0xe, 0x7, 0x3, 0x8f, 0xff, 0xfc,
/* U+4A "J" */
0x3f, 0xcf, 0xf0, 0x1c, 0x7, 0x1, 0xc0, 0x70,
0x1c, 0x7, 0x1, 0xc0, 0x7e, 0x1f, 0x8f, 0x7f,
0x8f, 0xc0,
/* U+4B "K" */
0xe1, 0xdc, 0x3b, 0x8e, 0x71, 0xce, 0x31, 0xce,
0x3f, 0x87, 0xf0, 0xe7, 0x1c, 0x63, 0x8e, 0x70,
0xce, 0x1d, 0xc3, 0x80,
/* U+4C "L" */
0xe0, 0x70, 0x38, 0x1c, 0xe, 0x7, 0x3, 0x81,
0xc0, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
/* U+4D "M" */
0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xda, 0xf7, 0xbd,
0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0,
0xf0, 0x30,
/* U+4E "N" */
0xe1, 0xf0, 0xfc, 0x7e, 0x3d, 0x9e, 0xcf, 0x67,
0x9b, 0xcd, 0xe6, 0xf1, 0xf8, 0xfc, 0x3e, 0x1c,
/* U+4F "O" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0x8f, 0x80,
/* U+50 "P" */
0xff, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0xff,
0xfb, 0xfc, 0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0,
0x38, 0x0,
/* U+51 "Q" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0x8f, 0x80, 0x70, 0xe, 0x1, 0xc0,
/* U+52 "R" */
0xff, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0xff,
0xfb, 0xf8, 0xe6, 0x39, 0xce, 0x33, 0x8e, 0xe3,
0xb8, 0x70,
/* U+53 "S" */
0x3f, 0x1f, 0xee, 0x3f, 0x87, 0xe0, 0x3e, 0x7,
0xf0, 0x7e, 0x3, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
0x8f, 0xc0,
/* U+54 "T" */
0xff, 0xff, 0xf0, 0xe0, 0x38, 0xe, 0x3, 0x80,
0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0, 0x38, 0xe,
0x3, 0x80,
/* U+55 "U" */
0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
/* U+56 "V" */
0x60, 0x66, 0x6, 0x70, 0xe7, 0xe, 0x30, 0xc3,
0xc, 0x39, 0xc1, 0x98, 0x19, 0x81, 0x98, 0x1f,
0x80, 0xf0, 0xf, 0x0, 0xf0,
/* U+57 "W" */
0xc6, 0x3c, 0x73, 0x47, 0x36, 0xf3, 0x6f, 0x26,
0xf6, 0x6d, 0x66, 0xd6, 0x69, 0x66, 0x9e, 0x69,
0xe6, 0x9e, 0x39, 0xe3, 0x9e,
/* U+58 "X" */
0xe1, 0xd8, 0x67, 0x38, 0xcc, 0x3f, 0x7, 0x81,
0xe0, 0x78, 0x1e, 0xf, 0xc3, 0x31, 0xce, 0xe1,
0xf8, 0x70,
/* U+59 "Y" */
0xe0, 0xfc, 0x1d, 0xc7, 0x38, 0xe3, 0x98, 0x77,
0x6, 0xc0, 0xf8, 0xe, 0x1, 0xc0, 0x38, 0x7,
0x0, 0xe0, 0x1c, 0x0,
/* U+5A "Z" */
0xff, 0xff, 0xc0, 0xe0, 0xe0, 0x60, 0x70, 0x70,
0x38, 0x38, 0x38, 0x1c, 0x1c, 0xf, 0xff, 0xfc,
/* U+5B "[" */
0xff, 0xfe, 0x38, 0xe3, 0x8e, 0x38, 0xe3, 0x8e,
0x38, 0xe3, 0x8e, 0x38, 0xff, 0xf0,
/* U+5C "\\" */
0xe0, 0x18, 0x7, 0x1, 0xc0, 0x30, 0xe, 0x3,
0x80, 0x60, 0x1c, 0x3, 0x0, 0xe0, 0x38, 0x6,
0x1, 0xc0, 0x70, 0xc, 0x3, 0x80, 0x60, 0x1c,
/* U+5D "]" */
0xff, 0xf1, 0xc7, 0x1c, 0x71, 0xc7, 0x1c, 0x71,
0xc7, 0x1c, 0x71, 0xc7, 0xff, 0xf0,
/* U+5E "^" */
0xc, 0x7, 0x81, 0xe0, 0xfc, 0x33, 0x1c, 0xe6,
0x19, 0x86,
/* U+5F "_" */
0xff, 0xff, 0xf0,
/* U+60 "`" */
0x63, 0x8e,
/* U+61 "a" */
0x1f, 0x1f, 0xef, 0x1c, 0x7, 0x3f, 0xdf, 0xfe,
0x1f, 0x87, 0xe3, 0xff, 0xf7, 0x9c,
/* U+62 "b" */
0xe0, 0x38, 0xe, 0x3, 0xbc, 0xff, 0xbc, 0xfe,
0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0xff,
0xbb, 0xc0,
/* U+63 "c" */
0x3f, 0x1f, 0xef, 0x1f, 0x83, 0xe0, 0x38, 0xe,
0x3, 0x87, 0xf1, 0xdf, 0xe3, 0xe0,
/* U+64 "d" */
0x1, 0xc0, 0x70, 0x1c, 0xf7, 0x7f, 0xfc, 0xfe,
0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
0xcf, 0x70,
/* U+65 "e" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xff, 0xff, 0xfe,
0x3, 0x80, 0xf1, 0xdf, 0xe3, 0xf0,
/* U+66 "f" */
0xf, 0xc7, 0xf1, 0xc0, 0x70, 0xff, 0xff, 0xf1,
0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0x1c,
0x7, 0x0,
/* U+67 "g" */
0x3d, 0xdf, 0xff, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0xcf, 0x7f, 0xcf, 0x70, 0x1c, 0xf, 0x3f,
0x8f, 0xc0,
/* U+68 "h" */
0xe0, 0x70, 0x38, 0x1d, 0xcf, 0xf7, 0x9f, 0x8f,
0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
/* U+69 "i" */
0x8, 0x7, 0x0, 0x80, 0x0, 0xfc, 0x3f, 0x1,
0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0x1c,
0x3f, 0xff, 0xfc,
/* U+6A "j" */
0x2, 0x7, 0x2, 0x0, 0x7f, 0x7f, 0x7, 0x7,
0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0xf,
0xfe, 0xfc,
/* U+6B "k" */
0xe0, 0x38, 0xe, 0x3, 0x87, 0xe1, 0xb8, 0xee,
0x33, 0x9c, 0xfe, 0x3f, 0x8e, 0x73, 0x8e, 0xe3,
0xb8, 0x70,
/* U+6C "l" */
0xfe, 0x1f, 0xc0, 0x38, 0x7, 0x0, 0xe0, 0x1c,
0x3, 0x80, 0x70, 0xe, 0x1, 0xc0, 0x38, 0x7,
0x0, 0xfe, 0xf, 0xc0,
/* U+6D "m" */
0xd9, 0xbf, 0xfc, 0xcf, 0x33, 0xcc, 0xf3, 0x3c,
0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcc,
/* U+6E "n" */
0xee, 0x7f, 0xbc, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
0xc7, 0xe3, 0xf1, 0xf8, 0xe0,
/* U+6F "o" */
0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xf3, 0xdf, 0xe1, 0xf0,
/* U+70 "p" */
0xef, 0x3f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xf3, 0xff, 0xee, 0xf3, 0x80, 0xe0,
0x38, 0x0,
/* U+71 "q" */
0x3d, 0xdf, 0xff, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
0x1f, 0x87, 0xf3, 0xdf, 0xf3, 0xdc, 0x7, 0x1,
0xc0, 0x70,
/* U+72 "r" */
0xef, 0x3f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0xe,
0x3, 0x80, 0xe0, 0x38, 0xe, 0x0,
/* U+73 "s" */
0x3f, 0x3f, 0xee, 0x1f, 0x80, 0xfc, 0x1f, 0xe0,
0x3c, 0x7, 0xe1, 0xff, 0xe3, 0xf0,
/* U+74 "t" */
0x1c, 0x7, 0x1, 0xc3, 0xff, 0xff, 0xc7, 0x1,
0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0xf,
0xc1, 0xf0,
/* U+75 "u" */
0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
0xc7, 0xe3, 0xbf, 0x8f, 0x80,
/* U+76 "v" */
0xc0, 0xf8, 0x76, 0x19, 0x86, 0x73, 0x8c, 0xc3,
0x30, 0xfc, 0x1e, 0x7, 0x81, 0xe0,
/* U+77 "w" */
0xc6, 0x24, 0x62, 0x4e, 0x66, 0xf6, 0x6f, 0x66,
0xf6, 0x6b, 0x66, 0x94, 0x79, 0x43, 0x9c, 0x39,
0xc0,
/* U+78 "x" */
0xe1, 0xdc, 0xe3, 0x30, 0xfc, 0x1e, 0x7, 0x81,
0xe0, 0xfc, 0x73, 0x9c, 0x6e, 0x1c,
/* U+79 "y" */
0xe1, 0xf8, 0x76, 0x19, 0xce, 0x33, 0x8e, 0xc3,
0xf0, 0x7c, 0x1e, 0x3, 0x80, 0xc0, 0x70, 0x1c,
0x6, 0x0,
/* U+7A "z" */
0xff, 0xff, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
0xe0, 0xe0, 0x7f, 0xff, 0xe0,
/* U+7B "{" */
0x3, 0x87, 0xc3, 0x81, 0xc0, 0xe0, 0x70, 0x38,
0x1c, 0xfc, 0x7e, 0x3, 0x81, 0xc0, 0xe0, 0x70,
0x38, 0x1c, 0xf, 0x83, 0xc0,
/* U+7C "|" */
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
/* U+7D "}" */
0xf0, 0x3f, 0x1, 0xc0, 0x70, 0x1c, 0x7, 0x1,
0xc0, 0x70, 0xf, 0xc3, 0xf1, 0xc0, 0x70, 0x1c,
0x7, 0x1, 0xc0, 0x70, 0xf8, 0x3c, 0x0,
/* U+7E "~" */
0x78, 0xff, 0x3c, 0xff, 0x1e
};
/*---------------------
* 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 = 192, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1, .adv_w = 192, .box_w = 3, .box_h = 14, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 7, .adv_w = 192, .box_w = 7, .box_h = 6, .ofs_x = 3, .ofs_y = 8},
{.bitmap_index = 13, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 33, .adv_w = 192, .box_w = 10, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 56, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 76, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 96, .adv_w = 192, .box_w = 3, .box_h = 6, .ofs_x = 5, .ofs_y = 8},
{.bitmap_index = 99, .adv_w = 192, .box_w = 7, .box_h = 19, .ofs_x = 3, .ofs_y = -2},
{.bitmap_index = 116, .adv_w = 192, .box_w = 7, .box_h = 19, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 133, .adv_w = 192, .box_w = 10, .box_h = 10, .ofs_x = 1, .ofs_y = 1},
{.bitmap_index = 146, .adv_w = 192, .box_w = 10, .box_h = 9, .ofs_x = 1, .ofs_y = 2},
{.bitmap_index = 158, .adv_w = 192, .box_w = 5, .box_h = 6, .ofs_x = 3, .ofs_y = -3},
{.bitmap_index = 162, .adv_w = 192, .box_w = 8, .box_h = 2, .ofs_x = 2, .ofs_y = 5},
{.bitmap_index = 164, .adv_w = 192, .box_w = 4, .box_h = 4, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 166, .adv_w = 192, .box_w = 10, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 190, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 208, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 224, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 242, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 260, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 276, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 292, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 310, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 328, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 346, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 364, .adv_w = 192, .box_w = 3, .box_h = 11, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 369, .adv_w = 192, .box_w = 5, .box_h = 14, .ofs_x = 3, .ofs_y = -3},
{.bitmap_index = 378, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 1},
{.bitmap_index = 391, .adv_w = 192, .box_w = 9, .box_h = 7, .ofs_x = 2, .ofs_y = 3},
{.bitmap_index = 399, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 2, .ofs_y = 1},
{.bitmap_index = 412, .adv_w = 192, .box_w = 8, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 426, .adv_w = 192, .box_w = 11, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 450, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 471, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 489, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 507, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 525, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 541, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 557, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 575, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 591, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 607, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 625, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 645, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 661, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 679, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 695, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 713, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 731, .adv_w = 192, .box_w = 10, .box_h = 17, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 753, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 771, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 789, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 807, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 823, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 844, .adv_w = 192, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 865, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 883, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 903, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 919, .adv_w = 192, .box_w = 6, .box_h = 18, .ofs_x = 4, .ofs_y = -2},
{.bitmap_index = 933, .adv_w = 192, .box_w = 10, .box_h = 19, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 957, .adv_w = 192, .box_w = 6, .box_h = 18, .ofs_x = 3, .ofs_y = -2},
{.bitmap_index = 971, .adv_w = 192, .box_w = 10, .box_h = 8, .ofs_x = 1, .ofs_y = 6},
{.bitmap_index = 981, .adv_w = 192, .box_w = 10, .box_h = 2, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 984, .adv_w = 192, .box_w = 5, .box_h = 3, .ofs_x = 3, .ofs_y = 13},
{.bitmap_index = 986, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1000, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1018, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1032, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1050, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1064, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1082, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 1100, .adv_w = 192, .box_w = 9, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1116, .adv_w = 192, .box_w = 10, .box_h = 15, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 1135, .adv_w = 192, .box_w = 8, .box_h = 18, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 1153, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 1171, .adv_w = 192, .box_w = 11, .box_h = 14, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1191, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1205, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1218, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1232, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 1250, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 1268, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 2, .ofs_y = 0},
{.bitmap_index = 1282, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1296, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1314, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1327, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1341, .adv_w = 192, .box_w = 12, .box_h = 11, .ofs_x = 0, .ofs_y = 0},
{.bitmap_index = 1358, .adv_w = 192, .box_w = 10, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1372, .adv_w = 192, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 1390, .adv_w = 192, .box_w = 9, .box_h = 11, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 1403, .adv_w = 192, .box_w = 9, .box_h = 18, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 1424, .adv_w = 192, .box_w = 3, .box_h = 18, .ofs_x = 5, .ofs_y = -2},
{.bitmap_index = 1431, .adv_w = 192, .box_w = 10, .box_h = 18, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 1454, .adv_w = 192, .box_w = 10, .box_h = 4, .ofs_x = 1, .ofs_y = 5}
};
/*---------------------
* CHARACTER MAPPING
*--------------------*/
/*Collect the unicode lists and glyph_id offsets*/
static const lv_font_fmt_txt_cmap_t cmaps[] =
{
{
.range_start = 32, .range_length = 95, .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
*--------------------*/
/*Store all the custom data of the font*/
static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc,
.cmaps = cmaps,
.kern_dsc = NULL,
.kern_scale = 0,
.cmap_num = 1,
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
lv_font_t jetbrains_mono_bold_20 = {
.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 = 20, /*The maximum line height required by the font*/
.base_line = 3, /*Baseline measured from the bottom of the line*/
#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
.subpx = LV_FONT_SUBPX_NONE,
#endif
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if JETBRAINS_MONO_BOLD_20*/

507
src/DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c Normal file
View file

@ -0,0 +1,507 @@
#include "lvgl/lvgl.h"
/*******************************************************************************
* Size: 80 px
* Bpp: 1
* Opts:
******************************************************************************/
#ifndef JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED
#define JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED 1
#endif
#if JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED
/*-----------------
* BITMAPS
*----------------*/
/*Store the image of the glyphs*/
static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
/* U+30 "0" */
0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
0xfe, 0x0, 0x0, 0x1f, 0xff, 0xff, 0xc0, 0x0,
0x3f, 0xff, 0xff, 0xf8, 0x0, 0x3f, 0xff, 0xff,
0xfe, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x80, 0x3f,
0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff,
0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xff,
0xff, 0xff, 0xff, 0x1f, 0xff, 0xe0, 0x3f, 0xff,
0xcf, 0xff, 0xc0, 0x7, 0xff, 0xe7, 0xff, 0xc0,
0x1, 0xff, 0xf7, 0xff, 0xc0, 0x0, 0x7f, 0xff,
0xff, 0xe0, 0x0, 0x3f, 0xff, 0xff, 0xe0, 0x0,
0xf, 0xff, 0xff, 0xf0, 0x0, 0x7, 0xff, 0xff,
0xf8, 0x0, 0x3, 0xff, 0xff, 0xfc, 0x0, 0x1,
0xff, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff, 0xff,
0x0, 0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, 0x3f,
0xff, 0xff, 0xc0, 0x70, 0x1f, 0xff, 0xff, 0xe0,
0x7c, 0xf, 0xff, 0xff, 0xf0, 0x7f, 0x7, 0xff,
0xff, 0xf8, 0x3f, 0x83, 0xff, 0xff, 0xfc, 0x1f,
0xc1, 0xff, 0xff, 0xfe, 0xf, 0xe0, 0xff, 0xff,
0xff, 0x7, 0xf0, 0x7f, 0xff, 0xff, 0x83, 0xf8,
0x3f, 0xff, 0xff, 0xc1, 0xfc, 0x1f, 0xff, 0xff,
0xe0, 0xfe, 0xf, 0xff, 0xff, 0xf0, 0x7f, 0x7,
0xff, 0xff, 0xf8, 0x3f, 0x83, 0xff, 0xff, 0xfc,
0x1f, 0xc1, 0xff, 0xff, 0xfe, 0xf, 0xe0, 0xff,
0xff, 0xff, 0x3, 0xe0, 0x7f, 0xff, 0xff, 0x80,
0xe0, 0x3f, 0xff, 0xff, 0xc0, 0x0, 0x1f, 0xff,
0xff, 0xe0, 0x0, 0xf, 0xff, 0xff, 0xf0, 0x0,
0x7, 0xff, 0xff, 0xf8, 0x0, 0x3, 0xff, 0xff,
0xfc, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff,
0xc0, 0x0, 0x7f, 0xf9, 0xff, 0xf0, 0x0, 0x7f,
0xfc, 0xff, 0xfc, 0x0, 0x7f, 0xfe, 0x7f, 0xff,
0x80, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
0x7, 0xff, 0xff, 0xff, 0xff, 0x3, 0xff, 0xff,
0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80,
0x3f, 0xff, 0xff, 0xff, 0x80, 0xf, 0xff, 0xff,
0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0,
0x7f, 0xff, 0xff, 0x0, 0x0, 0xf, 0xff, 0xfc,
0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
/* U+31 "1" */
0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0xf, 0xff,
0xe0, 0x0, 0x0, 0x3f, 0xff, 0xe0, 0x0, 0x0,
0x7f, 0xff, 0xe0, 0x0, 0x1, 0xff, 0xff, 0xe0,
0x0, 0x3, 0xff, 0xff, 0xe0, 0x0, 0x7, 0xff,
0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xe0, 0x0,
0x3f, 0xff, 0xff, 0xe0, 0x0, 0x7f, 0xff, 0xff,
0xe0, 0x0, 0x7f, 0xff, 0xff, 0xe0, 0x0, 0x7f,
0xfd, 0xff, 0xe0, 0x0, 0x7f, 0xf9, 0xff, 0xe0,
0x0, 0x7f, 0xf1, 0xff, 0xe0, 0x0, 0x7f, 0xe1,
0xff, 0xe0, 0x0, 0x7f, 0x81, 0xff, 0xe0, 0x0,
0x7f, 0x1, 0xff, 0xe0, 0x0, 0x7c, 0x1, 0xff,
0xe0, 0x0, 0x78, 0x1, 0xff, 0xe0, 0x0, 0x60,
0x1, 0xff, 0xe0, 0x0, 0x40, 0x1, 0xff, 0xe0,
0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff,
0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
0x1, 0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0,
0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x1,
0xff, 0xe0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
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,
/* U+32 "2" */
0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff,
0xfc, 0x0, 0x0, 0x1f, 0xff, 0xff, 0x80, 0x0,
0x3f, 0xff, 0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff,
0xfc, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x0, 0x3f,
0xff, 0xff, 0xff, 0xc0, 0x3f, 0xff, 0xff, 0xff,
0xf0, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x1f, 0xff,
0xff, 0xff, 0xfe, 0x1f, 0xff, 0xe0, 0x7f, 0xff,
0x8f, 0xff, 0xc0, 0xf, 0xff, 0xc7, 0xff, 0xc0,
0x3, 0xff, 0xe7, 0xff, 0xc0, 0x0, 0xff, 0xfb,
0xff, 0xc0, 0x0, 0x7f, 0xfd, 0xff, 0xe0, 0x0,
0x1f, 0xfe, 0xff, 0xf0, 0x0, 0xf, 0xff, 0x0,
0x0, 0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x3,
0xff, 0xc0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
0x0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff,
0xf8, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0, 0x3f, 0xfe,
0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0,
0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0,
0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f,
0xff, 0x80, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0,
0x0, 0x7f, 0xff, 0x80, 0x0, 0x0, 0x7f, 0xff,
0x80, 0x0, 0x0, 0x7f, 0xff, 0x80, 0x0, 0x0,
0xff, 0xff, 0x80, 0x0, 0x0, 0xff, 0xff, 0x80,
0x0, 0x0, 0xff, 0xff, 0x80, 0x0, 0x0, 0xff,
0xff, 0x80, 0x0, 0x1, 0xff, 0xff, 0x0, 0x0,
0x1, 0xff, 0xff, 0x0, 0x0, 0x1, 0xff, 0xff,
0x0, 0x0, 0x1, 0xff, 0xfe, 0x0, 0x0, 0x3,
0xff, 0xfe, 0x0, 0x0, 0x3, 0xff, 0xfe, 0x0,
0x0, 0x3, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff,
0xfc, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0,
0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff,
0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff,
0xdf, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff,
0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfb,
0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff,
0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff,
0xff, 0xc0,
/* U+33 "3" */
0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf, 0xff, 0xff,
0xff, 0xff, 0x7, 0xff, 0xff, 0xff, 0xff, 0x83,
0xff, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff,
0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x7f,
0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xff,
0xfc, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf, 0xff,
0xff, 0x8f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff,
0x80, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0,
0x1f, 0xff, 0x80, 0x0, 0x0, 0x3f, 0xff, 0x80,
0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f,
0xff, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0,
0x0, 0x3f, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfe,
0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0,
0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfc, 0x0,
0x0, 0x0, 0x1f, 0xff, 0x80, 0x0, 0x0, 0xf,
0xff, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xff, 0x0,
0x0, 0x3, 0xff, 0xff, 0xe0, 0x0, 0x1, 0xff,
0xff, 0xf8, 0x0, 0x0, 0xff, 0xff, 0xfe, 0x0,
0x0, 0x7f, 0xff, 0xff, 0x80, 0x0, 0x3f, 0xff,
0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf0, 0x0,
0xf, 0xff, 0xff, 0xfc, 0x0, 0x0, 0x0, 0xff,
0xfe, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x80, 0x0,
0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x1, 0xff,
0xe0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfe,
0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
0x0, 0x0, 0x1, 0xff, 0xff, 0xfe, 0x0, 0x0,
0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xff, 0xff,
0xc0, 0x0, 0x7f, 0xf9, 0xff, 0xf0, 0x0, 0x7f,
0xfc, 0xff, 0xfc, 0x0, 0x7f, 0xfe, 0x7f, 0xff,
0x80, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
0xf, 0xff, 0xff, 0xff, 0xff, 0x3, 0xff, 0xff,
0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xff, 0x80,
0x3f, 0xff, 0xff, 0xff, 0x80, 0xf, 0xff, 0xff,
0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0,
0x7f, 0xff, 0xff, 0x0, 0x0, 0xf, 0xff, 0xfc,
0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
/* U+34 "4" */
0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x1f,
0xff, 0x80, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0,
0x3, 0xff, 0xe0, 0x0, 0x0, 0x1f, 0xff, 0x80,
0x0, 0x0, 0xff, 0xfc, 0x0, 0x0, 0x3, 0xff,
0xe0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
0xff, 0xfc, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0,
0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xff, 0xfc,
0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0x3f,
0xff, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0, 0x0,
0x7, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xff, 0x0,
0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x7, 0xff,
0xc0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x1,
0xff, 0xf8, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
0x0, 0x3f, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xf8,
0x0, 0x0, 0xf, 0xff, 0xc0, 0x0, 0x0, 0x3f,
0xfe, 0x0, 0xff, 0xf1, 0xff, 0xf0, 0x3, 0xff,
0xcf, 0xff, 0xc0, 0xf, 0xff, 0x7f, 0xfe, 0x0,
0x3f, 0xfd, 0xff, 0xf0, 0x0, 0xff, 0xff, 0xff,
0xc0, 0x3, 0xff, 0xff, 0xfe, 0x0, 0xf, 0xff,
0xff, 0xf0, 0x0, 0x3f, 0xff, 0xff, 0x80, 0x0,
0xff, 0xff, 0xfe, 0x0, 0x3, 0xff, 0xff, 0xf8,
0x0, 0xf, 0xff, 0xff, 0xe0, 0x0, 0x3f, 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, 0xc0,
0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0, 0x3f,
0xfc, 0x0, 0x0, 0x0, 0xff, 0xf0, 0x0, 0x0,
0x3, 0xff, 0xc0, 0x0, 0x0, 0xf, 0xff, 0x0,
0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0xff,
0xf0, 0x0, 0x0, 0x3, 0xff, 0xc0, 0x0, 0x0,
0xf, 0xff, 0x0, 0x0, 0x0, 0x3f, 0xfc, 0x0,
0x0, 0x0, 0xff, 0xf0,
/* U+35 "5" */
0x3f, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xff, 0xff,
0xff, 0xff, 0xf, 0xff, 0xff, 0xff, 0xff, 0x87,
0xff, 0xff, 0xff, 0xff, 0xc3, 0xff, 0xff, 0xff,
0xff, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff,
0xff, 0xff, 0xff, 0xf8, 0x7f, 0xff, 0xff, 0xff,
0xfc, 0x3f, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xff,
0xff, 0xff, 0xff, 0xf, 0xff, 0x0, 0x0, 0x0,
0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x0,
0xff, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0,
0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f,
0xfe, 0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0,
0x0, 0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff,
0xc0, 0x7f, 0x80, 0x1, 0xff, 0xe1, 0xff, 0xf8,
0x0, 0xff, 0xf1, 0xff, 0xff, 0x0, 0x7f, 0xf9,
0xff, 0xff, 0xc0, 0x3f, 0xfd, 0xff, 0xff, 0xf0,
0x1f, 0xff, 0xff, 0xff, 0xfc, 0xf, 0xff, 0xff,
0xff, 0xff, 0x7, 0xff, 0xff, 0xff, 0xff, 0xc3,
0xff, 0xff, 0xff, 0xff, 0xe1, 0xff, 0xfc, 0x7,
0xff, 0xf8, 0xff, 0xf8, 0x0, 0xff, 0xfc, 0x0,
0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0xf,
0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xff,
0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfe,
0x0, 0x0, 0x0, 0xf, 0xff, 0x0, 0x0, 0x0,
0x7, 0xff, 0x80, 0x0, 0x0, 0x3, 0xff, 0xc0,
0x0, 0x0, 0x1, 0xff, 0xff, 0xff, 0x0, 0x1,
0xff, 0xff, 0xff, 0x80, 0x0, 0xff, 0xfb, 0xff,
0xe0, 0x0, 0xff, 0xf9, 0xff, 0xf8, 0x0, 0xff,
0xfc, 0xff, 0xff, 0x81, 0xff, 0xfe, 0x3f, 0xff,
0xff, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xff, 0xff,
0x7, 0xff, 0xff, 0xff, 0xff, 0x1, 0xff, 0xff,
0xff, 0xff, 0x0, 0x7f, 0xff, 0xff, 0xff, 0x0,
0x1f, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff, 0xff,
0xff, 0x0, 0x0, 0xff, 0xff, 0xfe, 0x0, 0x0,
0x1f, 0xff, 0xfc, 0x0, 0x0, 0x0, 0xff, 0xe0,
0x0, 0x0,
/* U+36 "6" */
0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x7,
0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0,
0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f,
0xfe, 0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0,
0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x7, 0xff,
0xc0, 0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0,
0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc,
0x0, 0x0, 0x0, 0x3f, 0xff, 0x0, 0x0, 0x0,
0xf, 0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0,
0x0, 0x0, 0x3, 0xff, 0xf0, 0x0, 0x0, 0x1,
0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0,
0x0, 0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0xf,
0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0,
0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xff,
0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x3f, 0xc0,
0x0, 0x1f, 0xfe, 0x3f, 0xfe, 0x0, 0xf, 0xff,
0xbf, 0xff, 0xe0, 0x3, 0xff, 0xdf, 0xff, 0xfc,
0x1, 0xff, 0xef, 0xff, 0xff, 0x80, 0x7f, 0xff,
0xff, 0xff, 0xf0, 0x3f, 0xff, 0xff, 0xff, 0xfe,
0xf, 0xff, 0xff, 0xff, 0xff, 0x87, 0xff, 0xff,
0xff, 0xff, 0xf1, 0xff, 0xff, 0x3, 0xff, 0xfc,
0x7f, 0xff, 0x0, 0x3f, 0xff, 0x9f, 0xff, 0x0,
0x3, 0xff, 0xef, 0xff, 0xc0, 0x0, 0xff, 0xfb,
0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf8, 0x0,
0x7, 0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff,
0xff, 0x0, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0,
0xf, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff,
0xfc, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0,
0x3f, 0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0x7f,
0xf8, 0x0, 0x7, 0xff, 0xdf, 0xfe, 0x0, 0x3,
0xff, 0xe7, 0xff, 0xc0, 0x0, 0xff, 0xf9, 0xff,
0xfc, 0x0, 0xff, 0xfe, 0x3f, 0xff, 0xc0, 0xff,
0xff, 0xf, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xff,
0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff,
0xf0, 0x7, 0xff, 0xff, 0xff, 0xf8, 0x0, 0xff,
0xff, 0xff, 0xfe, 0x0, 0x1f, 0xff, 0xff, 0xfe,
0x0, 0x3, 0xff, 0xff, 0xff, 0x0, 0x0, 0x3f,
0xff, 0xff, 0x0, 0x0, 0x3, 0xff, 0xff, 0x0,
0x0, 0x0, 0xf, 0xfc, 0x0, 0x0,
/* U+37 "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,
0xe0, 0x0, 0xf, 0xff, 0xff, 0xe0, 0x0, 0x1f,
0xfe, 0xff, 0xe0, 0x0, 0x1f, 0xfe, 0xff, 0xe0,
0x0, 0x3f, 0xfc, 0xff, 0xe0, 0x0, 0x3f, 0xfc,
0xff, 0xe0, 0x0, 0x7f, 0xf8, 0xff, 0xe0, 0x0,
0x7f, 0xf8, 0xff, 0xe0, 0x0, 0xff, 0xf8, 0xff,
0xe0, 0x0, 0xff, 0xf0, 0x0, 0x0, 0x1, 0xff,
0xf0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0, 0x0,
0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff, 0xc0,
0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0, 0x7,
0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0x80, 0x0,
0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff,
0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0,
0x1f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe, 0x0,
0x0, 0x0, 0x3f, 0xfc, 0x0, 0x0, 0x0, 0x7f,
0xfc, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0, 0x0,
0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff, 0xf8,
0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x1,
0xff, 0xf0, 0x0, 0x0, 0x1, 0xff, 0xe0, 0x0,
0x0, 0x3, 0xff, 0xe0, 0x0, 0x0, 0x3, 0xff,
0xc0, 0x0, 0x0, 0x7, 0xff, 0xc0, 0x0, 0x0,
0x7, 0xff, 0x80, 0x0, 0x0, 0xf, 0xff, 0x80,
0x0, 0x0, 0xf, 0xff, 0x80, 0x0, 0x0, 0x1f,
0xff, 0x0, 0x0, 0x0, 0x1f, 0xff, 0x0, 0x0,
0x0, 0x3f, 0xfe, 0x0, 0x0, 0x0, 0x3f, 0xfe,
0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0, 0x0, 0x0,
0x7f, 0xfc, 0x0, 0x0, 0x0, 0x7f, 0xf8, 0x0,
0x0, 0x0, 0xff, 0xf8, 0x0, 0x0, 0x0, 0xff,
0xf8, 0x0, 0x0, 0x1, 0xff, 0xf0, 0x0, 0x0,
0x1, 0xff, 0xf0, 0x0, 0x0, 0x3, 0xff, 0xe0,
0x0, 0x0,
/* U+38 "8" */
0x0, 0x1, 0xff, 0xe0, 0x0, 0x0, 0x7, 0xff,
0xff, 0x80, 0x0, 0x7, 0xff, 0xff, 0xf8, 0x0,
0x7, 0xff, 0xff, 0xff, 0x80, 0x3, 0xff, 0xff,
0xff, 0xf0, 0x1, 0xff, 0xff, 0xff, 0xfe, 0x0,
0xff, 0xff, 0xff, 0xff, 0xc0, 0x7f, 0xff, 0xff,
0xff, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf,
0xff, 0xe0, 0x3f, 0xff, 0xc3, 0xff, 0xe0, 0x3,
0xff, 0xf0, 0xff, 0xf0, 0x0, 0x7f, 0xfc, 0x7f,
0xf8, 0x0, 0xf, 0xff, 0x9f, 0xfe, 0x0, 0x3,
0xff, 0xe7, 0xff, 0x0, 0x0, 0x7f, 0xf9, 0xff,
0xc0, 0x0, 0x1f, 0xfe, 0x7f, 0xf0, 0x0, 0x7,
0xff, 0x9f, 0xfc, 0x0, 0x1, 0xff, 0xe7, 0xff,
0x0, 0x0, 0x7f, 0xf9, 0xff, 0xc0, 0x0, 0x1f,
0xfe, 0x3f, 0xf8, 0x0, 0xf, 0xff, 0xf, 0xfe,
0x0, 0x3, 0xff, 0xc3, 0xff, 0xc0, 0x1, 0xff,
0xe0, 0x7f, 0xf8, 0x0, 0xff, 0xf8, 0xf, 0xff,
0x80, 0xff, 0xfc, 0x1, 0xff, 0xff, 0xff, 0xfe,
0x0, 0x3f, 0xff, 0xff, 0xff, 0x0, 0x7, 0xff,
0xff, 0xff, 0x0, 0x0, 0x7f, 0xff, 0xff, 0x0,
0x0, 0x3, 0xff, 0xfe, 0x0, 0x0, 0x7, 0xff,
0xff, 0xf0, 0x0, 0x7, 0xff, 0xff, 0xff, 0x80,
0x7, 0xff, 0xff, 0xff, 0xf0, 0x3, 0xff, 0xff,
0xff, 0xff, 0x1, 0xff, 0xf8, 0xf, 0xff, 0xe0,
0xff, 0xf8, 0x0, 0x7f, 0xf8, 0x3f, 0xfc, 0x0,
0xf, 0xff, 0x1f, 0xfe, 0x0, 0x1, 0xff, 0xe7,
0xff, 0x80, 0x0, 0x7f, 0xfb, 0xff, 0xc0, 0x0,
0xf, 0xfe, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff,
0xfc, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0,
0x3f, 0xff, 0xff, 0xc0, 0x0, 0xf, 0xff, 0xff,
0xf0, 0x0, 0x3, 0xff, 0xff, 0xfe, 0x0, 0x1,
0xff, 0xff, 0xff, 0x80, 0x0, 0x7f, 0xff, 0xff,
0xf0, 0x0, 0x3f, 0xff, 0x7f, 0xfe, 0x0, 0x1f,
0xff, 0x9f, 0xff, 0xe0, 0x3f, 0xff, 0xe3, 0xff,
0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff,
0xfc, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0x3, 0xff,
0xff, 0xff, 0xff, 0x0, 0x7f, 0xff, 0xff, 0xff,
0x80, 0xf, 0xff, 0xff, 0xff, 0xc0, 0x1, 0xff,
0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0xff, 0xe0,
0x0, 0x1, 0xff, 0xff, 0xe0, 0x0, 0x0, 0x7,
0xff, 0x80, 0x0,
/* U+39 "9" */
0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x3, 0xff,
0xff, 0x0, 0x0, 0x3, 0xff, 0xff, 0xf0, 0x0,
0x3, 0xff, 0xff, 0xff, 0x0, 0x1, 0xff, 0xff,
0xff, 0xe0, 0x1, 0xff, 0xff, 0xff, 0xfc, 0x0,
0x7f, 0xff, 0xff, 0xff, 0x80, 0x3f, 0xff, 0xff,
0xff, 0xf0, 0x1f, 0xff, 0xff, 0xff, 0xfe, 0xf,
0xff, 0xff, 0xff, 0xff, 0x83, 0xff, 0xfc, 0xf,
0xff, 0xf1, 0xff, 0xf8, 0x0, 0xff, 0xfc, 0x7f,
0xfc, 0x0, 0xf, 0xff, 0x9f, 0xff, 0x0, 0x3,
0xff, 0xef, 0xff, 0x80, 0x0, 0x7f, 0xfb, 0xff,
0xe0, 0x0, 0x1f, 0xff, 0xff, 0xf0, 0x0, 0x3,
0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff, 0xff,
0x0, 0x0, 0x3f, 0xff, 0xff, 0xc0, 0x0, 0xf,
0xff, 0xff, 0xf0, 0x0, 0x3, 0xff, 0xff, 0xfc,
0x0, 0x0, 0xff, 0xff, 0xff, 0x80, 0x0, 0x7f,
0xff, 0xff, 0xe0, 0x0, 0x1f, 0xff, 0x7f, 0xf8,
0x0, 0xf, 0xff, 0xdf, 0xff, 0x0, 0x3, 0xff,
0xe7, 0xff, 0xf0, 0x3, 0xff, 0xf8, 0xff, 0xff,
0x3, 0xff, 0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff,
0x87, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xff, 0xff,
0xff, 0xff, 0xf0, 0x3f, 0xff, 0xff, 0xff, 0xf8,
0x7, 0xff, 0xff, 0xdf, 0xfe, 0x0, 0xff, 0xff,
0xef, 0xff, 0x80, 0x1f, 0xff, 0xf7, 0xff, 0xc0,
0x1, 0xff, 0xf1, 0xff, 0xf0, 0x0, 0xf, 0xf0,
0xff, 0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfc, 0x0,
0x0, 0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xf,
0xff, 0x80, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0,
0x0, 0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff,
0xf8, 0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0,
0x0, 0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff,
0x80, 0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
0x1, 0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8,
0x0, 0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0,
0x1f, 0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80,
0x0, 0x0, 0x7, 0xff, 0xe0, 0x0, 0x0, 0x3,
0xff, 0xf0, 0x0, 0x0, 0x0, 0xff, 0xf8, 0x0,
0x0, 0x0, 0x7f, 0xfe, 0x0, 0x0, 0x0, 0x3f,
0xff, 0x0, 0x0, 0x0, 0xf, 0xff, 0x80, 0x0,
0x0, 0x7, 0xff, 0xe0, 0x0, 0x0,
/* U+3A ":" */
0x7, 0xe0, 0x1f, 0xf8, 0x3f, 0xfc, 0x7f, 0xfe,
0x7f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe,
0x7f, 0xfe, 0x3f, 0xfc, 0x1f, 0xf8, 0x7, 0xe0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0, 0x7, 0xe0, 0x1f, 0xf8,
0x3f, 0xfc, 0x7f, 0xfe, 0x7f, 0xfe, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0x7f, 0xfe, 0x7f, 0xfe, 0x3f, 0xfc,
0x1f, 0xf8, 0x7, 0xe0
};
/*---------------------
* 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 = 41, .box_h = 59, .ofs_x = 4, .ofs_y = -1},
{.bitmap_index = 303, .adv_w = 768, .box_w = 40, .box_h = 58, .ofs_x = 6, .ofs_y = 0},
{.bitmap_index = 593, .adv_w = 768, .box_w = 41, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 891, .adv_w = 768, .box_w = 41, .box_h = 59, .ofs_x = 3, .ofs_y = -1},
{.bitmap_index = 1194, .adv_w = 768, .box_w = 38, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 1470, .adv_w = 768, .box_w = 41, .box_h = 58, .ofs_x = 4, .ofs_y = -1},
{.bitmap_index = 1768, .adv_w = 768, .box_w = 42, .box_h = 59, .ofs_x = 3, .ofs_y = -1},
{.bitmap_index = 2078, .adv_w = 768, .box_w = 40, .box_h = 58, .ofs_x = 4, .ofs_y = 0},
{.bitmap_index = 2368, .adv_w = 768, .box_w = 42, .box_h = 60, .ofs_x = 3, .ofs_y = -1},
{.bitmap_index = 2683, .adv_w = 768, .box_w = 42, .box_h = 59, .ofs_x = 3, .ofs_y = 0},
{.bitmap_index = 2993, .adv_w = 768, .box_w = 16, .box_h = 46, .ofs_x = 16, .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 = 11, .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
*--------------------*/
/*Store all the custom data of the font*/
static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc,
.cmaps = cmaps,
.kern_dsc = NULL,
.kern_scale = 0,
.cmap_num = 1,
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
/*Initialize a public general font descriptor*/
lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed = {
.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 = 60, /*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
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if JETBRAINS_MONO_EXTRABOLD_COMPRESSEDEXTRABOLD_COMPRESSED*/

59
src/DisplayApp/LittleVgl.cpp Normal file
View file

@ -0,0 +1,59 @@
#include <FreeRTOS.h>
#include <projdefs.h>
#include <task.h>
#include <libs/lvgl/src/lv_core/lv_obj.h>
#include <hal/nrf_rtc.h>
#include <libraries/log/nrf_log.h>
#include <libs/lvgl/src/lv_themes/lv_theme.h>
#include <libs/lvgl/src/lv_themes/lv_theme_night.h>
#include "LittleVgl.h"
using namespace Pinetime::Components;
static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) {
auto* lvgl = static_cast<LittleVgl*>(disp_drv->user_data);
lvgl->FlushDisplay(area, color_p);
}
LittleVgl::LittleVgl(Pinetime::Drivers::St7789& lcd) : lcd{lcd} {
lv_init();
lv_theme_t* theme = lv_theme_night_init(10, NULL);
lv_theme_set_current(theme);
lv_disp_buf_init(&disp_buf_2, buf2_1, buf2_2, LV_HOR_RES_MAX * 2); /*Initialize the display buffer*/
lv_disp_drv_init(&disp_drv); /*Basic initialization*/
/*Set up the functions to access to your display*/
/*Set the resolution of the display*/
disp_drv.hor_res = 240;
disp_drv.ver_res = 240;
/*Used to copy the buffer's content to the display*/
disp_drv.flush_cb = disp_flush;
/*Set a display buffer*/
disp_drv.buffer = &disp_buf_2;
disp_drv.user_data = this;
/*Finally register the driver*/
lv_disp_drv_register(&disp_drv);
}
void LittleVgl::FlushDisplay(const lv_area_t *area, lv_color_t *color_p) {
auto x = area->x1;
auto y = area->y1;
auto width = (area->x2-area->x1)+1;
auto height = (area->y2-area->y1)+1;
lcd.BeginDrawBuffer(x, y, width, height);
lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(color_p), width * height*2) ;
ulTaskNotifyTake(pdTRUE, 500);
/* IMPORTANT!!!
* Inform the graphics library that you are ready with the flushing*/
lv_disp_flush_ready(&disp_drv);
}

29
src/DisplayApp/LittleVgl.h Normal file
View file

@ -0,0 +1,29 @@
#pragma once
#include <libs/lvgl/src/lv_hal/lv_hal.h>
#include <drivers/St7789.h>
static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p);
namespace Pinetime {
namespace Components {
class LittleVgl {
public:
LittleVgl(Pinetime::Drivers::St7789& lcd);
void FlushDisplay(const lv_area_t * area, lv_color_t * color_p);
private:
Pinetime::Drivers::St7789& lcd;
lv_disp_buf_t disp_buf_2;
lv_color_t buf2_1[LV_HOR_RES_MAX * 2];
lv_color_t buf2_2[LV_HOR_RES_MAX * 2];
lv_disp_drv_t disp_drv;
};
}
}

77
src/DisplayApp/Screens/Clock.cpp
View file

@ -2,17 +2,46 @@
#include <libs/date/includes/date/date.h>
#include <Components/DateTime/DateTimeController.h>
#include <Version.h>
#include <libs/lvgl/lvgl.h>
#include "Clock.h"
using namespace Pinetime::Applications::Screens;
extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed;
extern lv_font_t jetbrains_mono_bold_20;
Clock::Clock(Pinetime::Components::Gfx &gfx) : Screen(gfx), currentDateTime{{}}, version {{}} {
label_battery = lv_label_create(lv_scr_act(), NULL);
lv_obj_align(label_battery, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -80, 0);
labelStyle = const_cast<lv_style_t *>(lv_label_get_style(label_battery, LV_LABEL_STYLE_MAIN));
labelStyle->text.font = &jetbrains_mono_bold_20;
lv_style_copy(&labelBigStyle, labelStyle);
labelBigStyle.text.font = &jetbrains_mono_extrabold_compressedextrabold_compressed;
lv_label_set_style(label_battery, LV_LABEL_STYLE_MAIN, labelStyle);
label_ble = lv_label_create(lv_scr_act(), NULL);
lv_label_set_style(label_ble, LV_LABEL_STYLE_MAIN, labelStyle);
lv_obj_align(label_ble, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, 0);
label_time = lv_label_create(lv_scr_act(), NULL);
lv_label_set_style(label_time, LV_LABEL_STYLE_MAIN, &labelBigStyle);
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);
label_date = lv_label_create(lv_scr_act(), NULL);
lv_label_set_style(label_date, LV_LABEL_STYLE_MAIN, labelStyle);
lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 80);
label_version = lv_label_create(lv_scr_act(), NULL);
lv_label_set_style(label_version, LV_LABEL_STYLE_MAIN, labelStyle);
lv_obj_align(label_version, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 100);
}
void Clock::Refresh(bool fullRefresh) {
if(fullRefresh) {
gfx.FillRectangle(0,0,240,240,0x0000);
currentChar[0] = 1;
currentChar[1] = 2;
currentChar[2] = 3;
currentChar[3] = 4;
auto dummy = currentDateTime.Get();
}
@ -23,12 +52,14 @@ void Clock::Refresh(bool fullRefresh) {
newBatteryValue = (newBatteryValue < 0) ? 0 : newBatteryValue;
sprintf(batteryChar, "BAT: %d%%", newBatteryValue);
gfx.DrawString((240 - 108), 0, 0xffff, batteryChar, &smallFont, false);
lv_label_set_text(label_battery, batteryChar);
}
if (fullRefresh || bleState.IsUpdated()) {
uint16_t color = (bleState.Get() == BleConnectionStates::Connected) ? 0xffff : 0x0000;
gfx.DrawString(10, 0, color, "BLE", &smallFont, false);
lv_label_set_text(label_ble, "BLE");
// TODO color
}
if(fullRefresh || currentDateTime.IsUpdated()) {
@ -53,35 +84,16 @@ void Clock::Refresh(bool fullRefresh) {
char hoursChar[3];
sprintf(hoursChar, "%02d", hour);
uint8_t x = 7;
if (hoursChar[0] != currentChar[0]) {
gfx.DrawChar(&largeFont, hoursChar[0], &x, 78, 0xffff);
currentChar[0] = hoursChar[0];
}
x = 61;
if (hoursChar[1] != currentChar[1]) {
gfx.DrawChar(&largeFont, hoursChar[1], &x, 78, 0xffff);
currentChar[1] = hoursChar[1];
}
x = 127;
if (minutesChar[0] != currentChar[2]) {
gfx.DrawChar(&largeFont, minutesChar[0], &x, 78, 0xffff);
currentChar[2] = minutesChar[0];
}
x = 181;
if (minutesChar[1] != currentChar[3]) {
gfx.DrawChar(&largeFont, minutesChar[1], &x, 78, 0xffff);
currentChar[3] = minutesChar[1];
}
char timeStr[6];
sprintf(timeStr, "%c%c:%c%c", hoursChar[0],hoursChar[1],minutesChar[0], minutesChar[1]);
lv_label_set_text(label_time, timeStr);
if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
gfx.FillRectangle(0,180, 240, 15, 0x0000);
char dateStr[22];
sprintf(dateStr, "%s %d %s %d", DayOfWeekToString(dayOfWeek), day, MonthToString(month), year);
gfx.DrawString(10, 180, 0xffff, dateStr, &smallFont, false);
lv_label_set_text(label_date, dateStr);
currentYear = year;
currentMonth = month;
@ -93,8 +105,9 @@ void Clock::Refresh(bool fullRefresh) {
if(fullRefresh || version.IsUpdated()) {
char version[20];
sprintf(version, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
gfx.DrawString(20, 220, 0xffff, version, &smallFont, false);
lv_label_set_text(label_version, version);
}
}
const char *Clock::MonthToString(Pinetime::Controllers::DateTime::Months month) {
@ -131,3 +144,5 @@ char const *Clock::MonthsString[] = {
"NOV",
"DEC"
};

15
src/DisplayApp/Screens/Clock.h
View file

@ -5,6 +5,8 @@
#include <Components/Gfx/Gfx.h>
#include "Screen.h"
#include <bits/unique_ptr.h>
#include <libs/lvgl/src/lv_core/lv_style.h>
#include <libs/lvgl/src/lv_core/lv_obj.h>
#include "../Fonts/lcdfont14.h"
#include "../Fonts/lcdfont70.h"
#include "../../Version.h"
@ -33,7 +35,7 @@ namespace Pinetime {
class Clock : public Screen{
public:
enum class BleConnectionStates{ NotConnected, Connected};
Clock(Components::Gfx& gfx) : Screen(gfx), currentDateTime{{}}, version {{}} {}
Clock(Components::Gfx& gfx);
void Refresh(bool fullRefresh) override;
void SetBatteryPercentRemaining(uint8_t percent) { batteryPercentRemaining = percent; }
@ -49,7 +51,6 @@ namespace Pinetime {
const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
char currentChar[4];
uint16_t currentYear = 1970;
Pinetime::Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
Pinetime::Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
@ -59,6 +60,16 @@ namespace Pinetime {
DirtyValue<BleConnectionStates> bleState {BleConnectionStates::NotConnected};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds>> currentDateTime;
DirtyValue<Pinetime::Version> version;
lv_style_t* labelStyle;
lv_style_t labelBigStyle;
lv_obj_t * label_battery;
lv_obj_t * label_ble;
lv_obj_t* label_time;
lv_obj_t* label_date;
lv_obj_t* label_version;
};
}
}

17
src/DisplayApp/Screens/Message.cpp
View file

@ -3,19 +3,26 @@
#include <Components/DateTime/DateTimeController.h>
#include <Version.h>
#include <libs/lvgl/src/lv_core/lv_obj.h>
#include <libs/lvgl/src/lv_font/lv_font.h>
#include <libs/lvgl/lvgl.h>
#include "Message.h"
using namespace Pinetime::Applications::Screens;
extern lv_font_t jetbrains_mono_extrabold_compressedextrabold_compressed;
lv_obj_t * label;
int x = 0;
void Message::Refresh(bool fullRefresh) {
if(fullRefresh) {
lv_obj_t * btn = lv_btn_create(lv_scr_act(), NULL); /*Add a button the current screen*/
lv_obj_set_pos(btn, 10, 10); /*Set its position*/
lv_obj_set_size(btn, 100, 50); /*Set its size*/
label = lv_label_create(btn, NULL); /*Add a label to the button*/
lv_label_set_text(label, "Button"); /*Set the labels text*/
label = lv_label_create(lv_scr_act(), NULL); /*Add a label to the button*/
labelStyle = const_cast<lv_style_t *>(lv_label_get_style(label, LV_LABEL_STYLE_MAIN));
labelStyle->text.font = &jetbrains_mono_extrabold_compressedextrabold_compressed;
lv_label_set_style(label, LV_LABEL_STYLE_MAIN, labelStyle);
lv_label_set_text(label, "01:23"); /*Set the labels text*/
} else {
lv_obj_set_pos(label, 0, x++);
if(x > 200) x = 0;
}
}

3
src/DisplayApp/Screens/Message.h
View file

@ -8,6 +8,7 @@
#include "../Fonts/lcdfont14.h"
#include "../Fonts/lcdfont70.h"
#include "../../Version.h"
#include <lvgl/src/lv_core/lv_style.h>
namespace Pinetime {
namespace Applications {
@ -20,6 +21,8 @@ namespace Pinetime {
private:
const FONT_INFO largeFont {lCD_70ptFontInfo.height, lCD_70ptFontInfo.startChar, lCD_70ptFontInfo.endChar, lCD_70ptFontInfo.spacePixels, lCD_70ptFontInfo.charInfo, lCD_70ptFontInfo.data};
const FONT_INFO smallFont {lCD_14ptFontInfo.height, lCD_14ptFontInfo.startChar, lCD_14ptFontInfo.endChar, lCD_14ptFontInfo.spacePixels, lCD_14ptFontInfo.charInfo, lCD_14ptFontInfo.data};
lv_style_t* labelStyle;
};
}
}

206
src/DisplayApp/lv_port_disp.cpp
View file

@ -1,206 +0,0 @@
/**
* @file lv_port_disp_templ.c
*
*/
/*Copy this file as "lv_port_disp.c" and set this value to "1" to enable content*/
#if 1
/*********************
* INCLUDES
*********************/
#include <FreeRTOS.h>
#include <projdefs.h>
#include <task.h>
#include "lv_port_disp.h"
#include "../drivers/St7789.h"
/*********************
* DEFINES
*********************/
/**********************
* TYPEDEFS
**********************/
/**********************
* STATIC PROTOTYPES
**********************/
static void disp_init(void);
static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p);
#if LV_USE_GPU
static void gpu_blend(lv_color_t * dest, const lv_color_t * src, uint32_t length, lv_opa_t opa);
static void gpu_fill(lv_color_t * dest, uint32_t length, lv_color_t color);
#endif
/**********************
* STATIC VARIABLES
**********************/
/**********************
* MACROS
**********************/
/**********************
* GLOBAL FUNCTIONS
**********************/
void lv_port_disp_init(void)
{
/*-------------------------
* Initialize your display
* -----------------------*/
disp_init();
/*-----------------------------
* Create a buffer for drawing
*----------------------------*/
/* LittlevGL requires a buffer where it draws the objects. The buffer's has to be greater than 1 display row
*
* There are three buffering configurations:
* 1. Create ONE buffer with some rows:
* LittlevGL will draw the display's content here and writes it to your display
*
* 2. Create TWO buffer with some rows:
* LittlevGL will draw the display's content to a buffer and writes it your display.
* You should use DMA to write the buffer's content to the display.
* It will enable LittlevGL to draw the next part of the screen to the other buffer while
* the data is being sent form the first buffer. It makes rendering and flushing parallel.
*
* 3. Create TWO screen-sized buffer:
* Similar to 2) but the buffer have to be screen sized. When LittlevGL is ready it will give the
* whole frame to display. This way you only need to change the frame buffer's address instead of
* copying the pixels.
* */
/* Example for 1) */
#if 0
static lv_disp_buf_t disp_buf_1;
static lv_color_t buf1_1[LV_HOR_RES_MAX * 10]; /*A buffer for 10 rows*/
lv_disp_buf_init(&disp_buf_1, buf1_1, NULL, LV_HOR_RES_MAX * 10); /*Initialize the display buffer*/
#endif
/* Example for 2) */
static lv_disp_buf_t disp_buf_2;
static lv_color_t buf2_1[LV_HOR_RES_MAX * 2]; /*A buffer for 10 rows*/
static lv_color_t buf2_2[LV_HOR_RES_MAX * 2]; /*An other buffer for 10 rows*/
lv_disp_buf_init(&disp_buf_2, buf2_1, buf2_2, LV_HOR_RES_MAX * 2); /*Initialize the display buffer*/
/* Example for 3) */
#if 0
static lv_disp_buf_t disp_buf_3;
static lv_color_t buf3_1[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*A screen sized buffer*/
static lv_color_t buf3_2[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*An other screen sized buffer*/
lv_disp_buf_init(&disp_buf_3, buf3_1, buf3_2, LV_HOR_RES_MAX * LV_VER_RES_MAX); /*Initialize the display buffer*/
#endif
/*-----------------------------------
* Register the display in LittlevGL
*----------------------------------*/
lv_disp_drv_t disp_drv; /*Descriptor of a display driver*/
lv_disp_drv_init(&disp_drv); /*Basic initialization*/
/*Set up the functions to access to your display*/
/*Set the resolution of the display*/
disp_drv.hor_res = 240;
disp_drv.ver_res = 240;
/*Used to copy the buffer's content to the display*/
disp_drv.flush_cb = disp_flush;
/*Set a display buffer*/
disp_drv.buffer = &disp_buf_2;
#if LV_USE_GPU
/*Optionally add functions to access the GPU. (Only in buffered mode, LV_VDB_SIZE != 0)*/
/*Blend two color array using opacity*/
disp_drv.gpu_blend = gpu_blend;
/*Fill a memory array with a color*/
disp_drv.gpu_fill = gpu_fill;
#endif
/*Finally register the driver*/
lv_disp_drv_register(&disp_drv);
}
/**********************
* STATIC FUNCTIONS
**********************/
/* Initialize your display and the required peripherals. */
extern Pinetime::Drivers::St7789* ptrLcd;
static void disp_init(void)
{
/*You code here*/
}
void NotifyEndOfTransfert(TaskHandle_t task) {
if(task != nullptr) {
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
vTaskNotifyGiveFromISR(task, &xHigherPriorityTaskWoken);
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}
}
/* Flush the content of the internal buffer the specific area on the display
* You can use DMA or any hardware acceleration to do this operation in the background but
* 'lv_disp_flush_ready()' has to be called when finished. */
static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
{
/*The most simple case (but also the slowest) to put all pixels to the screen one-by-one*/
auto x = area->x1;
auto y = area->y1;
auto width = (area->x2-area->x1)+1;
auto height = (area->y2-area->y1)+1;
ptrLcd->BeginDrawBuffer(x, y, width, height);
ptrLcd->NextDrawBuffer(reinterpret_cast<const uint8_t *>(color_p), width * height*2) ;
ulTaskNotifyTake(pdTRUE, 500);
/* IMPORTANT!!!
* Inform the graphics library that you are ready with the flushing*/
lv_disp_flush_ready(disp_drv);
}
/*OPTIONAL: GPU INTERFACE*/
#if LV_USE_GPU
/* If your MCU has hardware accelerator (GPU) then you can use it to blend to memories using opacity
* It can be used only in buffered mode (LV_VDB_SIZE != 0 in lv_conf.h)*/
static void gpu_blend(lv_disp_drv_t * disp_drv, lv_color_t * dest, const lv_color_t * src, uint32_t length, lv_opa_t opa)
{
/*It's an example code which should be done by your GPU*/
uint32_t i;
for(i = 0; i < length; i++) {
dest[i] = lv_color_mix(dest[i], src[i], opa);
}
}
/* If your MCU has hardware accelerator (GPU) then you can use it to fill a memory with a color
* It can be used only in buffered mode (LV_VDB_SIZE != 0 in lv_conf.h)*/
static void gpu_fill_cb(lv_disp_drv_t * disp_drv, lv_color_t * dest_buf, lv_coord_t dest_width,
const lv_area_t * fill_area, lv_color_t color);
{
/*It's an example code which should be done by your GPU*/
uint32_t x, y;
dest_buf += dest_width * fill_area->y1; /*Go to the first line*/
for(y = fill_area->y1; y < fill_area->y2; y++) {
for(x = fill_area->x1; x < fill_area->x2; x++) {
dest_buf[x] = color;
}
dest_buf+=dest_width; /*Go to the next line*/
}
}
#endif /*LV_USE_GPU*/
#else /* Enable this file at the top */
/* This dummy typedef exists purely to silence -Wpedantic. */
typedef int keep_pedantic_happy;
#endif

45
src/DisplayApp/lv_port_disp.h
View file

@ -1,45 +0,0 @@
/**
* @file lv_port_disp_templ.h
*
*/
/*Copy this file as "lv_port_disp.h" and set this value to "1" to enable content*/
#if 1
#ifndef LV_PORT_DISP_TEMPL_H
#define LV_PORT_DISP_TEMPL_H
#ifdef __cplusplus
extern "C" {
#endif
/*********************
* INCLUDES
*********************/
#include "lvgl/lvgl.h"
/*********************
* DEFINES
*********************/
/**********************
* TYPEDEFS
**********************/
/**********************
* GLOBAL PROTOTYPES
**********************/
void lv_port_disp_init(void);
/**********************
* MACROS
**********************/
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /*LV_PORT_DISP_TEMPL_H*/
#endif /*Disable/Enable content*/

12
src/libs/lv_conf.h
View file

@ -123,7 +123,7 @@ typedef int16_t lv_coord_t;
*==================*/
/*1: Enable the Animations */
#define LV_USE_ANIMATION 1
#define LV_USE_ANIMATION 0
#if LV_USE_ANIMATION
/*Declare the type of the user data of animations (can be e.g. `void *`, `int`, `struct`)*/
@ -132,7 +132,7 @@ typedef void * lv_anim_user_data_t;
#endif
/* 1: Enable shadow drawing*/
#define LV_USE_SHADOW 1
#define LV_USE_SHADOW 0
/* 1: Enable object groups (for keyboard/encoder navigation) */
#define LV_USE_GROUP 0
@ -278,9 +278,9 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i
#define LV_THEME_LIVE_UPDATE 0 /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/
#define LV_USE_THEME_TEMPL 0 /*Just for test*/
#define LV_USE_THEME_DEFAULT 0 /*Built mainly from the built-in styles. Consumes very few RAM*/
#define LV_USE_THEME_DEFAULT 1 /*Built mainly from the built-in styles. Consumes very few RAM*/
#define LV_USE_THEME_ALIEN 0 /*Dark futuristic theme*/
#define LV_USE_THEME_NIGHT 0 /*Dark elegant theme*/
#define LV_USE_THEME_NIGHT 1 /*Dark elegant theme*/
#define LV_USE_THEME_MONO 0 /*Mono color theme for monochrome displays*/
#define LV_USE_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows*/
#define LV_USE_THEME_ZEN 0 /*Peaceful, mainly light theme */
@ -314,7 +314,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i
/* Optionally declare your custom fonts here.
* You can use these fonts as default font too
* and they will be available globally. E.g.
* #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \
* #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \LV_SUBPX_BGR
* LV_FONT_DECLARE(my_font_2)
*/
#define LV_FONT_CUSTOM_DECLARE
@ -513,7 +513,7 @@ typedef void * lv_obj_user_data_t;
#endif
/*Preload (dependencies: lv_arc, lv_anim)*/
#define LV_USE_PRELOAD 1
#define LV_USE_PRELOAD 0
#if LV_USE_PRELOAD != 0
# define LV_PRELOAD_DEF_ARC_LENGTH 60 /*[deg]*/
# define LV_PRELOAD_DEF_SPIN_TIME 1000 /*[ms]*/

8
src/main.cpp
View file

@ -21,6 +21,7 @@
#include <Components/Gfx/Gfx.h>
#include <lvgl/lvgl.h>
#include <DisplayApp/LittleVgl.h>
#if NRF_LOG_ENABLED
#include "Logging/NrfLogger.h"
@ -34,6 +35,7 @@ std::unique_ptr<Pinetime::Drivers::SpiMaster> spi;
std::unique_ptr<Pinetime::Drivers::St7789> lcd;
Pinetime::Drivers::St7789* ptrLcd;
std::unique_ptr<Pinetime::Components::Gfx> gfx;
std::unique_ptr<Pinetime::Components::LittleVgl> lvgl;
std::unique_ptr<Pinetime::Drivers::Cst816S> touchPanel;
static constexpr uint8_t pinSpiSck = 2;
@ -124,6 +126,7 @@ void SystemTask(void *) {
lcd.reset(new Pinetime::Drivers::St7789(*spi, pinLcdDataCommand));
gfx.reset(new Pinetime::Components::Gfx(*lcd));
lvgl.reset(new Pinetime::Components::LittleVgl(*lcd));
touchPanel.reset(new Pinetime::Drivers::Cst816S());
ptrLcd = lcd.get();
@ -132,7 +135,7 @@ void SystemTask(void *) {
touchPanel->Init();
batteryController.Init();
displayApp.reset(new Pinetime::Applications::DisplayApp(*lcd, *gfx, *touchPanel, batteryController, bleController, dateTimeController));
displayApp.reset(new Pinetime::Applications::DisplayApp(*lcd, *gfx, *lvgl, *touchPanel, batteryController, bleController, dateTimeController));
displayApp->Start();
batteryController.Update();
@ -168,8 +171,7 @@ void SystemTask(void *) {
while(true) {
uint8_t msg;
if (xQueueReceive(systemTaksMsgQueue, &msg, systemTaskSleeping?3600000 : 1000)) {
if (xQueueReceive(systemTaksMsgQueue, &msg, systemTaskSleeping?3600000 : 10)) {
SystemTaskMessages message = static_cast<SystemTaskMessages >(msg);
switch(message) {
case SystemTaskMessages::GoToRunning: systemTaskSleeping = false; break;

6
src/sdk_config.h
View file

@ -8452,15 +8452,15 @@
// <e> NRF_LOG_ENABLED - nrf_log - Logger
//==========================================================
#ifndef NRF_LOG_ENABLED
#define NRF_LOG_ENABLED 0
#define NRF_LOG_ENABLED 1
#endif
#ifndef NRF_LOG_BACKEND_RTT_ENABLED
#define NRF_LOG_BACKEND_RTT_ENABLED 0
#define NRF_LOG_BACKEND_RTT_ENABLED 1
#endif
#ifndef NRF_LOG_BACKEND_SERIAL_USES_RTT
#define NRF_LOG_BACKEND_SERIAL_USES_RTT 0
#define NRF_LOG_BACKEND_SERIAL_USES_RTT 1
#endif
// <h> Log message pool - Configuration of log message pool