diff --git a/code/application/source/cardv/Makefile b/code/application/source/cardv/Makefile old mode 100755 new mode 100644 index fcf3f4654..7ec01bc4d --- a/code/application/source/cardv/Makefile +++ b/code/application/source/cardv/Makefile @@ -226,6 +226,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c \ diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index 87d76afeb..18e3d9afa 100644 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -920,6 +920,9 @@ #define HUNTING_IR_LED_940 DISABLE #define SF_BASE_VERSION "7MD4RCwD3T6" #define HW_S530 1 +#define DCF_DIR_NAME "MEDIA" /* 100HUNTI */ +#define DCF_FILE_NAME "SYFW" /* IMAG0001.JPG */ + #define PHOTO_ISP_STAMP DISABLE #define SF_BASE_VERSION_FEA "R2.3" @@ -976,6 +979,7 @@ #define LV_USER_CFG_STAMP_FONT_ID_LARGE LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_48_1BPP #define LV_USER_CFG_STAMP_FONT_ID_MEDIUM LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_32_1BPP #define LV_USER_CFG_STAMP_FONT_ID_SMALL LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_16_1BPP +#define LV_USER_CFG_STAMP_FONT_ID_XS LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP #define LV_USER_CFG_STAMP_LETTER_SPACE 0 #define LV_USER_CFG_STAMP_TEXT_ALIGN LV_ALIGN_CENTER diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index 130ed830b..5bdb126d1 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -473,8 +473,8 @@ void System_OnStrgInit_FS(void) DCF_SetParm(DCF_PRMID_REMOVE_DUPLICATE_FILE, TRUE); DCF_SetParm(DCF_PRMID_SET_VALID_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_MP4|DCF_FILE_TYPE_MOV); DCF_SetParm(DCF_PRMID_SET_DEP_FILE_FMT, DCF_FILE_TYPE_JPG|DCF_FILE_TYPE_WAV|DCF_FILE_TYPE_MPO); - DCF_SetDirFreeChars("MEDIA"); - DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, "SYFW"); + DCF_SetDirFreeChars(DCF_DIR_NAME); + DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, DCF_FILE_NAME); } #endif } diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index 1e1362381..8d26ef6cd 100644 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -6126,6 +6126,11 @@ INT32 PhotoExe_Preview_SliceEncode_CB2(void* user_data) goto EXIT; } + /* thumbnail date stamp */ + if(PhotoExe_Preview_SliceEncode_DateStamp(&video_frame_out_thumbnail, CAP_DS_EVENT_THUMB) != E_OK){ + goto EXIT; + } + /******************************************************************* * Primary ******************************************************************/ diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c index 7a1224e7f..f59065fc3 100644 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c @@ -497,7 +497,7 @@ void UiDateImprint_SelStampFont(UINT32 uiImageWidth, char **font, UINT32 *ScaleF red_id = LV_USER_CFG_STAMP_FONT_ID_SMALL; } else { - red_id = LV_USER_CFG_STAMP_FONT_ID_XXL; + red_id = LV_USER_CFG_STAMP_FONT_ID_XS; } *font = (char *) lv_plugin_get_font(red_id)->font; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c index f6cebf895..8c51e2c78 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 128 px * Bpp: 1 - * Opts: --format lvgl --size 128 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c --no-compress + * Opts: --format lvgl --size 128 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c index 6d58b9b72..e84241c38 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c index 2ad5c99ee..a0e183672 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 32 px * Bpp: 1 - * Opts: --format lvgl --size 32 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c --no-compress + * Opts: --format lvgl --size 32 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c index 5a3af7a20..bde4765fe 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 48 px * Bpp: 1 - * Opts: --format lvgl --size 48 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c --no-compress + * Opts: --format lvgl --size 48 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c index 17d43767d..314063e9b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 64 px * Bpp: 1 - * Opts: --format lvgl --size 64 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c --no-compress + * Opts: --format lvgl --size 64 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c new file mode 100644 index 000000000..22782917f --- /dev/null +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c @@ -0,0 +1,1144 @@ +/******************************************************************************* + * Size: 8 px + * Bpp: 1 + * Opts: --format lvgl --size 8 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c --no-compress + ******************************************************************************/ + +#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#include "lvgl.h" +#else +#include "lvgl/lvgl.h" +#endif + +#ifndef NOTOSANS_BLACK_8_1BPP +#define NOTOSANS_BLACK_8_1BPP 1 +#endif + +#if NOTOSANS_BLACK_8_1BPP + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + 0x0, + + /* U+0021 "!" */ + 0xff, 0x30, + + /* U+0022 "\"" */ + 0xf7, + + /* U+0023 "#" */ + 0x77, 0xd5, 0xf7, 0x78, + + /* U+0024 "$" */ + 0x6f, 0xee, 0x7f, 0xe0, + + /* U+0025 "%" */ + 0xe9, 0x52, 0xff, 0xd2, 0xa5, 0xc0, + + /* U+0026 "&" */ + 0x73, 0x47, 0x3b, 0xfb, 0xe0, + + /* U+0027 "'" */ + 0xd0, + + /* U+0028 "(" */ + 0x6b, 0x6d, 0xb3, + + /* U+0029 ")" */ + 0xc9, 0xb6, 0xde, + + /* U+002A "*" */ + 0x2f, 0x77, + + /* U+002B "+" */ + 0x4f, 0x44, + + /* U+002C "," */ + 0x70, + + /* U+002D "-" */ + 0xc0, + + /* U+002E "." */ + 0xc0, + + /* U+002F "/" */ + 0x22, 0x64, 0x4c, + + /* U+0030 "0" */ + 0x6f, 0xff, 0xf6, + + /* U+0031 "1" */ + 0x3f, 0x33, 0x33, + + /* U+0032 "2" */ + 0xe3, 0x36, 0x4f, + + /* U+0033 "3" */ + 0xf3, 0x63, 0x3e, + + /* U+0034 "4" */ + 0x37, 0x7b, 0xf3, + + /* U+0035 "5" */ + 0x7a, 0x1e, 0x31, 0xf8, + + /* U+0036 "6" */ + 0x3a, 0x1e, 0xb5, 0xb8, + + /* U+0037 "7" */ + 0xf3, 0x26, 0x64, + + /* U+0038 "8" */ + 0xfd, 0x7f, 0x9f, + + /* U+0039 "9" */ + 0x6d, 0xdf, 0x1e, + + /* U+003A ":" */ + 0xc0, 0xc0, + + /* U+003B ";" */ + 0xc3, 0x80, + + /* U+003C "<" */ + 0x3, 0xce, 0x30, + + /* U+003D "=" */ + 0xf0, 0xf0, + + /* U+003E ">" */ + 0xc, 0x37, 0xc0, + + /* U+003F "?" */ + 0xe2, 0x26, 0x6, + + /* U+0040 "@" */ + 0x3c, 0xbe, 0xad, 0x5b, 0xd8, 0x1e, 0x0, + + /* U+0041 "A" */ + 0x31, 0xc7, 0x96, 0xfb, 0x30, + + /* U+0042 "B" */ + 0xf6, 0xbd, 0xad, 0x78, + + /* U+0043 "C" */ + 0x7e, 0x31, 0x8c, 0x3c, + + /* U+0044 "D" */ + 0xf6, 0xf7, 0xbd, 0xf8, + + /* U+0045 "E" */ + 0xfc, 0xfc, 0xcf, + + /* U+0046 "F" */ + 0xfc, 0xfc, 0xcc, + + /* U+0047 "G" */ + 0x7e, 0x3f, 0xbd, 0xbc, + + /* U+0048 "H" */ + 0xde, 0xff, 0xbd, 0xec, + + /* U+0049 "I" */ + 0xfb, 0x6d, 0xc0, + + /* U+004A "J" */ + 0x33, 0x33, 0x33, 0x3e, + + /* U+004B "K" */ + 0xde, 0xbd, 0xed, 0xec, + + /* U+004C "L" */ + 0xcc, 0xcc, 0xcf, + + /* U+004D "M" */ + 0xef, 0xdf, 0xbf, 0x7d, 0x7a, 0xc0, + + /* U+004E "N" */ + 0xef, 0xbe, 0xf7, 0xdf, 0x70, + + /* U+004F "O" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe0, + + /* U+0050 "P" */ + 0xef, 0xff, 0xcc, + + /* U+0051 "Q" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe1, 0x83, + + /* U+0052 "R" */ + 0xe7, 0xbd, 0xce, 0x78, + + /* U+0053 "S" */ + 0x7c, 0xe7, 0x3e, + + /* U+0054 "T" */ + 0xf6, 0x66, 0x66, + + /* U+0055 "U" */ + 0xde, 0xf7, 0xbd, 0xb8, + + /* U+0056 "V" */ + 0xcb, 0x65, 0x9c, 0x70, 0xc0, + + /* U+0057 "W" */ + 0xd9, 0xdb, 0x5b, 0x5e, 0x76, 0x66, + + /* U+0058 "X" */ + 0xc9, 0xe3, 0xc, 0x7b, 0x20, + + /* U+0059 "Y" */ + 0xcd, 0xe7, 0x8c, 0x30, 0xc0, + + /* U+005A "Z" */ + 0xf3, 0x66, 0xcf, + + /* U+005B "[" */ + 0xea, 0xab, + + /* U+005C "\\" */ + 0xc4, 0x46, 0x22, + + /* U+005D "]" */ + 0xd5, 0x57, + + /* U+005E "^" */ + 0x66, 0x79, + + /* U+005F "_" */ + 0xf0, + + /* U+0060 "`" */ + 0xcc, + + /* U+0061 "a" */ + 0xf1, 0xfb, 0xf0, + + /* U+0062 "b" */ + 0xcc, 0xff, 0xff, 0xf0, + + /* U+0063 "c" */ + 0x7c, 0xcc, 0x70, + + /* U+0064 "d" */ + 0x18, 0xdf, 0xbd, 0xed, 0xe0, + + /* U+0065 "e" */ + 0x76, 0xbf, 0x87, 0x0, + + /* U+0066 "f" */ + 0xfb, 0xed, 0xb0, + + /* U+0067 "g" */ + 0x7e, 0xf7, 0xb7, 0x8f, 0xc0, + + /* U+0068 "h" */ + 0xc6, 0x3f, 0xbd, 0xef, 0x60, + + /* U+0069 "i" */ + 0xcf, 0xfc, + + /* U+006A "j" */ + 0x61, 0xb6, 0xdb, 0xe0, + + /* U+006B "k" */ + 0xc6, 0x37, 0xef, 0x6b, 0x60, + + /* U+006C "l" */ + 0xff, 0xfc, + + /* U+006D "m" */ + 0xff, 0xff, 0xff, 0xfc, + + /* U+006E "n" */ + 0xfe, 0xf7, 0xbd, 0x80, + + /* U+006F "o" */ + 0x76, 0xf7, 0xb7, 0x0, + + /* U+0070 "p" */ + 0xff, 0xff, 0xfc, 0xc0, + + /* U+0071 "q" */ + 0xff, 0xff, 0xf3, 0x30, + + /* U+0072 "r" */ + 0xfc, 0xcc, 0xc0, + + /* U+0073 "s" */ + 0xec, 0xe3, 0xe0, + + /* U+0074 "t" */ + 0x6f, 0x66, 0x67, + + /* U+0075 "u" */ + 0xde, 0xf7, 0xbf, 0x80, + + /* U+0076 "v" */ + 0xda, 0x94, 0xe2, 0x0, + + /* U+0077 "w" */ + 0xdb, 0xbd, 0xbb, 0x66, 0xc0, + + /* U+0078 "x" */ + 0xdb, 0x9c, 0xed, 0x80, + + /* U+0079 "y" */ + 0x9d, 0xf6, 0x66, 0xc0, + + /* U+007A "z" */ + 0xf3, 0x6c, 0xf0, + + /* U+007B "{" */ + 0x76, 0x6c, 0x66, 0x67, + + /* U+007C "|" */ + 0xff, 0x80, + + /* U+007D "}" */ + 0xe6, 0x63, 0x66, 0x6e, + + /* U+007E "~" */ + 0xc3, + + /* U+00B0 "°" */ + 0xf7, 0x80, + + /* U+00BA "º" */ + 0xf7, 0x80, + + /* U+00C1 "Á" */ + 0x10, 0x3, 0x1c, 0x79, 0x6f, 0xb3, + + /* U+00C3 "Ã" */ + 0x70, 0x1c, 0xa5, 0x6f, 0xfb, + + /* U+00C4 "Ä" */ + 0x78, 0x3, 0x1e, 0x79, 0xef, 0xf3, + + /* U+00C9 "É" */ + 0x20, 0xfc, 0xfc, 0xcf, + + /* U+00CE "Î" */ + 0xe3, 0xed, 0xb7, + + /* U+00D3 "Ó" */ + 0x18, 0x40, 0x1e, 0xcf, 0x3c, 0xf3, 0x78, + + /* U+00D6 "Ö" */ + 0x78, 0x7, 0xb3, 0xcf, 0x3c, 0xde, + + /* U+00DC "Ü" */ + 0x70, 0x37, 0xbd, 0xef, 0x6e, + + /* U+00DF "ß" */ + 0x76, 0xbd, 0xef, 0xe7, 0xe0, + + /* U+00E0 "à" */ + 0x42, 0xf1, 0xfb, 0xf0, + + /* U+00E1 "á" */ + 0x34, 0xf1, 0xfb, 0xf0, + + /* U+00E2 "â" */ + 0x69, 0xf1, 0xfb, 0xf0, + + /* U+00E3 "ã" */ + 0x53, 0x9c, 0x27, 0xad, 0xe0, + + /* U+00E4 "ä" */ + 0x6c, 0x7, 0x4, 0x79, 0xa7, 0x80, + + /* U+00E7 "ç" */ + 0x7c, 0xcf, 0x62, 0x60, + + /* U+00E8 "è" */ + 0x41, 0x1d, 0xaf, 0xe1, 0xc0, + + /* U+00E9 "é" */ + 0x32, 0x1d, 0xaf, 0xe1, 0xc0, + + /* U+00EA "ê" */ + 0x64, 0x9d, 0xaf, 0xe1, 0xc0, + + /* U+00EC "ì" */ + 0x45, 0xb6, 0xd8, + + /* U+00ED "í" */ + 0x73, 0x6d, 0xb0, + + /* U+00F1 "ñ" */ + 0x53, 0xbf, 0xbd, 0xef, 0x60, + + /* U+00F2 "ò" */ + 0x61, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00F3 "ó" */ + 0x31, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00F5 "õ" */ + 0x53, 0x9d, 0xbd, 0xed, 0xc0, + + /* U+00F6 "ö" */ + 0xf0, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00FA "ú" */ + 0x31, 0x37, 0xbd, 0xef, 0xe0, + + /* U+00FC "ü" */ + 0xf0, 0x37, 0xbd, 0xef, 0xe0, + + /* U+0105 "ą" */ + 0xf1, 0xfd, 0xf2, 0x10, + + /* U+0118 "Ę" */ + 0xfb, 0xed, 0xc9, + + /* U+0410 "А" */ + 0x31, 0xc7, 0x96, 0xfb, 0x30, + + /* U+0411 "Б" */ + 0xec, 0xff, 0xfe, + + /* U+0412 "В" */ + 0xf6, 0xbd, 0xad, 0x78, + + /* U+0413 "Г" */ + 0xfc, 0xcc, 0xcc, + + /* U+0414 "Д" */ + 0x3c, 0x58, 0xb3, 0x66, 0xdf, 0xf1, 0xe3, + + /* U+0417 "З" */ + 0xf8, 0xd8, 0x31, 0xf8, + + /* U+0418 "И" */ + 0xcf, 0x7d, 0xfb, 0xef, 0x30, + + /* U+041A "К" */ + 0xde, 0xbd, 0xed, 0xec, + + /* U+041C "М" */ + 0xef, 0xdf, 0xbf, 0x7d, 0x7a, 0xc0, + + /* U+041D "Н" */ + 0xde, 0xff, 0xbd, 0xec, + + /* U+041E "О" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe0, + + /* U+041F "П" */ + 0xfe, 0xf7, 0xbd, 0xec, + + /* U+0420 "Р" */ + 0xef, 0xff, 0xcc, + + /* U+0421 "С" */ + 0x7e, 0x31, 0x8c, 0x3c, + + /* U+0422 "Т" */ + 0xf6, 0x66, 0x66, + + /* U+0423 "У" */ + 0xde, 0xd4, 0xe2, 0x70, + + /* U+0424 "Ф" */ + 0x7b, 0xff, 0xff, 0x78, 0xc0, + + /* U+0426 "Ц" */ + 0xdb, 0x6d, 0xb6, 0xdb, 0xf0, 0xc3, + + /* U+0427 "Ч" */ + 0xde, 0xf7, 0xf1, 0x8c, + + /* U+0428 "Ш" */ + 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, + + /* U+042B "Ы" */ + 0xcf, 0x3f, 0xff, 0xff, 0xb0, + + /* U+042D "Э" */ + 0xf0, 0xde, 0x39, 0xf8, + + /* U+042F "Я" */ + 0x7a, 0xd6, 0xf5, 0xec, + + /* U+0430 "а" */ + 0xf1, 0xfb, 0xf0, + + /* U+0431 "б" */ + 0x7e, 0x3d, 0xbd, 0xed, 0xc0, + + /* U+0432 "в" */ + 0xfd, 0xed, 0xf0, + + /* U+0433 "г" */ + 0xfc, 0xcc, 0xc0, + + /* U+0434 "д" */ + 0x38, 0xe7, 0x96, 0xff, 0x3c, 0xc0, + + /* U+0435 "е" */ + 0x76, 0xbf, 0x87, 0x0, + + /* U+0436 "ж" */ + 0xdb, 0x5a, 0x7e, 0x5a, 0xdb, + + /* U+0437 "з" */ + 0xf3, 0x63, 0xf0, + + /* U+0438 "и" */ + 0xdf, 0xff, 0xfd, 0x80, + + /* U+0439 "й" */ + 0x53, 0xb7, 0xff, 0xff, 0x60, + + /* U+043A "к" */ + 0xde, 0xbd, 0xad, 0x80, + + /* U+043B "л" */ + 0x7a, 0xd7, 0xb9, 0x80, + + /* U+043C "м" */ + 0xff, 0xff, 0xff, 0xec, + + /* U+043D "н" */ + 0xff, 0xff, 0xf0, + + /* U+043E "о" */ + 0x76, 0xf7, 0xb7, 0x0, + + /* U+043F "п" */ + 0xff, 0xff, 0xf0, + + /* U+0440 "р" */ + 0xff, 0xff, 0xfc, 0xc0, + + /* U+0441 "с" */ + 0x7c, 0xcc, 0x70, + + /* U+0442 "т" */ + 0xf6, 0x66, 0x60, + + /* U+0443 "у" */ + 0x9d, 0xf6, 0x66, 0xc0, + + /* U+0444 "ф" */ + 0x30, 0xc7, 0xbf, 0xff, 0xf7, 0x8c, 0x30, + + /* U+0445 "х" */ + 0xdb, 0x9c, 0xed, 0x80, + + /* U+0446 "ц" */ + 0xdb, 0x6d, 0xb6, 0xfc, 0x30, 0xc0, + + /* U+0447 "ч" */ + 0xde, 0xfe, 0x31, 0x80, + + /* U+0448 "ш" */ + 0xff, 0xff, 0xff, 0xfc, + + /* U+0449 "щ" */ + 0xf6, 0xf6, 0xf6, 0xf6, 0xff, 0x3, 0x3, + + /* U+044A "ъ" */ + 0xe1, 0x87, 0x9b, 0x78, + + /* U+044B "ы" */ + 0xcf, 0x3e, 0xf7, 0xec, + + /* U+044C "ь" */ + 0xcc, 0xfd, 0xf0, + + /* U+044D "э" */ + 0xe2, 0x72, 0xe0, + + /* U+044E "ю" */ + 0xdd, 0xaf, 0xde, 0xbd, 0xc0, + + /* U+044F "я" */ + 0x7a, 0xde, 0xbd, 0x80, + + /* U+2026 "…" */ + 0xfc +}; + + +/*--------------------- + * 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 = 33, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1, .adv_w = 37, .box_w = 2, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 3, .adv_w = 67, .box_w = 4, .box_h = 2, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 4, .adv_w = 85, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 8, .adv_w = 74, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 12, .adv_w = 121, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 18, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 23, .adv_w = 37, .box_w = 2, .box_h = 2, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 24, .adv_w = 46, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 27, .adv_w = 46, .box_w = 3, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 30, .adv_w = 69, .box_w = 4, .box_h = 4, .ofs_x = 0, .ofs_y = 3}, + {.bitmap_index = 32, .adv_w = 75, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 34, .adv_w = 40, .box_w = 2, .box_h = 2, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 35, .adv_w = 41, .box_w = 2, .box_h = 1, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 36, .adv_w = 37, .box_w = 2, .box_h = 1, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 37, .adv_w = 57, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 40, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 43, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 46, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 49, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 52, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 55, .adv_w = 75, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 59, .adv_w = 75, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 63, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 66, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 69, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 72, .adv_w = 37, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 74, .adv_w = 38, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 76, .adv_w = 75, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 79, .adv_w = 75, .box_w = 4, .box_h = 3, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 81, .adv_w = 75, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 84, .adv_w = 65, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 87, .adv_w = 115, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 94, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 99, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 103, .adv_w = 83, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 107, .adv_w = 94, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 111, .adv_w = 70, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 114, .adv_w = 69, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 117, .adv_w = 95, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 121, .adv_w = 98, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 125, .adv_w = 56, .box_w = 3, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 128, .adv_w = 45, .box_w = 4, .box_h = 8, .ofs_x = -1, .ofs_y = -2}, + {.bitmap_index = 132, .adv_w = 88, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 136, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 139, .adv_w = 124, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 145, .adv_w = 107, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 150, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 155, .adv_w = 81, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 158, .adv_w = 102, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 164, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 168, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 171, .adv_w = 76, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 174, .adv_w = 97, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 178, .adv_w = 89, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 183, .adv_w = 133, .box_w = 8, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 189, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 194, .adv_w = 85, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 199, .adv_w = 78, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 202, .adv_w = 41, .box_w = 2, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 204, .adv_w = 57, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 207, .adv_w = 41, .box_w = 2, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 209, .adv_w = 67, .box_w = 4, .box_h = 4, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 211, .adv_w = 64, .box_w = 4, .box_h = 1, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 212, .adv_w = 54, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 5}, + {.bitmap_index = 213, .adv_w = 80, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 216, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 220, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 223, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 228, .adv_w = 79, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 232, .adv_w = 53, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 235, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 240, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 245, .adv_w = 42, .box_w = 2, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 247, .adv_w = 41, .box_w = 3, .box_h = 9, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 251, .adv_w = 84, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 256, .adv_w = 41, .box_w = 2, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 258, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 262, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 266, .adv_w = 82, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 270, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 274, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 278, .adv_w = 60, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 281, .adv_w = 66, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 284, .adv_w = 59, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 287, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 291, .adv_w = 78, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 295, .adv_w = 116, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 300, .adv_w = 81, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 304, .adv_w = 78, .box_w = 4, .box_h = 7, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 308, .adv_w = 65, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 311, .adv_w = 55, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 315, .adv_w = 65, .box_w = 1, .box_h = 9, .ofs_x = 2, .ofs_y = -2}, + {.bitmap_index = 317, .adv_w = 55, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 321, .adv_w = 75, .box_w = 4, .box_h = 2, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 322, .adv_w = 54, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 324, .adv_w = 50, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 326, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 332, .adv_w = 93, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 337, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 343, .adv_w = 70, .box_w = 4, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 347, .adv_w = 56, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 350, .adv_w = 102, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 357, .adv_w = 102, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 363, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 368, .adv_w = 96, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 373, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 377, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 381, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 385, .adv_w = 80, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 390, .adv_w = 80, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 396, .adv_w = 69, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 400, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 405, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 410, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 415, .adv_w = 42, .box_w = 3, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 418, .adv_w = 42, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 421, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 426, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 431, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 436, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 441, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 446, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 451, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 456, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 460, .adv_w = 70, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 463, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 468, .adv_w = 83, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 471, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 475, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 478, .adv_w = 104, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 485, .adv_w = 85, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 489, .adv_w = 108, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 494, .adv_w = 89, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 498, .adv_w = 124, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 504, .adv_w = 98, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 508, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 513, .adv_w = 95, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 517, .adv_w = 81, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 520, .adv_w = 83, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 524, .adv_w = 76, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 527, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 531, .adv_w = 114, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 536, .adv_w = 106, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 542, .adv_w = 97, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 546, .adv_w = 139, .box_w = 8, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 552, .adv_w = 118, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 557, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 561, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 565, .adv_w = 80, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 568, .adv_w = 83, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 573, .adv_w = 81, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 576, .adv_w = 64, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 579, .adv_w = 89, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 585, .adv_w = 79, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 589, .adv_w = 124, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 594, .adv_w = 70, .box_w = 4, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 597, .adv_w = 92, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 601, .adv_w = 92, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 606, .adv_w = 87, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 610, .adv_w = 88, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 614, .adv_w = 110, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 618, .adv_w = 85, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 621, .adv_w = 82, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 625, .adv_w = 84, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 628, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 632, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 635, .adv_w = 77, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 638, .adv_w = 78, .box_w = 4, .box_h = 7, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 642, .adv_w = 111, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 649, .adv_w = 81, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 653, .adv_w = 97, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 659, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 663, .adv_w = 129, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 667, .adv_w = 137, .box_w = 8, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 674, .adv_w = 91, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 678, .adv_w = 111, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 682, .adv_w = 74, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 685, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 688, .adv_w = 116, .box_w = 7, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 693, .adv_w = 78, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 697, .adv_w = 111, .box_w = 6, .box_h = 1, .ofs_x = 1, .ofs_y = 0} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + +static const uint16_t unicode_list_1[] = { + 0x0, 0xa, 0x11, 0x13, 0x14, 0x19, 0x1e, 0x23, + 0x26, 0x2c, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, + 0x37, 0x38, 0x39, 0x3a, 0x3c, 0x3d, 0x41, 0x42, + 0x43, 0x45, 0x46, 0x4a, 0x4c, 0x55, 0x68, 0x360, + 0x361, 0x362, 0x363, 0x364, 0x367, 0x368, 0x36a, 0x36c, + 0x36d, 0x36e, 0x36f, 0x370, 0x371, 0x372, 0x373, 0x374, + 0x376, 0x377, 0x378, 0x37b, 0x37d +}; + +/*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 + }, + { + .range_start = 176, .range_length = 894, .glyph_id_start = 96, + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 53, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + }, + { + .range_start = 1071, .range_length = 33, .glyph_id_start = 149, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + }, + { + .range_start = 8230, .range_length = 1, .glyph_id_start = 182, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + } +}; + +/*----------------- + * KERNING + *----------------*/ + + +/*Map glyph_ids to kern left classes*/ +static const uint8_t kern_left_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 3, 0, 0, 0, 4, 5, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 6, 7, 8, 9, 10, 11, + 0, 0, 0, 0, 8, 12, 0, 0, + 9, 13, 9, 0, 0, 14, 15, 16, + 16, 8, 17, 18, 3, 0, 0, 0, + 0, 0, 19, 20, 21, 0, 20, 22, + 0, 19, 0, 0, 0, 0, 19, 19, + 20, 20, 0, 23, 0, 21, 0, 24, + 24, 25, 24, 0, 3, 0, 0, 0, + 0, 0, 6, 6, 6, 10, 0, 9, + 9, 15, 0, 19, 19, 19, 19, 19, + 0, 20, 20, 20, 0, 0, 0, 20, + 20, 20, 20, 0, 0, 19, 10, 26, + 27, 28, 29, 0, 28, 0, 30, 0, + 0, 31, 0, 32, 33, 29, 34, 35, + 0, 0, 0, 0, 31, 0, 19, 0, + 36, 37, 19, 19, 38, 36, 0, 0, + 38, 0, 0, 0, 39, 0, 39, 0, + 37, 40, 39, 38, 19, 0, 0, 19, + 41, 0, 41, 39, 39, 0, 0 +}; + +/*Map glyph_ids to kern right classes*/ +static const uint8_t kern_right_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 0, 3, 0, 0, 4, 5, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 6, 0, 7, 0, 8, 0, 0, 0, + 8, 0, 0, 9, 0, 0, 0, 0, + 8, 0, 8, 0, 0, 10, 11, 12, + 12, 13, 14, 15, 0, 0, 3, 0, + 0, 0, 16, 0, 17, 17, 17, 0, + 18, 0, 0, 19, 0, 0, 20, 20, + 17, 20, 17, 20, 21, 0, 20, 22, + 22, 22, 22, 23, 0, 0, 3, 0, + 0, 0, 7, 7, 7, 0, 0, 8, + 8, 11, 0, 17, 16, 16, 16, 16, + 17, 17, 17, 17, 0, 0, 0, 17, + 17, 17, 17, 20, 20, 16, 0, 24, + 0, 0, 0, 25, 26, 0, 0, 0, + 0, 27, 0, 0, 27, 28, 29, 30, + 0, 31, 0, 0, 26, 32, 33, 0, + 34, 34, 35, 36, 37, 38, 34, 34, + 34, 35, 34, 34, 36, 34, 34, 36, + 39, 40, 36, 37, 34, 41, 34, 34, + 39, 34, 34, 38, 34, 42, 4 +}; + +/*Kern values between classes*/ +static const int8_t kern_class_values[] = +{ + 0, 0, 0, 0, 0, 0, -9, 0, + 0, 3, 0, 3, 0, 1, 0, -5, + -8, -4, 0, -4, -4, 0, 0, -9, + -8, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -9, -8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -8, 0, -3, 0, -4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -6, 0, -9, + -3, -8, 0, -8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -6, -9, 0, -5, -10, 0, 0, 0, + 0, 0, 0, 0, -6, 0, -8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -5, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -3, 0, + 0, 0, -9, 0, 0, 0, 0, 0, + 0, -3, 6, -9, 0, -5, 0, -8, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -5, 0, 0, -3, 0, + 0, -4, 0, -1, -3, -1, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, -8, + 0, 3, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -10, 0, + 0, 0, 0, 0, 0, -3, 0, -3, + -1, -3, 0, -4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -1, 0, -17, 0, 0, -6, 0, + 0, 0, 0, 0, -3, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, 0, -8, -5, 3, + -9, -3, 0, 3, 0, 0, 0, 0, + 0, -10, -9, -9, 0, -6, -8, -3, + -5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -3, + 0, 0, -1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -6, 0, 3, -5, -1, 0, 0, + 0, 0, 0, 0, 0, -3, -3, -1, + 0, -1, -1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -4, 0, -8, 0, 3, -8, -3, + 0, 0, 0, 0, 0, 0, 0, -6, + -6, -6, 0, -4, -5, 0, -3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 5, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, -8, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, + 0, -5, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -9, 0, -3, + -6, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -3, 0, -3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -1, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -8, -5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -9, + -6, 0, -3, 3, 0, -5, 0, 0, + -10, -6, -8, -9, -3, -3, -5, -5, + -6, -4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, 0, 0, -3, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, 0, -5, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -1, 0, -4, + -3, 0, -3, 0, 0, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -17, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -6, -8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -6, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, -8, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -9, -6, 0, -1, 0, 0, -4, + 0, -1, 0, 0, -8, -3, 0, 0, + 0, 0, -3, 0, 0, 0, 0, -5, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -3, 0, -4, + -4, 0, 0, 0, 0, 0, -3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, -6, -3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -4, -1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -3, 0, 0, + 0, 0, -3, 0, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -1, -1, -1, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + -8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, 0, -6, -4, + -5, 0 +}; + + +/*Collect the kern class' data in one place*/ +static const lv_font_fmt_txt_kern_classes_t kern_classes = +{ + .class_pair_values = kern_class_values, + .left_class_mapping = kern_left_class_mapping, + .right_class_mapping = kern_right_class_mapping, + .left_class_cnt = 41, + .right_class_cnt = 42, +}; + +/*-------------------- + * 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 = &kern_classes, + .kern_scale = 16, + .cmap_num = 4, + .bpp = 1, + .kern_classes = 1, + .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 notosans_black_8_1bpp = { +#else +lv_font_t notosans_black_8_1bpp = { +#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 = 11, /*The maximum line height required by the font*/ + .base_line = 2, /*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) + .underline_position = -1, + .underline_thickness = 0, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +}; + + + +#endif /*#if NOTOSANS_BLACK_8_1BPP*/ + diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c index 16e961b48..b7f9b31eb 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKjp-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKjp-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c index 3aa7d1ab6..44de56bee 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKsc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKsc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c index 38fe45eb9..9fccc96dc 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKtc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/SY/na51089_linux_sdk_turnkey_20221118_dr2512_hunting/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKtc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c old mode 100755 new mode 100644 index 3da2101c4..46b533ec9 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -404,6 +404,7 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] = { ¬osans_black_48_1bpp }, { ¬osans_black_64_1bpp }, { ¬osans_black_128_1bpp }, + { ¬osans_black_8_1bpp }, }; lv_plugin_string_t* lv_plugin_language_table[] = { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h old mode 100755 new mode 100644 index a3357ec67..bbcf19039 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -59,6 +59,7 @@ LV_FONT_DECLARE(notosans_black_32_1bpp); LV_FONT_DECLARE(notosans_black_48_1bpp); LV_FONT_DECLARE(notosans_black_64_1bpp); LV_FONT_DECLARE(notosans_black_128_1bpp); +LV_FONT_DECLARE(notosans_black_8_1bpp); void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event); void button_del_event_callback(lv_obj_t* obj, lv_event_t event); @@ -791,7 +792,8 @@ LV_IMG_DECLARE(icon_yes_m); #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_48_1BPP 7 #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_64_1BPP 8 #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_128_1BPP 9 -#define LV_PLUGIN_FONT_TABLE_SIZE 10 +#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 10 +#define LV_PLUGIN_FONT_TABLE_SIZE 11 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_MODE 2 diff --git a/code/hdal/vendor/output/libvendor_ai2_pub.a b/code/hdal/vendor/output/libvendor_ai2_pub.a index 98e5ced7a..184b7e35f 100644 Binary files a/code/hdal/vendor/output/libvendor_ai2_pub.a and b/code/hdal/vendor/output/libvendor_ai2_pub.a differ diff --git a/code/hdal/vendor/output/libvendor_ai2_pub2.a b/code/hdal/vendor/output/libvendor_ai2_pub2.a index 821fb5caa..68a4c2eda 100644 Binary files a/code/hdal/vendor/output/libvendor_ai2_pub2.a and b/code/hdal/vendor/output/libvendor_ai2_pub2.a differ diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.dtb b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.dtb deleted file mode 100644 index 58540b0c9..000000000 Binary files a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.dtb and /dev/null differ diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.tmp.dts b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.tmp.dts deleted file mode 100644 index fa2e3c18e..000000000 --- a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-evb.tmp.dts +++ /dev/null @@ -1,1181 +0,0 @@ -# 1 "nvt-evb.dts" -# 1 "" -# 1 "" -# 1 "nvt-evb.dts" - - - - - - - -/dts-v1/; -# 1 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/gpio/nvt-gpio.h" 1 -# 13 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/gpio/nvt-gpio.h" -# 1 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/gpio/gpio.h" 1 -# 14 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/gpio/nvt-gpio.h" 2 -# 10 "nvt-evb.dts" 2 -# 1 "nvt-peri.dtsi" 1 -# 10 "nvt-peri.dtsi" -# 1 "nvt-basic.dtsi" 1 -# 9 "nvt-basic.dtsi" -# 1 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/interrupt-controller/arm-gic.h" 1 -# 9 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/interrupt-controller/arm-gic.h" -# 1 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/interrupt-controller/irq.h" 1 -# 10 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/interrupt-controller/arm-gic.h" 2 -# 10 "nvt-basic.dtsi" 2 - -/ { - model = "Novatek NA51089"; - compatible = "novatek,na51089", "nvt,ca9"; - interrupt-parent = <&gic>; - #address-cells = <1>; - #size-cells = <1>; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu0: cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0x0>; - next-level-cache = <&L2>; - clock-frequency = <960000000>; - }; - }; - - cg@f0020000 { - compatible = "nvt,core_clk"; - reg = <0xf0020000 0x1000>; - }; - - - periph_clk: periph_clk { - compatible = "nvt,periph_clk"; - #clock-cells = <0>; - clock-output-names = "periph_clk"; - }; - - global_timer@ffd00200 { - compatible = "arm,cortex-a9-global-timer"; - reg = <0xffd00200 0x20>; - interrupts = <1 11 0xf01>; - clocks = <&periph_clk>; - }; - - private_timer@ffd00600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0xffd00600 0x20>; - interrupts = <1 13 0xf01>; - clocks = <&periph_clk>; - }; - - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = <0 112 4>; - interrupt-affinity = <&cpu0>; - }; - - L2: cache-controller@ffe00000 { - compatible = "arm,pl310-cache"; - reg = <0xffe00000 0x1000>; - interrupts = <0 96 4>; - cache-unified; - arm,shared-override; - cache-level = <2>; - arm,data-latency = <2 2 2>; - arm,tag-latency = <2 2 2>; - }; - - gic: interrupt-controller@0xffd00000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - interrupt-controller; - reg = <0xffd01000 0x1000>, - <0xffd00100 0x1000>; - }; - - scu: snoop-control-unit@0xffd00000 { - compatible = "arm,cortex-a9-scu"; - reg = <0xffd00000 0x100>; - }; -}; -# 11 "nvt-peri.dtsi" 2 - -/ { - chosen { - bootargs = " "; - }; - - aliases { - mmc0 = &mmc0; - mmc1 = &mmc1; - }; - - uart@f0290000 { - compatible = "ns16550a"; - reg = <0xf0290000 0x1000>; - interrupts = <0 43 4>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <4>; - no-loopback-test = <1>; - clock-frequency = <24000000>; - fifo-size = <64>; - uart_id = <0>; - }; - - uart@f0300000 { - compatible = "ns16550a"; - reg = <0xf0300000 0x1000>; - interrupts = <0 44 4>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <4>; - no-loopback-test = <1>; - clock-frequency = <48000000>; - fifo-size = <64>; - hw_flowctrl = <0>; - rx_trig_level = <3>; - uart_id = <1>; - }; - - uart@f0310000 { - compatible = "ns16550a"; - reg = <0xf0310000 0x1000>; - interrupts = <0 45 4>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <4>; - no-loopback-test = <1>; - clock-frequency = <48000000>; - fifo-size = <64>; - hw_flowctrl = <0>; - rx_trig_level = <3>; - uart_id = <2>; - }; - - kdrv_rpc: cc@f0090000 { - compatible = "kdrv_rpc"; - reg = <0xf0090000 0x300>; - interrupts = <0 59 4>; - }; - - mmc0: mmc@f0420000 { - compatible = "nvt,nvt_mmc"; - reg = <0xf0420000 0x1000>; - interrupts = <0 30 4>; - max-frequency = <48000000>; - voltage-switch = <0>; - max-voltage = <3300>; - bus-width = <4>; - neg-sample-edge = <0>; - driving = <15 15 15 20 15 15 25 25 25 25 25 25>; - cd_gpio = <(9) 0x0 0x0>; - card_power_gpio = <(7 + 0x20) 0x0>; - - - }; - - mmc1: mmc@f0500000 { - compatible = "nvt,nvt_mmc2"; - reg = <0xf0500000 0x1000>; - interrupts = <0 31 4>; - max-frequency = <48000000>; - voltage-switch = <0>; - max-voltage = <3300>; - bus-width = <4>; - neg-sample-edge = <0>; - driving = <15 8 8 20 8 8 20 8 8 20 8 8>; - cd_gpio = <0 0x0 0x1>; - - - - }; - - nand: nand@f0400000 { - #address-cells = <2>; - #size-cells = <2>; - compatible = "nvt,nvt_spinand"; - reg = <0xf0400000 0x1000>; - interrupts = <0 29 4>; - clock-frequency = <96000000>; - nvt-devname = "spi_nand.0"; - }; - - nor: nor@f0400000 { - #address-cells = <2>; - #size-cells = <2>; - compatible = "nvt,nvt_spinor"; - reg = <0xf0400000 0x1000>; - interrupts = <0 29 4>; - clock-frequency = <120000000>; - nvt-devname = "spi_nor.0"; - trace-stdtable = <0>; - }; - - gpio: gpio@f0070000 { - compatible = "nvt,nvt_gpio"; - reg = <0xf0070000 0x10000>; - interrupts = <0 24 4>; - #gpio-cells = <2>; - }; - - eth@f02b0000 { - compatible = "nvt,synopsys_eth"; - reg = <0xf02b0000 0x3800>; - interrupts = <0 34 4>; - sp-clk = <0>; - ref-clk-out = <0>; - }; - - phy@f02b3800 { - compatible = "nvt,eth_phy"; - reg = <0xf02b3800 0x400>; - }; - - wdt@f0050000 { - compatible = "nvt,nvt_wdt"; - reg = <0xf0050000 0x10000>; - interrupts = <0 57 4>; - }; - - pwm: pwm@f0210000 { - compatible = "nvt,nvt_kdrv_pwm"; - reg = <0xf0210000 0x2000>; - interrupts = <0 26 4>; - }; - - adc@f0260000 { - compatible = "nvt,nvt_adc"; - reg = <0xf0260000 0x1000>; - interrupts = <0 47 4>; - #io-channel-cells = <1>; - }; - - rtc@f0060000 { - compatible = "nvt,nvt_rtc"; - reg = <0xf0060000 0x100>; - interrupts = <0 56 4>; - }; - - drtc@f00b0000 { - compatible = "nvt,nvt_drtc"; - reg = <0xf00b0000 0x100>; - }; - - crypto: crypto@f0620000 { - compatible = "nvt,nvt_crypto"; - reg = <0xf0620000 0x100>; - interrupts = <0 38 4>; - mclk = <1>; - }; - - hash: hash@f0670000 { - compatible = "nvt,nvt_hash"; - reg = <0xf0670000 0x100>; - interrupts = <0 28 4>; - mclk = <1>; - }; - - rsa: rsa@f06a0000 { - compatible = "nvt,nvt_rsa"; - reg = <0xf06a0000 0x100>; - interrupts = <0 20 4>; - mclk = <1>; - }; - - top: top@f0010000 { - compatible = "nvt,nvt_top"; - reg = <0xf0010000 0x2000 - 0xf0030000 0x2000 - 0xf0070000 0x10000>; - }; - - sie@f0c00000 { - compatible = "nvt,drv_sie"; - reg = <0xf0c00000 0x900 - 0xf0d20000 0x900 - 0xF0D30000 0x900>; - interrupts = <0 1 4 - 0 2 4 - 0 3 4>; - - }; - - tge@f0cc0000 { - compatible = "nvt,kdrv_tge"; - reg = <0xf0cc0000 0x150>; - interrupts = <0 22 4>; - }; - - rhe@f0ce0000 { - compatible = "nvt,kdrv_rhe"; - reg = <0xf0ce0000 0x900>; - interrupts = <0 13 4>; - }; - - ime@f0c40000 { - compatible = "nvt,kdrv_ime"; - reg = <0xf0c40000 0x1000>; - interrupts = <0 6 4>; - }; - - ife2@f0d00000 { - compatible = "nvt,kdrv_ife2"; - reg = <0xf0d00000 0x100>; - interrupts = <0 9 4>; - }; - - ise@f0c90000 { - compatible = "nvt,kdrv_ise"; - reg = <0xf0c90000 0x100>; - interrupts = <0 21 4 - 0 85 4>; - }; - - ipe@f0c30000 { - compatible = "nvt,kdrv_ipe"; - reg = <0xf0c30000 0x900>; - interrupts = <0 5 4>; - }; - - ife@f0c70000 { - compatible = "nvt,kdrv_ife"; - reg = <0xf0c70000 0x800>; - interrupts = <0 8 4>; - }; - - vpe@f0cd0000 { - compatible = "nvt,kdrv_vpe"; - reg = <0xf0cd0000 0x1040>; - interrupts = <0 62 4>; - }; - - ai@f0c60000 { - compatible = "nvt,kdrv_ai"; - reg = <0xf0c60000 0x23c - 0xf0d50000 0x114 - 0xf0cb0000 0x22c>; - interrupts = <0 14 4 - 0 13 4 - 0 11 4>; - clock-frequency = <600000000 480000000 600000000>; - }; - - md@f0c10000 { - compatible = "nvt,kdrv_md"; - reg = <0xf0c10000 0x150>; - interrupts = <0 46 4>; - clock-frequency = <240000000>; - }; - dis@f0c50000 { - compatible = "nvt,kdrv_dis"; - reg = <0xf0c50000 0x114>; - interrupts = <0 10 4>; - }; - - coe@f0a11000 { - compatible = "nvt,nvt_coe"; - reg = <0xf0a11000 0x2c0>; - }; - - dce@f0c20000 { - compatible = "nvt,kdrv_dce"; - reg = <0xf0c20000 0x650>; - interrupts = <0 7 4>; - }; - - ive@f0d70000 { - compatible = "nvt,kdrv_ive"; - reg = <0xf0d70000 0x6c>; - interrupts = <0 53 4>; - }; - - sde@f0d90000 { - compatible = "nvt,kdrv_sde"; - reg = <0xf0d90000 0x90>; - interrupts = <0 74 4>; - }; - - ide@f0800000 { - compatible = "nvt,nvt_ide"; - reg = <0xf0800000 0x1000>; - interrupts = <0 48 4>; - }; - - dsi@f0840000 { - compatible = "nvt,nvt_dsi"; - reg = <0xf0840000 0x1000>; - interrupts = <0 50 4>; - }; - - csi@f0280000 { - compatible = "nvt,nvt_csi"; - reg = <0xf0280000 0x100 - 0xf0330000 0x100>; - interrupts = <0 54 4 - 0 55 4>; - }; - - lvds@f0270000 { - compatible = "nvt,nvt_lvds"; - reg = <0xF0270000 0x200 - 0xF0370000 0x200>; - interrupts = <0 54 4 - 0 55 4>; - }; - - senphy@f06b0000 { - compatible = "nvt,nvt_senphy"; - reg = <0xF06B0000 0x100>; - }; - - ssenif@f0xx0000 { - compatible = "nvt,nvt_ssenif"; - reg = <0xF02C0000 0x2000>; - interrupts = <0 61 4>; - }; - - sif@f0240000 { - compatible = "nvt,nvt_sif"; - reg = <0xf0240000 0x200>; - interrupts = <0 40 4>; - clock-frequency = <1000000>; - }; - - graphic@f0c80000 { - compatible = "nvt,nvt_graphic"; - reg = <0xF0C80000 0x300 - 0xF0D10000 0x100>; - interrupts = <0 18 4 - 0 19 4>; - }; - - affine@f0ca0000 { - compatible = "nvt,nvt_affine"; - reg = <0xF0CA0000 0x100>; - interrupts = <0 52 4>; - }; - - h26x@f0a10000 { - compatible = "nvt,nvt_h26x"; - reg = <0xf0a10000 0xa00>; - interrupts = <0 16 4>; - power_saving = <0>; - }; - - timer@f0040000 { - compatible = "nvt,nvt_timer"; - reg = <0xf0040000 0x300>; - interrupts = <0 0 4>; - }; - - eac@f0640000 { - compatible = "nvt,nvt_eac"; - reg = <0xF0640000 0x200>; - }; - - jpg@f0a00000 { - compatible = "nvt,nvt_jpg"; - reg = <0xf0a00000 0x100>; - interrupts = <0 17 4>; - }; - - nvt_usb2host@f0600000 { - compatible = "nvt,ehci-nvtivot"; - reg = <0xf0600000 0x10000>; - interrupts = <0 27 4>; - }; - - nvt_usb2dev@f0600000 { - compatible = "nvt,fotg200_udc"; - reg = <0xf0600000 0x10000>; - interrupts = <0 27 4>; - }; - - nvt_usb_chrg@f0600000 { - compatible = "nvt,nvt_usb_chrgdet"; - reg = <0xf0600000 0x10000>; - }; - - dai@f0630000 { - compatible = "nvt,nvt_dai"; - reg = <0xF0630000 0xbc>; - interrupts = <0 15 4>; - }; - - rotate@f0cf0000 { - compatible = "nvt,nvt_rotation"; - reg = <0xF0CF0000 0x100>; - interrupts = <0 81 4>; - }; - - drvdump@0 { - compatible = "nvt,nvt_drvdump"; - }; - - dsp@f1430000 { - compatible = "nvt,nvt_dsp"; - reg = <0xF1430000 0x200 - 0xF2000000 0x1000000 - 0xF1440000 0x200 - 0xF3000000 0x1000000>; - interrupts = <0 76 4 - 0 77 4>; - }; - - spi0: spi@f0230000 { - compatible = "nvt,nvt_spi"; - reg = <0xf0230000 0x10000>; - interrupts = <0 35 4>; - dma-support = <0>; - nvt-devname = <0>; - }; - - spi1: spi@f0320000 { - compatible = "nvt,nvt_spi"; - reg = <0xf0320000 0x10000>; - interrupts = <0 36 4>; - dma-support = <0>; - nvt-devname = <1>; - }; - - spi2: spi@f0340000 { - compatible = "nvt,nvt_spi"; - reg = <0xf0340000 0x10000>; - interrupts = <0 37 4>; - dma-support = <0>; - nvt-devname = <2>; - }; - - sdp@f0390000 { - compatible = "nvt,nvt_sdp"; - reg = <0xf0390000 0x28>; - interrupts = <0 12 4>; - }; - - tse@f0650000 { - compatible = "nvt,nvt_tse"; - reg = <0xF0650000 0x90>; - interrupts = <0 23 4>; - }; - - remote@f0250000 { - compatible = "nvt,nvt_remote"; - reg = <0xf0250000 0x28>; - interrupts = <0 25 4>; - }; - - rng: rng@f0680000 { - compatible = "nvt,nvt_rng"; - reg = <0xf0680000 0x100>; - }; - - nvt_arb@f0000000 { - compatible = "nvt,nvt_arb"; - reg = <0xF0000000 0xA000 - 0xF0FE0000 0x300>; - interrupts = <0 33 4>; - }; - - nvt_otp@f0660000 { - compatible = "nvt,nvt_otp"; - reg = <0xF0660000 0x70>; - }; - - kdrv_ipp { - clock-frequency = <240000000>; - }; - - uvcp: uvcp@f0690000 { - compatible = "nvt,nvt_uvcp"; - reg = <0xf0690000 0x200>; - interrupts = <0 59 4>; - }; - pll_preset@0 { - pll3{pll_config = <3 0 0>;}; - pll4{pll_config = <4 0 0>;}; - pll5{pll_config = <5 297000000 1>;}; - pll6{pll_config = <6 0 0>;}; - pll7{pll_config = <7 0 0>;}; - pll8{pll_config = <8 0 0>;}; - pll9{pll_config = <9 0 0>;}; - pll11{pll_config = <11 0 0>;}; - pll12{pll_config = <12 0 1>;}; - }; -}; -# 11 "nvt-evb.dts" 2 -# 1 "nvt-top.dtsi" 1 -&top { - sdio{pinmux = <0x5>;}; - sdio2{pinmux = <0x5>;}; - sdio3{pinmux = <0x0>;}; - nand{pinmux = <0x5>;}; - sensor{pinmux = <0x0>;}; - sensor2{pinmux = <0x0>;}; - mipi_lvds{pinmux = <0x0>;}; - i2c{pinmux = <0x40>;}; - sif{pinmux = <0x0>;}; - uart{pinmux = <0x1021>;}; - spi{pinmux = <0x0>;}; - sdp{pinmux = <0x0>;}; - remote{pinmux = <0x0>;}; - pwm{pinmux = <0x8000>;}; - pwm2{pinmux = <0x000000>;}; - ccnt{pinmux = <0x0>;}; - audio{pinmux = <0x0>;}; - lcd{pinmux = <0x0>;}; - tv{pinmux = <0x0>;}; - eth{pinmux = <0x0>;}; - misc{pinmux = <0x0>;}; -}; -# 12 "nvt-evb.dts" 2 -# 1 "nvt-i2c.dtsi" 1 - - - - - - - -/ { - i2c0: i2c@f0220000 { compatible = "nvt,nvt_i2c"; reg = <0xf0220000 0x100>; interrupts = <0 41 4>; clock-frequency = <400000>; id = <0>; }; - i2c1: i2c2@f0350000 { compatible = "nvt,nvt_i2c"; reg = <0xf0350000 0x100>; interrupts = <0 42 4>; clock-frequency = <400000>; id = <1>; }; - i2c2: i2c3@f03a0000 { compatible = "nvt,nvt_i2c"; reg = <0xf03a0000 0x100>; interrupts = <0 60 4>; clock-frequency = <50000>; id = <2>; }; -}; -# 13 "nvt-evb.dts" 2 -# 1 "nvt-gpio.dtsi" 1 -&top { -# 201 "nvt-gpio.dtsi" - pgpio11{gpio_config = <(11 + 0x20) 1>;}; - - pgpio2{gpio_config = <(2 + 0x20) 1>;}; -}; -# 14 "nvt-evb.dts" 2 -# 1 "nvt-peri-dev.dtsi" 1 -# 11 "nvt-peri-dev.dtsi" -&i2c0 { - #address-cells = <1>; - #size-cells = <0>; - - - - - - -}; - -&i2c1 { - #address-cells = <1>; - #size-cells = <0>; -}; - -&i2c2 { - #address-cells = <1>; - #size-cells = <0>; -}; - -&spi0 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; -# 44 "nvt-peri-dev.dtsi" -}; - -&spi1 { - status = "okay"; -}; - -&spi2 { - status = "okay"; -}; -# 15 "nvt-evb.dts" 2 -# 1 "nvt-audio.dtsi" 1 - - - - - - - -/ { - audio@1 { type = "none"; i2s_ctrl = <0>; sif_channel = <0>; gpio_cold_reset = <0>; gpio_data = <0>; gpio_clk = <0>; gpio_cs = <0>; adc_zero = <0>; }; - audio@2 { type = "embedded"; i2s_ctrl = <4>; sif_channel = <0>; gpio_cold_reset = <0>; gpio_data = <0>; gpio_clk = <0>; gpio_cs = <0>; adc_zero = <0>; }; -}; -# 16 "nvt-evb.dts" 2 -# 1 "nvt-display.dtsi" 1 - - - - - - - -# 1 "/home/payton/S530/BSP/linux-kernel/include/dt-bindings/pinctrl/nvt_lcd.h" 1 -# 9 "nvt-display.dtsi" 2 -# 25 "nvt-display.dtsi" -/ { - display { type = "lcd"; lcd_ctrl = <1>; sif_channel = <4>; gpio_cs = <(7 + 0x20)>; gpio_clk = <(8 + 0x20)>; gpio_data = <(9 + 0x20)>; }; - logo { enable = <1>; lcd_type = <5>; lcd_rotate = <270>; lcd_reset = <(1 + 0x60)>; lcd_bl_gpio = <(11 + 0x20) 1>; lcd_power = <(8 + 0x20) 1>;}; -}; -# 17 "nvt-evb.dts" 2 -# 1 "nvt-media.dtsi" 1 -# 10 "nvt-media.dtsi" -# 1 "nvt-basic.dtsi" 1 -# 11 "nvt-basic.dtsi" -/ { - model = "Novatek NA51089"; - compatible = "novatek,na51089", "nvt,ca9"; - interrupt-parent = <&gic>; - #address-cells = <1>; - #size-cells = <1>; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu0: cpu@0 { - device_type = "cpu"; - compatible = "arm,cortex-a9"; - reg = <0x0>; - next-level-cache = <&L2>; - clock-frequency = <960000000>; - }; - }; - - cg@f0020000 { - compatible = "nvt,core_clk"; - reg = <0xf0020000 0x1000>; - }; - - - periph_clk: periph_clk { - compatible = "nvt,periph_clk"; - #clock-cells = <0>; - clock-output-names = "periph_clk"; - }; - - global_timer@ffd00200 { - compatible = "arm,cortex-a9-global-timer"; - reg = <0xffd00200 0x20>; - interrupts = <1 11 0xf01>; - clocks = <&periph_clk>; - }; - - private_timer@ffd00600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0xffd00600 0x20>; - interrupts = <1 13 0xf01>; - clocks = <&periph_clk>; - }; - - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = <0 112 4>; - interrupt-affinity = <&cpu0>; - }; - - L2: cache-controller@ffe00000 { - compatible = "arm,pl310-cache"; - reg = <0xffe00000 0x1000>; - interrupts = <0 96 4>; - cache-unified; - arm,shared-override; - cache-level = <2>; - arm,data-latency = <2 2 2>; - arm,tag-latency = <2 2 2>; - }; - - gic: interrupt-controller@0xffd00000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - interrupt-controller; - reg = <0xffd01000 0x1000>, - <0xffd00100 0x1000>; - }; - - scu: snoop-control-unit@0xffd00000 { - compatible = "arm,cortex-a9-scu"; - reg = <0xffd00000 0x100>; - }; -}; -# 11 "nvt-media.dtsi" 2 - -/ { - nvtmpp { - compatible = "nvt,nvtmpp"; - }; - - isf_stream { - compatible = "nvt,isf_stream"; - }; - - isf_flow { - compatible = "nvt,isf_flow"; - }; - - isf_vdocap { - compatible = "nvt,isf_vdocap"; - }; - - isf_vdoprc { - compatible = "nvt,isf_vdoprc"; - }; - - isf_dummy { - compatible = "nvt,isf_dummy"; - }; - - isf_vdoenc { - compatible = "nvt,isf_vdoenc"; - }; - - isf_vdodec { - compatible = "nvt,isf_vdodec"; - }; - - isf_vdoout { - compatible = "nvt,isf_vdoout"; - }; - - dispobj { - compatible = "nvt,nvt_dispobj"; - }; - - dispdev { - compatible = "nvt,nvt_dispdev"; - }; - - audio { - compatible = "nvt,nvt_audio"; - }; - - msdcnvt { - compatible = "nvt,msdcnvt"; - }; - - msdcnvt_adj { - compatible = "nvt,msdcnvt_adj"; - }; - - msdcnvt_custom_si { - compatible = "nvt,msdcnvt_custom_si"; - }; - - wavstudio { - compatible = "nvt,wavstudio"; - }; - - isf_audenc { - compatible = "nvt,isf_audenc"; - }; - - isf_auddec { - compatible = "nvt,isf_auddec"; - }; - - isf_audcap { - compatible = "nvt,isf_audcap"; - }; - - isf_audout { - compatible = "nvt,isf_audout"; - }; - - nvt_ipc { - compatible = "nvt,nvt_ipc"; - }; -}; -# 18 "nvt-evb.dts" 2 -# 1 "nvt-mem-tbl.dtsi" 1 - - - - - - -/ { - - nvt_memory_cfg { - #address-cells = <1>; - #size-cells = <1>; - dram { reg = <0x00000000 0x08000000>; }; - shmem{ reg = <0x00007E00 0x00000200>; }; - loader { reg = <0x01000000 0x00080000>; }; - fdt { reg = <0x01800000 0x00040000>; }; - rtos { reg = <0x01840000 0x00FC0000>; }; - linuxtmp{ reg = <0x02800000 0x04000000>; }; - uboot{ reg = <0x06800000 0x01640000>; }; - logo-fb{ reg = <0x07E40000 0x001C0000>; }; - }; - - - memory { device_type = "memory"; reg = <0x00000000 0x01800000 0x02000000 0x01600000>; }; - - - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - }; - - - - - - - libc-heap { size = <0x00200000>; }; - - hdal-memory { - #address-cells = <1>; - #size-cells = <1>; - media { reg = <0x03600000 0x04A00000>; }; - }; - - hdal-maxpath-cfg { - - vdocap_active_list = <1 0 0 0 0 0 0 0>; - vdoprc_maxdevice = <2>; - vdoenc_maxpath = <4>; - vdodec_maxpath = <3>; - vdoout_maxdevice = <1>; - adocap_maxdevice = <1>; - adoout_maxdevice = <2>; - adoenc_maxpath = <1>; - adodec_maxpath = <1>; - - gfx_maxjob = <2>; - - stamp_maximg = <9>; - - vdoprc_maxstamp = <4 4>; - - vdoprc_maxmask = <4 4>; - vdoenc_maxstamp = <9 9>; - vdoenc_maxmask = <0 64>; - vdoout_maxstamp = <0 16>; - vdoout_maxmask = <0 64>; - }; -}; -# 19 "nvt-evb.dts" 2 -# 1 "nvt-storage-partition.dtsi" 1 - - - - - - - -&nor { - partition_loader { label = "loader"; reg = <0x0 0x0000000 0x0 0x10000>; }; - partition_fdt { label = "fdt"; reg = <0x0 0x10000 0x0 0x10000>; }; - partition_fdt.restore { label = "fdt.restore"; reg = <0x0 0x20000 0x0 0x10000>; }; - partition_fdt.app { label = "fdt.app"; reg = <0x0 0x30000 0x0 0x20000>; }; - partition_uboot { label = "uboot"; reg = <0x0 0x50000 0x0 0xA0000>; }; - partition_uenv { label = "uenv"; reg = <0x0 0xF0000 0x0 0x10000>; }; - partition_kernel { label = "kernel"; reg = <0x0 0x100000 0x0 0x290000>; }; - partition_rootfs { label = "rootfs"; reg = <0x0 0x390000 0x0 0x3E0000>; }; - partition_rootfs1 { label = "rootfs1"; reg = <0x0 0x770000 0x0 0xB00000>; }; - partition_rtos { label = "rtos"; reg = <0x0 0x1270000 0x0 0x900000>; }; - partition_app { label = "app"; reg = <0x0 0x1B70000 0x0 0x50000>; }; - partition_sys { label = "sys"; reg = <0x0 0x1CC0000 0x0 0x10000>; }; - partition_all { label = "all"; reg = <0x0 0x0000000 0x0 0x2000000>; }; -}; -# 20 "nvt-evb.dts" 2 -# 1 "nvt-info.dtsi" 1 - - - - - - - -/ { - nvt_info { - BIN_NAME = "FW98565A"; - BIN_NAME_T = "FW98565T"; - RTOS_APP_MAIN = "cardv"; - - EMBMEM_BLK_SIZE = "0x10000"; -# 24 "nvt-info.dtsi" - EMBMEM = "EMBMEM_SPI_NOR"; -# 34 "nvt-info.dtsi" - FW_TYPE = "FW_TYPE_PARTIAL"; - - - - - - UI_STYLE = "UI_STYLE_LVGL"; - - - - - - NVT_CFG_APP_EXTERNAL = "hostapd wireless_tool iperf-3 wpa_supplicant dhd_priv"; - - NVT_CFG_APP = "mem cardv memcpy isp_demon sf_app"; - - NVT_ROOTFS_ETC = ""; - - NVT_BINARY_FILE_STRIP = "yes"; - - NVT_CFG_KERNEL_CFG = "na51089_evb_cardv_defconfig_release"; - - NVT_MAKE_POST = "make_post.sh"; - - NVT_SAMPLES_INSTALL = "DISABLE"; - - NVT_CFG_UBOOT_CFG = ""; - - - - - - - - NVT_LINUX_SMP = "NVT_LINUX_SMP_OFF"; - - - - - - - - NVT_CHIP_ID = "CHIP_NA51089"; - - - - - - - - NVT_LINUX_COMPRESS = "NVT_LINUX_COMPRESS_GZ"; - - - - - - - - NVT_DEFAULT_NETWORK_BOOT_PROTOCOL = "NVT_DEFAULT_NETWORK_BOOT_PROTOCOL_STATIC_IP"; -# 103 "nvt-info.dtsi" - NVT_ROOTFS_TYPE = "NVT_ROOTFS_TYPE_RAMDISK"; -# 113 "nvt-info.dtsi" - LCD1 = "disp_if8b_lcd1_psd200_st7789v"; -# 126 "nvt-info.dtsi" - SENSOR1 = "sen_os05b10"; - SENSOR1_CFG = "sen_os05b10_565"; - SENSOR2 = "sen_off"; - SENSOR2_CFG = "sen_off"; - - - - - - NVT_ROOTFS_RW_PART_EN = "NVT_ROOTFS_RW_PART_EN_ON"; - - - - - - - NVT_ETHERNET = "NVT_ETHERNET_NONE"; -# 151 "nvt-info.dtsi" - NVT_SDIO_WIFI = "NVT_SDIO_WIFI_RTK"; - - - - - - NVT_USB_WIFI = "NVT_USB_WIFI_NONE"; - - - - - - NVT_USB_4G = "NVT_USB_4G_NONE"; - - - - - - - WIFI_RTK_MDL = "WIFI_RTK_MDL_8189"; - - - - - - - - WIFI_BRCM_MDL = "WIFI_BRCM_MDL_43456c5_ampk6256c5"; - - - - - - - WIFI_NVT_MDL = "WIFI_NVT_MDL_18211"; - - - - - - - NVT_CURL_SSL = "NVT_CURL_SSL_OPENSSL"; -# 201 "nvt-info.dtsi" - NVT_UBOOT_ENV_IN_STORG_SUPPORT = "NVT_UBOOT_ENV_IN_STORG_SUPPORT_OFF"; - - - - - - - TOUCH = "TOUCH_OFF"; - - - - - - - UBOOT_ONLY_LOAD_LINUX = "UBOOT_ONLY_LOAD_LINUX_ON"; - - }; -}; -# 21 "nvt-evb.dts" 2 -# 1 "nvt-nvtpack.dtsi" 1 - - - - - - - -&nor { - - - - - nvtpack { - ver = "NVTPACK_FW_INI_16072017"; - method = <1>; - index { - id0 { partition_name = "loader"; source_file = ""; }; - id1 { partition_name = "fdt"; source_file = "nvt-evb.bin"; }; - id2 { partition_name = "fdt.restore"; source_file = ""; }; - id3 { partition_name = "fdt.app"; source_file = "../application.bin"; }; - id4 { partition_name = "uboot"; source_file = "u-boot.bin"; }; - id5 { partition_name = "uenv"; source_file = ""; }; - id6 { partition_name = "kernel"; source_file = "uImage.bin"; }; - id7 { partition_name = "rootfs"; source_file = "rootfs.ramdisk.bin"; }; - id8 { partition_name = "rootfs1"; source_file = "rootfs_1.squash.bin"; }; - id9 { partition_name = "rtos"; source_file = "../rtos-main.bin"; }; - id10 { partition_name = "app"; source_file = "appfs.cardv.jffs2.nor.bin"; }; - id11 { partition_name = "sys"; source_file = ""; }; - }; - }; -}; -# 21 "nvt-evb.dts" 2 diff --git a/rtos/code/application/source/cardv/Makefile b/rtos/code/application/source/cardv/Makefile old mode 100755 new mode 100644 index f68d9ab74..815932273 --- a/rtos/code/application/source/cardv/Makefile +++ b/rtos/code/application/source/cardv/Makefile @@ -253,6 +253,7 @@ SRC += \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_RU.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_SC.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Languages/Language_TC.c \ + ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c \ ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c \ diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index b94bef3ba..f4fcb54b6 100644 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -1012,6 +1012,8 @@ #define LV_USER_CFG_STAMP_FONT_ID_LARGE LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_48_1BPP #define LV_USER_CFG_STAMP_FONT_ID_MEDIUM LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_32_1BPP #define LV_USER_CFG_STAMP_FONT_ID_SMALL LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_16_1BPP +#define LV_USER_CFG_STAMP_FONT_ID_XS LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP + #define LV_USER_CFG_STAMP_LETTER_SPACE 0 #define LV_USER_CFG_STAMP_TEXT_ALIGN LV_ALIGN_CENTER diff --git a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c index 1281ef540..6c5cbe367 100755 --- a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c +++ b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c @@ -1045,6 +1045,13 @@ void rtos_main(void) } else { //fastboot for hunting camera #if (POWERON_FAST_BOOT_MSG == DISABLE) fastboot_msg_en(DISABLE); + #endif + #if HUNTING_CAMERA_MCU == ENABLE + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if(puiPara->DebugMode == 0) + { + fastboot_msg_en(DISABLE); + } #endif VK_TASK_HANDLE vkt_boot = vos_task_create(fastboot_thread, fastboot, "boot", 9, 10240); vos_task_resume(vkt_boot); @@ -1055,6 +1062,12 @@ void rtos_main(void) #if (POWERON_FAST_BOOT_MSG == DISABLE) fastboot_msg_en(ENABLE); #endif + #if HUNTING_CAMERA_MCU == ENABLE + if(puiPara->DebugMode == 0) + { + fastboot_msg_en(ENABLE); + } + #endif #if (FASTBOOT_KEYSCAN_FUNC == ENABLE) // enable for keyscan / usb function, but need modify lds file flow_system_init(); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c old mode 100755 new mode 100644 index 8505418b5..798c637d5 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -67,7 +67,7 @@ static char thumb_current_path_clone[256] = {'\0'}; #define FILEDB_MAX_NUM 5000 #define MOVIE_THUMB_WIDTH 640 #define PRI_MOVIEFAST_CMDTSK 11 -#define STKSIZE_MOVIEFAST_CMDTSK 8192 +#define STKSIZE_MOVIEFAST_CMDTSK 10240 //local variable static DCF_HANDLE g_dcf_hdl = 0; @@ -137,6 +137,8 @@ static THREAD_RETTYPE MovieFast_CmdTsk(void) static void MovieFast_ShutDown(void) { + UINT8 mode = DrvGPIO_GetPhotoMovieModeFromMonitor(); + MovieFast_CmdTsk_Exit(); MovieFast_Close(); @@ -144,11 +146,18 @@ static void MovieFast_ShutDown(void) fastboot_msg_en(ENABLE); #endif +#if HUNTING_CAMERA_MCU == ENABLE + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if(puiPara->DebugMode == 0) + { + fastboot_msg_en(ENABLE); + } +#endif + #if HUNTING_CAMERA_BOOT_LINUX /* Boot Linux */ #if POWERON_BOOT_REPORT == ENABLE - UINT8 mode = DrvGPIO_GetPhotoMovieModeFromMonitor(); DBG_DUMP("PhotoMovie mode = %u\n", mode); vos_perf_list_dump(); @@ -564,15 +573,18 @@ static void MovieFast_OnRecStart(void) ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_WRITE_BLKSIZE, 0x200000); ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_BUFRESSEC, uifile_buffer_reserved_sec); //ImageApp_MovieMulti_RecStart(gMovie_Clone_Info[i].rec_id); + #if HUNTING_CAMERA_MCU == ENABLE + ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, puiPara->VideoLenth); ImageApp_MovieMulti_TrigOnce(gMovie_Clone_Info[i].rec_id, puiPara->VideoLenth); #else + ImageApp_MovieMulti_SetParam(gMovie_Clone_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, 10); ImageApp_MovieMulti_TrigOnce(gMovie_Clone_Info[i].rec_id, 10); #endif } if (movie_rec_mask & mask) { - #if SF_TRIGGER_TIME_TEST == ENABLE + #if SF_TRIGGER_TIME_TEST == ENABLE && HUNTING_CAMERA_MCU == ENABLE sf_trigger_time_led_cb(1); #endif vos_perf_list_mark("sie_vd", __LINE__, 6); @@ -581,8 +593,10 @@ static void MovieFast_OnRecStart(void) //ImageApp_MovieMulti_RecStart(gMovie_Rec_Info[i].rec_id); #if HUNTING_CAMERA_MCU == ENABLE + ImageApp_MovieMulti_SetParam(gMovie_Rec_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, puiPara->VideoLenth); ImageApp_MovieMulti_TrigOnce(gMovie_Rec_Info[i].rec_id, puiPara->VideoLenth); #else + ImageApp_MovieMulti_SetParam(gMovie_Rec_Info[i].rec_id, MOVIEMULTI_PARAM_FILE_SEAMLESSSEC, 10); ImageApp_MovieMulti_TrigOnce(gMovie_Rec_Info[i].rec_id, 10); #endif } diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index f1c9ee2da..6338939ea 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -104,6 +104,7 @@ static UINT32 g_exif_buf_pa = 0, g_exif_buf_va = 0; static UINT32 g_u32PrvCapCnt = 0; static VOS_TICK g_tickBuf[VD_TICK_BUF_SIZE] = {0}; static UINT32 g_vcap_trigger_frm_count = 0XFFFFFFFF; /* start from 0 */ +static AET_STATUS_INFO ae_status = {0}; /* size of AET_STATUS_INFO is quite large, don't put it in the stack */ //extern extern const unsigned char gDemoKit_Font[]; @@ -852,7 +853,7 @@ INT32 PhotoFast_WriteFile(UINT32 Addr, UINT32 Size, UINT32 Fmt, UINT32 uiPathId) char tmp[NMC_TOTALFILEPATH_MAX_LEN] = {'\0'}; sprintf(tmp, "W%03ld%04ld.JPG", nextFolderID, nextFileID); strncpy(g_photo_fast_write_file_Path, tmp, sizeof(g_photo_fast_write_file_Path) - 1); - DBG_DUMP("last send file:%s\r\n", tmp); + DBG_IND("last send file:%s\r\n", tmp); #else strncpy(g_photo_fast_write_file_Path, FilePath, sizeof(g_photo_fast_write_file_Path) - 1); #endif @@ -1424,8 +1425,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) if((g_vcap_frm_cnt > 3) && (g_ae_preset_flag == FALSE)){ - AET_STATUS_INFO ae_status = {0}; - + memset(&ae_status, 0, sizeof(AET_STATUS_INFO)); vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status); if ((ae_status.status_info.state_adj == 0) || (g_vcap_frm_cnt >= PHOTOFAST_CAP_FRAME_CNT)){ g_ae_preset_flag = TRUE; @@ -1448,8 +1448,6 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) } #endif - - #if HUNTING_PHOTO_FAST_AE_60_FPS == ENABLE if((hd_ret = hd_videocap_pull_out_buf(vcap_path, &video_cap_frame, PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS)) != HD_OK){ DBG_ERR("failed to hd_videocap_pull_out_buf, er=%d\n", (int)hd_ret); @@ -1459,6 +1457,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) g_vcap_frm_cnt = video_cap_frame.count; if((hd_ret = hd_videoproc_push_in_buf(vprc_path, &video_cap_frame, NULL, PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS)) != HD_OK){ + hd_videocap_release_out_buf(vcap_path, &video_cap_frame); DBG_ERR("failed to hd_videoproc_push_in_buf, er=%d\n", (int)hd_ret); goto exit; } @@ -1471,16 +1470,14 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) (void) vcap_path; (void) video_cap_frame; #endif - if ((hd_ret = hd_videoproc_pull_out_buf(vprc_path, &video_frame, PHOTOFAST_HD_PUSH_PULL_TIMEOUT_MS)) != HD_OK) { DBG_ERR("failed to hd_videoproc_pull_out_buf, er=%d\n", (int)hd_ret); goto exit; } - DBG_DUMP("vcap:%lu vprc:%lu\n", g_vcap_frm_cnt, g_vprc_frm_cnt); - //if((g_vcap_frm_cnt >= PHOTOFAST_CAP_FRAME_CNT) && (start_cap == FALSE)){ - if (g_vcap_frm_cnt > PHOTOFAST_START_CAP_FRAME_CNT) { + if((g_vcap_frm_cnt >= PHOTOFAST_CAP_FRAME_CNT) && (start_cap == FALSE)){ + // if (g_vcap_frm_cnt > PHOTOFAST_START_CAP_FRAME_CNT) { #if HUNTING_PHOTO_FAST_AE_60_FPS == ENABLE PhotoFast_SetTriggerFrmCnt(video_cap_frame.count); /* unbind mode , use vcap frame count */ #else @@ -1566,6 +1563,12 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) } #endif +exit: + if(hd_ret != HD_OK){ + g_bPreViewPullFlag = FALSE; + DBG_ERR("error occured, force close PhotoFast\n"); + } + if (g_bPreViewPullFlag == FALSE) { // DrvGPIO_IRLed_Turn_Onoff(0); @@ -1621,7 +1624,6 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) } } -exit: // vos_flag_destroy(PHOTOFAST_FLG_ID); THREAD_RETURN(0); } @@ -1687,6 +1689,13 @@ static void PhotoFast_ShutDown(void) #if (POWERON_FAST_BOOT_MSG == DISABLE) fastboot_msg_en(ENABLE); #endif +#if HUNTING_CAMERA_MCU == ENABLE + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if(puiPara->DebugMode == 0) + { + fastboot_msg_en(ENABLE); + } +#endif #if HUNTING_CAMERA_BOOT_LINUX /* Boot Linux */ @@ -1799,27 +1808,27 @@ void Set_NIGHTMODE(UINT32 id, UINT8 isSnapVideo) void Set_AEMODE(UINT32 id) { AET_MANUAL ae_manual = {0}; - AET_STATUS_INFO ae_status_info = {0}; AWBT_STATUS status = {0}; ISPT_C_GAIN c_gain = {0}; - HD_RESULT hd_ret; + memset(&ae_status, 0, sizeof(AET_STATUS_INFO)); + if ((hd_ret = vendor_isp_init()) != HD_OK) { DBG_ERR("vendor_isp_init() fail(%d)\r\n", hd_ret); } if (1)//SysGetFlag(FL_CONTINUE_SHOT) == CONTINUE_SHOT_BURST_5) { - ae_status_info.id = 0; - vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status_info); + ae_status.id = 0; + vendor_isp_get_ae(AET_ITEM_STATUS, &ae_status); //DBG_ERR(">> aet status exp %d iso %d\r\n",ae_status_info.status_info.expotime[0],ae_status_info.status_info.iso_gain[0]); ae_manual.id = 0; vendor_isp_get_ae(AET_ITEM_MANUAL, &ae_manual); //DBG_ERR(">> aet manual exp %d iso %d\r\n",ae_manual.manual.expotime,ae_manual.manual.iso_gain); if (id == 1){ ae_manual.manual.mode = 1; - ae_manual.manual.expotime = ae_status_info.status_info.expotime[0]; - ae_manual.manual.iso_gain = ae_status_info.status_info.iso_gain[0]; + ae_manual.manual.expotime = ae_status.status_info.expotime[0]; + ae_manual.manual.iso_gain = ae_status.status_info.iso_gain[0]; ISPT_TOTAL_GAIN total; total.id = 0; diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c old mode 100755 new mode 100644 index 1817e58eb..fcb88e503 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c @@ -56,7 +56,7 @@ void PhotoFast_SelStampFont(UINT32 uiImageWidth, char **font, UINT32 *ScaleFacto lv_plugin_res_id red_id; -if(uiImageWidth >=1920) { + if(uiImageWidth >=1920) { red_id = LV_USER_CFG_STAMP_FONT_ID_LARGE; } else if(uiImageWidth >=1080) { @@ -69,7 +69,7 @@ if(uiImageWidth >=1920) { red_id = LV_USER_CFG_STAMP_FONT_ID_SMALL; } else { - red_id = LV_USER_CFG_STAMP_FONT_ID_SMALL; + red_id = LV_USER_CFG_STAMP_FONT_ID_XS; } DBG_DUMP("**** red_id = %lu\n", red_id); @@ -481,7 +481,8 @@ INT32 PhotoFastCapDateImprint_GenYuvData(HD_VIDEO_FRAME *pDstImg) stamp_text.draw_cfg.string.font = (lv_font_t *) lv_plugin_get_font(FONT)->font; #endif - + stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf(); + lv_user_font_conv_calc_buffer_size(&stamp_text.draw_cfg, &stamp_text.buff_size); lv_user_font_conv(&stamp_text.draw_cfg, &stamp_text.mem_cfg); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c index 3501cb479..0ae9543d4 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c @@ -563,7 +563,7 @@ static INT32 PhotoFast_SliceEncode_Get_Enc_Buffer_Info(const HD_PATH_ID enc_path return E_OK; } -static INT32 PhotoFast_SliceEncode_Init_VF_GFX_Slice( +static INT32 PhotoFast_SliceEncode_Init_VF_GFX_Slice( VF_GFX_SCALE* vf_gfx_scale_param, const HD_VIDEO_FRAME* video_frame, const PhotoFast_MEM_Info dst_buffer_info, @@ -848,9 +848,9 @@ static INT32 PhotoFast_SliceEncode_Scale_Screennail( } #if CFG_PHOTOFAST_SLICE_ENC_RC_SCREENNAIL -static INT32 PhotoFast_SliceEncode_Encode_Screennail_RC(HD_VIDEO_FRAME* video_frame_in) +static INT32 PhotoFast_SliceEncode_Encode_Screennail_RC(HD_VIDEO_FRAME* video_frame_in, UINT8* screennail_quality) { - static UINT32 quality = CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_SCREENNAIL; + UINT8 quality = *screennail_quality; INT8 direction = 0; INT32 ret = E_OK; PhotoFast_SliceEncode_Info* slice_encode_screennail_info = PhotoFast_SliceEncode_Get_Info(PHOTO_ENC_JPG_SCREENNAIL); @@ -867,6 +867,7 @@ static INT32 PhotoFast_SliceEncode_Encode_Screennail_RC(HD_VIDEO_FRAME* video_fr do { PHOTOFAST_SLICE_ENC_DUMP("screennail quality = %lu\n", quality); + *screennail_quality = quality; ret = PhotoFast_SliceEncode_Encode_Set_Out(slice_encode_screennail_info->enc_path_id, quality); if(ret != E_OK){ goto EXIT; @@ -1122,7 +1123,8 @@ static INT32 PhotoFast_SliceEncode_Encode_Primary( const HD_VIDEO_FRAME* video_frame, const PhotoFast_SliceSize_Info src_slice_info, const PhotoFast_SliceSize_Info dst_slice_info, - UINT32* enc_bs_accum_size + UINT32* enc_bs_accum_size, + UINT8* primary_quality ) { PhotoFast_SliceEncode_Info* slice_enc_info = PhotoFast_SliceEncode_Get_Info(PHOTO_ENC_JPG_PRIMARY); @@ -1140,7 +1142,6 @@ static INT32 PhotoFast_SliceEncode_Encode_Primary( HD_VIDEOENC_BS bs_data_pull; - do { restart = FALSE; @@ -1245,6 +1246,7 @@ static INT32 PhotoFast_SliceEncode_Encode_Primary( goto EXIT; } + if((*enc_bs_accum_size + bs_data_pull.video_pack[0].size + CFG_JPG_HEADER_SIZE + PhotoFast_GetScreenNailSize()) < enc_bs_buf_info.blk_size){ PHOTOFAST_SLICE_ENC_DUMP("[Slice %u] enc accum size: %lx , slice size:%lx , bs buf size: %lx buffer ptr:%lx , jpg va: %lx\r\n", @@ -1305,6 +1307,7 @@ static INT32 PhotoFast_SliceEncode_Encode_Primary( goto EXIT; } + *primary_quality = quality_new; if((ret = PhotoFast_SliceEncode_Encode_Set_Out(slice_enc_info->enc_path_id, quality_new) != HD_OK)) goto EXIT; @@ -1376,6 +1379,8 @@ INT32 PhotoFast_SliceEncode(const HD_PATH_ID vproc_path_id, const HD_VIDEO_FRAME PhotoFast_MEM_Info exif_mem_info = {0}; UINT32 enc_accum_size = 0; VOS_TICK tick_start, tick_end; + static UINT8 primary_quality = CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_PRIMARY; + static UINT8 screennail_quality = CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_SCREENNAIL; // VOS_TICK tick_primary_s, tick_primary_e; // VOS_TICK tick_screennail_s, tick_screennail_e; // VOS_TICK tick_thumbnail_s, tick_thumbnail_e; @@ -1447,9 +1452,8 @@ INT32 PhotoFast_SliceEncode(const HD_PATH_ID vproc_path_id, const HD_VIDEO_FRAME goto EXIT; } - - - slice_encode_primary_info->bs_buf_mem_info.blk_size = (VDO_YUV_BUFSIZE(dst_slice_info.width, dst_slice_info.height, video_frame.pxlfmt) / (CFG_PHOTOFAST_SLICE_ENC_BS_BUF_RATIO)) + CFG_JPG_HEADER_SIZE + PhotoFast_GetScreenNailSize() ; + // slice_encode_primary_info->bs_buf_mem_info.blk_size = (VDO_YUV_BUFSIZE(dst_slice_info.width, dst_slice_info.height, video_frame.pxlfmt) / (CFG_PHOTOFAST_SLICE_ENC_BS_BUF_RATIO)) + CFG_JPG_HEADER_SIZE + PhotoFast_GetScreenNailSize() ; + slice_encode_primary_info->bs_buf_mem_info.blk_size = ((PhotoFast_SliceEncode_Get_Encode_Max_Bitrate(HD_VIDEO_PXLFMT_YUV420)/ 8) * (dst_slice_info.slice_num + 2)) + CFG_JPG_HEADER_SIZE + PhotoFast_GetScreenNailSize() ; if(PhotoFast_SliceEncode_Alloc_Buffer(&slice_encode_primary_info->bs_buf_mem_info, "slice_enc_primary") != E_OK){ goto EXIT; } @@ -1479,7 +1483,7 @@ INT32 PhotoFast_SliceEncode(const HD_PATH_ID vproc_path_id, const HD_VIDEO_FRAME PhotoFast_SliceEncode_Encode_Set_In(slice_encode_primary_info->enc_path_id, vproc_out_pxlfmt, (HD_DIM) {dst_slice_info.width, dst_slice_info.height}); PhotoFast_SliceEncode_Encode_Set_Out(slice_encode_primary_info->enc_path_id, CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_PRIMARY); - if(PhotoFast_SliceEncode_Encode_Primary(&video_frame, src_slice_info, dst_slice_info, &enc_accum_size) != E_OK){ + if(PhotoFast_SliceEncode_Encode_Primary(&video_frame, src_slice_info, dst_slice_info, &enc_accum_size, &primary_quality) != E_OK){ goto EXIT; } @@ -1507,7 +1511,7 @@ INT32 PhotoFast_SliceEncode(const HD_PATH_ID vproc_path_id, const HD_VIDEO_FRAME #endif #if CFG_PHOTOFAST_SLICE_ENC_RC_SCREENNAIL - if(PhotoFast_SliceEncode_Encode_Screennail_RC(&video_frame_out_screennail) != E_OK){ + if(PhotoFast_SliceEncode_Encode_Screennail_RC(&video_frame_out_screennail, &screennail_quality) != E_OK){ goto EXIT; } #else @@ -1767,6 +1771,8 @@ INT32 PhotoFast_SliceEncode_CB2(void* user_data) HD_VIDEO_PXLFMT vproc_out_pxlfmt = 0; PhotoFast_MEM_Info exif_mem_info = {0}; UINT32 enc_accum_size = 0; + static UINT8 primary_quality = CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_PRIMARY; + static UINT8 screennail_quality = CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_SCREENNAIL; // PHOTO_CAP_CBMSG_FP PhotoCapMsgCb = (PHOTO_CAP_CBMSG_FP)Photo_CaptureCB; if(!user_data){ @@ -1895,9 +1901,9 @@ INT32 PhotoFast_SliceEncode_CB2(void* user_data) /* slice encode */ PhotoFast_SliceEncode_Encode_Set_In(slice_encode_primary_info->enc_path_id, vproc_out_pxlfmt, (HD_DIM) {dst_slice_info.width, dst_slice_info.height}); - PhotoFast_SliceEncode_Encode_Set_Out(slice_encode_primary_info->enc_path_id, CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_PRIMARY); + PhotoFast_SliceEncode_Encode_Set_Out(slice_encode_primary_info->enc_path_id, primary_quality); - if(PhotoFast_SliceEncode_Encode_Primary(&queue_ele_in->frame, src_slice_info, dst_slice_info, &enc_accum_size) != E_OK){ + if(PhotoFast_SliceEncode_Encode_Primary(&queue_ele_in->frame, src_slice_info, dst_slice_info, &enc_accum_size, &primary_quality) != E_OK){ goto EXIT; } @@ -1917,7 +1923,7 @@ INT32 PhotoFast_SliceEncode_CB2(void* user_data) #if CFG_PHOTOFAST_SLICE_ENC_RC_SCREENNAIL - if(PhotoFast_SliceEncode_Encode_Screennail_RC(&video_frame_out_screennail) != E_OK){ + if(PhotoFast_SliceEncode_Encode_Screennail_RC(&video_frame_out_screennail, &screennail_quality) != E_OK){ goto EXIT; } #else @@ -2193,7 +2199,7 @@ VOID PhotoFast_SliceEncode2_Close(VOID) FLGPTN flag = 0; DBG_DUMP("PhotoFast_SliceEncode2_Close\n"); - + /* stop cmd */ // set_flg(task1_param.flag_id, FLG_PHOTO_FAST_SLICE_ENC_CMD_STOP); set_flg(task2_param.flag_id, FLG_PHOTO_FAST_SLICE_ENC_CMD_STOP); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.h b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.h old mode 100755 new mode 100644 index 61530dc33..923759ab7 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.h +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.h @@ -11,7 +11,7 @@ #define CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_PRIMARY 85 #define CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_THUMBNAIL 70 #define CFG_PHOTOFAST_SLICE_ENC_INIT_QUALITY_SCREENNAIL 70 -#define CFG_PHOTOFAST_SLICE_ENC_QUALITY_STEP 3 +#define CFG_PHOTOFAST_SLICE_ENC_QUALITY_STEP 5 #define CFG_PHOTOFAST_SLICE_ENC_RC_SCREENNAIL 1 /* rate control */ #define CFG_PHOTOFAST_SLICE_ENC_RC_SCREENNAIL_UBOUND (SCREENNAIL_TARGETBYTERATE + (SCREENNAIL_TARGETBYTERATE * 20 / 100)) diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c index 96719256c..56b1aa72c 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 128 px * Bpp: 1 - * Opts: --format lvgl --size 128 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c --no-compress + * Opts: --format lvgl --size 128 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_128_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c index c24106b77..9864dc122 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c index 80999996c..f1449cca2 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 32 px * Bpp: 1 - * Opts: --format lvgl --size 32 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c --no-compress + * Opts: --format lvgl --size 32 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c index 0b7969ae1..4055c415f 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 48 px * Bpp: 1 - * Opts: --format lvgl --size 48 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c --no-compress + * Opts: --format lvgl --size 48 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c index 77a78cdfe..236ec0f73 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 64 px * Bpp: 1 - * Opts: --format lvgl --size 64 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c --no-compress + * Opts: --format lvgl --size 64 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_64_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c new file mode 100644 index 000000000..d9059a9a5 --- /dev/null +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c @@ -0,0 +1,1144 @@ +/******************************************************************************* + * Size: 8 px + * Bpp: 1 + * Opts: --format lvgl --size 8 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSans-Black.ttf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.c --no-compress + ******************************************************************************/ + +#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#include "lvgl.h" +#else +#include "lvgl/lvgl.h" +#endif + +#ifndef NOTOSANS_BLACK_8_1BPP +#define NOTOSANS_BLACK_8_1BPP 1 +#endif + +#if NOTOSANS_BLACK_8_1BPP + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { + /* U+0020 " " */ + 0x0, + + /* U+0021 "!" */ + 0xff, 0x30, + + /* U+0022 "\"" */ + 0xf7, + + /* U+0023 "#" */ + 0x77, 0xd5, 0xf7, 0x78, + + /* U+0024 "$" */ + 0x6f, 0xee, 0x7f, 0xe0, + + /* U+0025 "%" */ + 0xe9, 0x52, 0xff, 0xd2, 0xa5, 0xc0, + + /* U+0026 "&" */ + 0x73, 0x47, 0x3b, 0xfb, 0xe0, + + /* U+0027 "'" */ + 0xd0, + + /* U+0028 "(" */ + 0x6b, 0x6d, 0xb3, + + /* U+0029 ")" */ + 0xc9, 0xb6, 0xde, + + /* U+002A "*" */ + 0x2f, 0x77, + + /* U+002B "+" */ + 0x4f, 0x44, + + /* U+002C "," */ + 0x70, + + /* U+002D "-" */ + 0xc0, + + /* U+002E "." */ + 0xc0, + + /* U+002F "/" */ + 0x22, 0x64, 0x4c, + + /* U+0030 "0" */ + 0x6f, 0xff, 0xf6, + + /* U+0031 "1" */ + 0x3f, 0x33, 0x33, + + /* U+0032 "2" */ + 0xe3, 0x36, 0x4f, + + /* U+0033 "3" */ + 0xf3, 0x63, 0x3e, + + /* U+0034 "4" */ + 0x37, 0x7b, 0xf3, + + /* U+0035 "5" */ + 0x7a, 0x1e, 0x31, 0xf8, + + /* U+0036 "6" */ + 0x3a, 0x1e, 0xb5, 0xb8, + + /* U+0037 "7" */ + 0xf3, 0x26, 0x64, + + /* U+0038 "8" */ + 0xfd, 0x7f, 0x9f, + + /* U+0039 "9" */ + 0x6d, 0xdf, 0x1e, + + /* U+003A ":" */ + 0xc0, 0xc0, + + /* U+003B ";" */ + 0xc3, 0x80, + + /* U+003C "<" */ + 0x3, 0xce, 0x30, + + /* U+003D "=" */ + 0xf0, 0xf0, + + /* U+003E ">" */ + 0xc, 0x37, 0xc0, + + /* U+003F "?" */ + 0xe2, 0x26, 0x6, + + /* U+0040 "@" */ + 0x3c, 0xbe, 0xad, 0x5b, 0xd8, 0x1e, 0x0, + + /* U+0041 "A" */ + 0x31, 0xc7, 0x96, 0xfb, 0x30, + + /* U+0042 "B" */ + 0xf6, 0xbd, 0xad, 0x78, + + /* U+0043 "C" */ + 0x7e, 0x31, 0x8c, 0x3c, + + /* U+0044 "D" */ + 0xf6, 0xf7, 0xbd, 0xf8, + + /* U+0045 "E" */ + 0xfc, 0xfc, 0xcf, + + /* U+0046 "F" */ + 0xfc, 0xfc, 0xcc, + + /* U+0047 "G" */ + 0x7e, 0x3f, 0xbd, 0xbc, + + /* U+0048 "H" */ + 0xde, 0xff, 0xbd, 0xec, + + /* U+0049 "I" */ + 0xfb, 0x6d, 0xc0, + + /* U+004A "J" */ + 0x33, 0x33, 0x33, 0x3e, + + /* U+004B "K" */ + 0xde, 0xbd, 0xed, 0xec, + + /* U+004C "L" */ + 0xcc, 0xcc, 0xcf, + + /* U+004D "M" */ + 0xef, 0xdf, 0xbf, 0x7d, 0x7a, 0xc0, + + /* U+004E "N" */ + 0xef, 0xbe, 0xf7, 0xdf, 0x70, + + /* U+004F "O" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe0, + + /* U+0050 "P" */ + 0xef, 0xff, 0xcc, + + /* U+0051 "Q" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe1, 0x83, + + /* U+0052 "R" */ + 0xe7, 0xbd, 0xce, 0x78, + + /* U+0053 "S" */ + 0x7c, 0xe7, 0x3e, + + /* U+0054 "T" */ + 0xf6, 0x66, 0x66, + + /* U+0055 "U" */ + 0xde, 0xf7, 0xbd, 0xb8, + + /* U+0056 "V" */ + 0xcb, 0x65, 0x9c, 0x70, 0xc0, + + /* U+0057 "W" */ + 0xd9, 0xdb, 0x5b, 0x5e, 0x76, 0x66, + + /* U+0058 "X" */ + 0xc9, 0xe3, 0xc, 0x7b, 0x20, + + /* U+0059 "Y" */ + 0xcd, 0xe7, 0x8c, 0x30, 0xc0, + + /* U+005A "Z" */ + 0xf3, 0x66, 0xcf, + + /* U+005B "[" */ + 0xea, 0xab, + + /* U+005C "\\" */ + 0xc4, 0x46, 0x22, + + /* U+005D "]" */ + 0xd5, 0x57, + + /* U+005E "^" */ + 0x66, 0x79, + + /* U+005F "_" */ + 0xf0, + + /* U+0060 "`" */ + 0xcc, + + /* U+0061 "a" */ + 0xf1, 0xfb, 0xf0, + + /* U+0062 "b" */ + 0xcc, 0xff, 0xff, 0xf0, + + /* U+0063 "c" */ + 0x7c, 0xcc, 0x70, + + /* U+0064 "d" */ + 0x18, 0xdf, 0xbd, 0xed, 0xe0, + + /* U+0065 "e" */ + 0x76, 0xbf, 0x87, 0x0, + + /* U+0066 "f" */ + 0xfb, 0xed, 0xb0, + + /* U+0067 "g" */ + 0x7e, 0xf7, 0xb7, 0x8f, 0xc0, + + /* U+0068 "h" */ + 0xc6, 0x3f, 0xbd, 0xef, 0x60, + + /* U+0069 "i" */ + 0xcf, 0xfc, + + /* U+006A "j" */ + 0x61, 0xb6, 0xdb, 0xe0, + + /* U+006B "k" */ + 0xc6, 0x37, 0xef, 0x6b, 0x60, + + /* U+006C "l" */ + 0xff, 0xfc, + + /* U+006D "m" */ + 0xff, 0xff, 0xff, 0xfc, + + /* U+006E "n" */ + 0xfe, 0xf7, 0xbd, 0x80, + + /* U+006F "o" */ + 0x76, 0xf7, 0xb7, 0x0, + + /* U+0070 "p" */ + 0xff, 0xff, 0xfc, 0xc0, + + /* U+0071 "q" */ + 0xff, 0xff, 0xf3, 0x30, + + /* U+0072 "r" */ + 0xfc, 0xcc, 0xc0, + + /* U+0073 "s" */ + 0xec, 0xe3, 0xe0, + + /* U+0074 "t" */ + 0x6f, 0x66, 0x67, + + /* U+0075 "u" */ + 0xde, 0xf7, 0xbf, 0x80, + + /* U+0076 "v" */ + 0xda, 0x94, 0xe2, 0x0, + + /* U+0077 "w" */ + 0xdb, 0xbd, 0xbb, 0x66, 0xc0, + + /* U+0078 "x" */ + 0xdb, 0x9c, 0xed, 0x80, + + /* U+0079 "y" */ + 0x9d, 0xf6, 0x66, 0xc0, + + /* U+007A "z" */ + 0xf3, 0x6c, 0xf0, + + /* U+007B "{" */ + 0x76, 0x6c, 0x66, 0x67, + + /* U+007C "|" */ + 0xff, 0x80, + + /* U+007D "}" */ + 0xe6, 0x63, 0x66, 0x6e, + + /* U+007E "~" */ + 0xc3, + + /* U+00B0 "°" */ + 0xf7, 0x80, + + /* U+00BA "º" */ + 0xf7, 0x80, + + /* U+00C1 "Á" */ + 0x10, 0x3, 0x1c, 0x79, 0x6f, 0xb3, + + /* U+00C3 "Ã" */ + 0x70, 0x1c, 0xa5, 0x6f, 0xfb, + + /* U+00C4 "Ä" */ + 0x78, 0x3, 0x1e, 0x79, 0xef, 0xf3, + + /* U+00C9 "É" */ + 0x20, 0xfc, 0xfc, 0xcf, + + /* U+00CE "Î" */ + 0xe3, 0xed, 0xb7, + + /* U+00D3 "Ó" */ + 0x18, 0x40, 0x1e, 0xcf, 0x3c, 0xf3, 0x78, + + /* U+00D6 "Ö" */ + 0x78, 0x7, 0xb3, 0xcf, 0x3c, 0xde, + + /* U+00DC "Ü" */ + 0x70, 0x37, 0xbd, 0xef, 0x6e, + + /* U+00DF "ß" */ + 0x76, 0xbd, 0xef, 0xe7, 0xe0, + + /* U+00E0 "à" */ + 0x42, 0xf1, 0xfb, 0xf0, + + /* U+00E1 "á" */ + 0x34, 0xf1, 0xfb, 0xf0, + + /* U+00E2 "â" */ + 0x69, 0xf1, 0xfb, 0xf0, + + /* U+00E3 "ã" */ + 0x53, 0x9c, 0x27, 0xad, 0xe0, + + /* U+00E4 "ä" */ + 0x6c, 0x7, 0x4, 0x79, 0xa7, 0x80, + + /* U+00E7 "ç" */ + 0x7c, 0xcf, 0x62, 0x60, + + /* U+00E8 "è" */ + 0x41, 0x1d, 0xaf, 0xe1, 0xc0, + + /* U+00E9 "é" */ + 0x32, 0x1d, 0xaf, 0xe1, 0xc0, + + /* U+00EA "ê" */ + 0x64, 0x9d, 0xaf, 0xe1, 0xc0, + + /* U+00EC "ì" */ + 0x45, 0xb6, 0xd8, + + /* U+00ED "í" */ + 0x73, 0x6d, 0xb0, + + /* U+00F1 "ñ" */ + 0x53, 0xbf, 0xbd, 0xef, 0x60, + + /* U+00F2 "ò" */ + 0x61, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00F3 "ó" */ + 0x31, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00F5 "õ" */ + 0x53, 0x9d, 0xbd, 0xed, 0xc0, + + /* U+00F6 "ö" */ + 0xf0, 0x1d, 0xbd, 0xed, 0xc0, + + /* U+00FA "ú" */ + 0x31, 0x37, 0xbd, 0xef, 0xe0, + + /* U+00FC "ü" */ + 0xf0, 0x37, 0xbd, 0xef, 0xe0, + + /* U+0105 "ą" */ + 0xf1, 0xfd, 0xf2, 0x10, + + /* U+0118 "Ę" */ + 0xfb, 0xed, 0xc9, + + /* U+0410 "А" */ + 0x31, 0xc7, 0x96, 0xfb, 0x30, + + /* U+0411 "Б" */ + 0xec, 0xff, 0xfe, + + /* U+0412 "В" */ + 0xf6, 0xbd, 0xad, 0x78, + + /* U+0413 "Г" */ + 0xfc, 0xcc, 0xcc, + + /* U+0414 "Д" */ + 0x3c, 0x58, 0xb3, 0x66, 0xdf, 0xf1, 0xe3, + + /* U+0417 "З" */ + 0xf8, 0xd8, 0x31, 0xf8, + + /* U+0418 "И" */ + 0xcf, 0x7d, 0xfb, 0xef, 0x30, + + /* U+041A "К" */ + 0xde, 0xbd, 0xed, 0xec, + + /* U+041C "М" */ + 0xef, 0xdf, 0xbf, 0x7d, 0x7a, 0xc0, + + /* U+041D "Н" */ + 0xde, 0xff, 0xbd, 0xec, + + /* U+041E "О" */ + 0x7b, 0x3c, 0xf3, 0xcd, 0xe0, + + /* U+041F "П" */ + 0xfe, 0xf7, 0xbd, 0xec, + + /* U+0420 "Р" */ + 0xef, 0xff, 0xcc, + + /* U+0421 "С" */ + 0x7e, 0x31, 0x8c, 0x3c, + + /* U+0422 "Т" */ + 0xf6, 0x66, 0x66, + + /* U+0423 "У" */ + 0xde, 0xd4, 0xe2, 0x70, + + /* U+0424 "Ф" */ + 0x7b, 0xff, 0xff, 0x78, 0xc0, + + /* U+0426 "Ц" */ + 0xdb, 0x6d, 0xb6, 0xdb, 0xf0, 0xc3, + + /* U+0427 "Ч" */ + 0xde, 0xf7, 0xf1, 0x8c, + + /* U+0428 "Ш" */ + 0xdb, 0xdb, 0xdb, 0xdb, 0xdb, 0xff, + + /* U+042B "Ы" */ + 0xcf, 0x3f, 0xff, 0xff, 0xb0, + + /* U+042D "Э" */ + 0xf0, 0xde, 0x39, 0xf8, + + /* U+042F "Я" */ + 0x7a, 0xd6, 0xf5, 0xec, + + /* U+0430 "а" */ + 0xf1, 0xfb, 0xf0, + + /* U+0431 "б" */ + 0x7e, 0x3d, 0xbd, 0xed, 0xc0, + + /* U+0432 "в" */ + 0xfd, 0xed, 0xf0, + + /* U+0433 "г" */ + 0xfc, 0xcc, 0xc0, + + /* U+0434 "д" */ + 0x38, 0xe7, 0x96, 0xff, 0x3c, 0xc0, + + /* U+0435 "е" */ + 0x76, 0xbf, 0x87, 0x0, + + /* U+0436 "ж" */ + 0xdb, 0x5a, 0x7e, 0x5a, 0xdb, + + /* U+0437 "з" */ + 0xf3, 0x63, 0xf0, + + /* U+0438 "и" */ + 0xdf, 0xff, 0xfd, 0x80, + + /* U+0439 "й" */ + 0x53, 0xb7, 0xff, 0xff, 0x60, + + /* U+043A "к" */ + 0xde, 0xbd, 0xad, 0x80, + + /* U+043B "л" */ + 0x7a, 0xd7, 0xb9, 0x80, + + /* U+043C "м" */ + 0xff, 0xff, 0xff, 0xec, + + /* U+043D "н" */ + 0xff, 0xff, 0xf0, + + /* U+043E "о" */ + 0x76, 0xf7, 0xb7, 0x0, + + /* U+043F "п" */ + 0xff, 0xff, 0xf0, + + /* U+0440 "р" */ + 0xff, 0xff, 0xfc, 0xc0, + + /* U+0441 "с" */ + 0x7c, 0xcc, 0x70, + + /* U+0442 "т" */ + 0xf6, 0x66, 0x60, + + /* U+0443 "у" */ + 0x9d, 0xf6, 0x66, 0xc0, + + /* U+0444 "ф" */ + 0x30, 0xc7, 0xbf, 0xff, 0xf7, 0x8c, 0x30, + + /* U+0445 "х" */ + 0xdb, 0x9c, 0xed, 0x80, + + /* U+0446 "ц" */ + 0xdb, 0x6d, 0xb6, 0xfc, 0x30, 0xc0, + + /* U+0447 "ч" */ + 0xde, 0xfe, 0x31, 0x80, + + /* U+0448 "ш" */ + 0xff, 0xff, 0xff, 0xfc, + + /* U+0449 "щ" */ + 0xf6, 0xf6, 0xf6, 0xf6, 0xff, 0x3, 0x3, + + /* U+044A "ъ" */ + 0xe1, 0x87, 0x9b, 0x78, + + /* U+044B "ы" */ + 0xcf, 0x3e, 0xf7, 0xec, + + /* U+044C "ь" */ + 0xcc, 0xfd, 0xf0, + + /* U+044D "э" */ + 0xe2, 0x72, 0xe0, + + /* U+044E "ю" */ + 0xdd, 0xaf, 0xde, 0xbd, 0xc0, + + /* U+044F "я" */ + 0x7a, 0xde, 0xbd, 0x80, + + /* U+2026 "…" */ + 0xfc +}; + + +/*--------------------- + * 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 = 33, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1, .adv_w = 37, .box_w = 2, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 3, .adv_w = 67, .box_w = 4, .box_h = 2, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 4, .adv_w = 85, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 8, .adv_w = 74, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 12, .adv_w = 121, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 18, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 23, .adv_w = 37, .box_w = 2, .box_h = 2, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 24, .adv_w = 46, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 27, .adv_w = 46, .box_w = 3, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 30, .adv_w = 69, .box_w = 4, .box_h = 4, .ofs_x = 0, .ofs_y = 3}, + {.bitmap_index = 32, .adv_w = 75, .box_w = 4, .box_h = 4, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 34, .adv_w = 40, .box_w = 2, .box_h = 2, .ofs_x = 0, .ofs_y = -1}, + {.bitmap_index = 35, .adv_w = 41, .box_w = 2, .box_h = 1, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 36, .adv_w = 37, .box_w = 2, .box_h = 1, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 37, .adv_w = 57, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 40, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 43, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 46, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 49, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 52, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 55, .adv_w = 75, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 59, .adv_w = 75, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 63, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 66, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 69, .adv_w = 75, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 72, .adv_w = 37, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 74, .adv_w = 38, .box_w = 2, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 76, .adv_w = 75, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 79, .adv_w = 75, .box_w = 4, .box_h = 3, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 81, .adv_w = 75, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 84, .adv_w = 65, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 87, .adv_w = 115, .box_w = 7, .box_h = 7, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 94, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 99, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 103, .adv_w = 83, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 107, .adv_w = 94, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 111, .adv_w = 70, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 114, .adv_w = 69, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 117, .adv_w = 95, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 121, .adv_w = 98, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 125, .adv_w = 56, .box_w = 3, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 128, .adv_w = 45, .box_w = 4, .box_h = 8, .ofs_x = -1, .ofs_y = -2}, + {.bitmap_index = 132, .adv_w = 88, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 136, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 139, .adv_w = 124, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 145, .adv_w = 107, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 150, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 155, .adv_w = 81, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 158, .adv_w = 102, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 164, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 168, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 171, .adv_w = 76, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 174, .adv_w = 97, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 178, .adv_w = 89, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 183, .adv_w = 133, .box_w = 8, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 189, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 194, .adv_w = 85, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 199, .adv_w = 78, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 202, .adv_w = 41, .box_w = 2, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 204, .adv_w = 57, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 207, .adv_w = 41, .box_w = 2, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 209, .adv_w = 67, .box_w = 4, .box_h = 4, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 211, .adv_w = 64, .box_w = 4, .box_h = 1, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 212, .adv_w = 54, .box_w = 3, .box_h = 2, .ofs_x = 0, .ofs_y = 5}, + {.bitmap_index = 213, .adv_w = 80, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 216, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 220, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 223, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 228, .adv_w = 79, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 232, .adv_w = 53, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 235, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 240, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 245, .adv_w = 42, .box_w = 2, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 247, .adv_w = 41, .box_w = 3, .box_h = 9, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 251, .adv_w = 84, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 256, .adv_w = 41, .box_w = 2, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 258, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 262, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 266, .adv_w = 82, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 270, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 274, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 278, .adv_w = 60, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 281, .adv_w = 66, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 284, .adv_w = 59, .box_w = 4, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 287, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 291, .adv_w = 78, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 295, .adv_w = 116, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 300, .adv_w = 81, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 304, .adv_w = 78, .box_w = 4, .box_h = 7, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 308, .adv_w = 65, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 311, .adv_w = 55, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 315, .adv_w = 65, .box_w = 1, .box_h = 9, .ofs_x = 2, .ofs_y = -2}, + {.bitmap_index = 317, .adv_w = 55, .box_w = 4, .box_h = 8, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 321, .adv_w = 75, .box_w = 4, .box_h = 2, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 322, .adv_w = 54, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 324, .adv_w = 50, .box_w = 3, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 326, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 332, .adv_w = 93, .box_w = 5, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 337, .adv_w = 93, .box_w = 6, .box_h = 8, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 343, .adv_w = 70, .box_w = 4, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 347, .adv_w = 56, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 350, .adv_w = 102, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 357, .adv_w = 102, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 363, .adv_w = 97, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 368, .adv_w = 96, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 373, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 377, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 381, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 385, .adv_w = 80, .box_w = 5, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 390, .adv_w = 80, .box_w = 6, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 396, .adv_w = 69, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 400, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 405, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 410, .adv_w = 79, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 415, .adv_w = 42, .box_w = 3, .box_h = 7, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 418, .adv_w = 42, .box_w = 3, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 421, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 426, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 431, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 436, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 441, .adv_w = 82, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 446, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 451, .adv_w = 86, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 456, .adv_w = 80, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 460, .adv_w = 70, .box_w = 3, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 463, .adv_w = 93, .box_w = 6, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 468, .adv_w = 83, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 471, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 475, .adv_w = 74, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 478, .adv_w = 104, .box_w = 7, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 485, .adv_w = 85, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 489, .adv_w = 108, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 494, .adv_w = 89, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 498, .adv_w = 124, .box_w = 7, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 504, .adv_w = 98, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 508, .adv_w = 102, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 513, .adv_w = 95, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 517, .adv_w = 81, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 520, .adv_w = 83, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 524, .adv_w = 76, .box_w = 4, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 527, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 531, .adv_w = 114, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 536, .adv_w = 106, .box_w = 6, .box_h = 8, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 542, .adv_w = 97, .box_w = 5, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 546, .adv_w = 139, .box_w = 8, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 552, .adv_w = 118, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 557, .adv_w = 86, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 561, .adv_w = 87, .box_w = 5, .box_h = 6, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 565, .adv_w = 80, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 568, .adv_w = 83, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 573, .adv_w = 81, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 576, .adv_w = 64, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 579, .adv_w = 89, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 585, .adv_w = 79, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 589, .adv_w = 124, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 594, .adv_w = 70, .box_w = 4, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 597, .adv_w = 92, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 601, .adv_w = 92, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 606, .adv_w = 87, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 610, .adv_w = 88, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 614, .adv_w = 110, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 618, .adv_w = 85, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 621, .adv_w = 82, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 625, .adv_w = 84, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 628, .adv_w = 82, .box_w = 4, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 632, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 635, .adv_w = 77, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 638, .adv_w = 78, .box_w = 4, .box_h = 7, .ofs_x = 0, .ofs_y = -2}, + {.bitmap_index = 642, .adv_w = 111, .box_w = 6, .box_h = 9, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 649, .adv_w = 81, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 653, .adv_w = 97, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 659, .adv_w = 86, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 663, .adv_w = 129, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 667, .adv_w = 137, .box_w = 8, .box_h = 7, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 674, .adv_w = 91, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 678, .adv_w = 111, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 682, .adv_w = 74, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 685, .adv_w = 69, .box_w = 4, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 688, .adv_w = 116, .box_w = 7, .box_h = 5, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 693, .adv_w = 78, .box_w = 5, .box_h = 5, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 697, .adv_w = 111, .box_w = 6, .box_h = 1, .ofs_x = 1, .ofs_y = 0} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + +static const uint16_t unicode_list_1[] = { + 0x0, 0xa, 0x11, 0x13, 0x14, 0x19, 0x1e, 0x23, + 0x26, 0x2c, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, + 0x37, 0x38, 0x39, 0x3a, 0x3c, 0x3d, 0x41, 0x42, + 0x43, 0x45, 0x46, 0x4a, 0x4c, 0x55, 0x68, 0x360, + 0x361, 0x362, 0x363, 0x364, 0x367, 0x368, 0x36a, 0x36c, + 0x36d, 0x36e, 0x36f, 0x370, 0x371, 0x372, 0x373, 0x374, + 0x376, 0x377, 0x378, 0x37b, 0x37d +}; + +/*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 + }, + { + .range_start = 176, .range_length = 894, .glyph_id_start = 96, + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 53, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + }, + { + .range_start = 1071, .range_length = 33, .glyph_id_start = 149, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + }, + { + .range_start = 8230, .range_length = 1, .glyph_id_start = 182, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + } +}; + +/*----------------- + * KERNING + *----------------*/ + + +/*Map glyph_ids to kern left classes*/ +static const uint8_t kern_left_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 3, 0, 0, 0, 4, 5, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 6, 7, 8, 9, 10, 11, + 0, 0, 0, 0, 8, 12, 0, 0, + 9, 13, 9, 0, 0, 14, 15, 16, + 16, 8, 17, 18, 3, 0, 0, 0, + 0, 0, 19, 20, 21, 0, 20, 22, + 0, 19, 0, 0, 0, 0, 19, 19, + 20, 20, 0, 23, 0, 21, 0, 24, + 24, 25, 24, 0, 3, 0, 0, 0, + 0, 0, 6, 6, 6, 10, 0, 9, + 9, 15, 0, 19, 19, 19, 19, 19, + 0, 20, 20, 20, 0, 0, 0, 20, + 20, 20, 20, 0, 0, 19, 10, 26, + 27, 28, 29, 0, 28, 0, 30, 0, + 0, 31, 0, 32, 33, 29, 34, 35, + 0, 0, 0, 0, 31, 0, 19, 0, + 36, 37, 19, 19, 38, 36, 0, 0, + 38, 0, 0, 0, 39, 0, 39, 0, + 37, 40, 39, 38, 19, 0, 0, 19, + 41, 0, 41, 39, 39, 0, 0 +}; + +/*Map glyph_ids to kern right classes*/ +static const uint8_t kern_right_class_mapping[] = +{ + 0, 0, 0, 1, 0, 0, 0, 2, + 1, 0, 3, 0, 0, 4, 5, 4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 6, 0, 7, 0, 8, 0, 0, 0, + 8, 0, 0, 9, 0, 0, 0, 0, + 8, 0, 8, 0, 0, 10, 11, 12, + 12, 13, 14, 15, 0, 0, 3, 0, + 0, 0, 16, 0, 17, 17, 17, 0, + 18, 0, 0, 19, 0, 0, 20, 20, + 17, 20, 17, 20, 21, 0, 20, 22, + 22, 22, 22, 23, 0, 0, 3, 0, + 0, 0, 7, 7, 7, 0, 0, 8, + 8, 11, 0, 17, 16, 16, 16, 16, + 17, 17, 17, 17, 0, 0, 0, 17, + 17, 17, 17, 20, 20, 16, 0, 24, + 0, 0, 0, 25, 26, 0, 0, 0, + 0, 27, 0, 0, 27, 28, 29, 30, + 0, 31, 0, 0, 26, 32, 33, 0, + 34, 34, 35, 36, 37, 38, 34, 34, + 34, 35, 34, 34, 36, 34, 34, 36, + 39, 40, 36, 37, 34, 41, 34, 34, + 39, 34, 34, 38, 34, 42, 4 +}; + +/*Kern values between classes*/ +static const int8_t kern_class_values[] = +{ + 0, 0, 0, 0, 0, 0, -9, 0, + 0, 3, 0, 3, 0, 1, 0, -5, + -8, -4, 0, -4, -4, 0, 0, -9, + -8, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -9, -8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -8, 0, -3, 0, -4, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -6, 0, -9, + -3, -8, 0, -8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -6, -9, 0, -5, -10, 0, 0, 0, + 0, 0, 0, 0, -6, 0, -8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -5, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -3, 0, + 0, 0, -9, 0, 0, 0, 0, 0, + 0, -3, 6, -9, 0, -5, 0, -8, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -1, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -5, 0, 0, -3, 0, + 0, -4, 0, -1, -3, -1, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, -8, + 0, 3, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -10, 0, + 0, 0, 0, 0, 0, -3, 0, -3, + -1, -3, 0, -4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -1, 0, -17, 0, 0, -6, 0, + 0, 0, 0, 0, -3, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, 0, -8, -5, 3, + -9, -3, 0, 3, 0, 0, 0, 0, + 0, -10, -9, -9, 0, -6, -8, -3, + -5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -3, + 0, 0, -1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -6, 0, 3, -5, -1, 0, 0, + 0, 0, 0, 0, 0, -3, -3, -1, + 0, -1, -1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -4, 0, -8, 0, 3, -8, -3, + 0, 0, 0, 0, 0, 0, 0, -6, + -6, -6, 0, -4, -5, 0, -3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 5, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 5, 0, 0, -8, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, + 0, -5, 0, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -9, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -9, 0, -3, + -6, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -3, 0, -3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -1, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -8, -5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -9, + -6, 0, -3, 3, 0, -5, 0, 0, + -10, -6, -8, -9, -3, -3, -5, -5, + -6, -4, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, 0, 0, -3, + -3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, 0, 0, -5, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -1, 0, -4, + -3, 0, -3, 0, 0, 0, -1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -17, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -6, -8, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -6, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -3, 0, 0, -3, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, -8, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, -9, -6, 0, -1, 0, 0, -4, + 0, -1, 0, 0, -8, -3, 0, 0, + 0, 0, -3, 0, 0, 0, 0, -5, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -3, -3, -3, 0, -4, + -4, 0, 0, 0, 0, 0, -3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, -6, -3, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, -4, -1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, -3, 0, 0, + 0, 0, -3, 0, -1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, -1, -1, -1, 0, 0, 0, + 0, -5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + -3, 0, 0, 0, 0, 0, 0, 0, + -8, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -3, 0, -6, -4, + -5, 0 +}; + + +/*Collect the kern class' data in one place*/ +static const lv_font_fmt_txt_kern_classes_t kern_classes = +{ + .class_pair_values = kern_class_values, + .left_class_mapping = kern_left_class_mapping, + .right_class_mapping = kern_right_class_mapping, + .left_class_cnt = 41, + .right_class_cnt = 42, +}; + +/*-------------------- + * 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 = &kern_classes, + .kern_scale = 16, + .cmap_num = 4, + .bpp = 1, + .kern_classes = 1, + .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 notosans_black_8_1bpp = { +#else +lv_font_t notosans_black_8_1bpp = { +#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 = 11, /*The maximum line height required by the font*/ + .base_line = 2, /*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) + .underline_position = -1, + .underline_thickness = 0, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +}; + + + +#endif /*#if NOTOSANS_BLACK_8_1BPP*/ + diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c index d16d03688..3183b7040 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKjp-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKjp-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjkjp_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c index 69751232b..1d39eca5a 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKsc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKsc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjksc_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c index 34d8518e5..ad1e422f0 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 16 px * Bpp: 1 - * Opts: --format lvgl --size 16 --bpp 1 --font Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKtc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Y:/na51089_dual_sdk_1022/na51089_linux_sdk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c --no-compress + * Opts: --format lvgl --size 16 --bpp 1 --font Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/fonts/NotoSansCJKtc-Black.otf -r 0x20-0x3b,0x3d,0x3f-0x5f,0x61-0x7e,0xb0,0xba,0xc1,0xc3-0xc4,0xc9,0xce,0xd3,0xd6,0xdc,0xdf-0xe4,0xe7-0xea,0xec-0xed,0xf1-0xf3,0xf5-0xf6,0xfa,0xfc,0x105,0x118,0x410-0x414,0x417-0x418,0x41a,0x41c-0x424,0x426-0x428,0x42b,0x42d,0x42f-0x44f,0x2026,0x3001,0x3005,0x3042,0x3044,0x3046,0x3048,0x304a-0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305f-0x3061,0x3063,0x3066-0x306b,0x306d-0x3070,0x3079,0x307b,0x307e-0x3082,0x3088-0x308d,0x3092-0x3093,0x30a1-0x30a4,0x30a6-0x30ab,0x30ad,0x30af-0x30b0,0x30b3-0x30b5,0x30b7-0x30bd,0x30bf-0x30c1,0x30c3-0x30c4,0x30c6-0x30c9,0x30cb,0x30cd-0x30d1,0x30d3-0x30d7,0x30d9-0x30db,0x30dd-0x30e3,0x30e5,0x30e7,0x30e9-0x30ed,0x30ef,0x30f3,0x30fc,0x4e00,0x4e09-0x4e0b,0x4e0d,0x4e1d,0x4e25,0x4e2d,0x4e86,0x4eae,0x4eba,0x4ecb,0x4ece,0x4ed8,0x4ef6,0x4f11,0x4f18,0x4f20,0x4f48,0x4f4d-0x4f4e,0x4f53,0x4f5c,0x4f73,0x4f7f,0x4fa6,0x4fdd,0x4fe1,0x4fee,0x5019,0x503c,0x505c,0x5075,0x507f,0x50a8,0x50b3,0x50cf,0x511f,0x5132,0x5145,0x5149,0x5165,0x5167-0x5168,0x5173,0x5185,0x518d,0x5199,0x51c6,0x51cf,0x51e6,0x51fa,0x5206-0x5207,0x5217,0x521d,0x5220,0x5229-0x522b,0x5230,0x5236-0x5237,0x523b,0x524a,0x524d,0x526a,0x52a0,0x52a8,0x52d5,0x5305,0x5316,0x5355,0x5358,0x5361,0x5370,0x5377,0x5382,0x53bb,0x53d6,0x53d8,0x53e4,0x53ef,0x53f7,0x5408,0x540b,0x540d,0x5426,0x542b,0x547d,0x548c,0x54c1,0x5546,0x55ae,0x5668,0x56b4,0x56de,0x56fa,0x56fe,0x5716,0x5727-0x5728,0x573a,0x5747,0x578b,0x5834-0x5835,0x585e,0x58a8,0x58d3,0x58f0,0x5904,0x5907,0x5909,0x590d,0x591c,0x5927,0x5929,0x592e,0x5934,0x5939,0x593e,0x59cb,0x5a92,0x5b50,0x5b57-0x5b58,0x5b8c,0x5b9a,0x5bf8,0x5c01,0x5c06-0x5c07,0x5c0f,0x5c11,0x5c3a,0x5c3d,0x5c40,0x5de5,0x5df2,0x5e27,0x5e38,0x5e45,0x5e73,0x5e7b,0x5ea6,0x5ee0,0x5efa,0x5f00,0x5f0f,0x5f15,0x5f20,0x5f35,0x5f37,0x5f39-0x5f3a,0x5f48,0x5f52-0x5f53,0x5f55,0x5f69,0x5f71,0x5f85,0x5f8c,0x5f9e,0x5fa9-0x5faa,0x5fc6,0x5fd9,0x5feb,0x603b,0x6062,0x606f,0x61b6,0x6210,0x623b,0x6240,0x624b,0x6253,0x627e,0x629e,0x62a4,0x62bc,0x62c5,0x62cd,0x62d4,0x62e9,0x62ec,0x62f7,0x6301,0x6309,0x633f,0x636e,0x6372,0x63a5,0x63d0,0x63d2,0x6444,0x64ad-0x64ae,0x64c7,0x651d,0x652f,0x6539,0x653e,0x6548,0x6570,0x6574,0x6578,0x6587,0x6599,0x65ad,0x65b0,0x65b9,0x65cb,0x65e0,0x65e5,0x65f6,0x660e,0x662f,0x6642,0x666e-0x666f,0x6674,0x667a,0x66ab,0x66c7,0x66dd,0x66f4,0x6700,0x6709,0x671f,0x672a,0x672c,0x673a,0x675f,0x676f,0x6790,0x679a,0x679c,0x67d4,0x6807,0x683c,0x6848,0x6863,0x68c0,0x68d5,0x691c,0x69cb,0x6a19,0x6a21,0x6a5f,0x6a94,0x6aa2,0x6b21,0x6b62-0x6b64,0x6c34,0x6c92,0x6ca1,0x6cd5,0x6ce1,0x6d4b,0x6d4e,0x6d88,0x6e1b,0x6e2c,0x6e90,0x6e96,0x6ec5,0x6ee1,0x6eff,0x6fdf,0x706f,0x70b9,0x70c8,0x7121,0x7126,0x7167,0x71c8,0x7247-0x7248,0x7269,0x7387,0x73af,0x73fe,0x7406,0x74b0,0x751f,0x7528,0x7535,0x753b,0x7565,0x756b,0x767d,0x7684,0x76d2,0x76d6,0x76e1,0x76ee,0x76f8,0x771f,0x773c,0x77e5,0x7801,0x786c,0x786e,0x788c,0x789f,0x78ba,0x78bc,0x78c1,0x793a,0x79d2,0x79f0,0x79fb,0x7a0d,0x7a7a,0x7b11,0x7b49,0x7b52,0x7b7e,0x7b80,0x7b97,0x7c7b,0x7c89,0x7cfb,0x7d05,0x7d19,0x7d22,0x7d42,0x7d50,0x7d61,0x7d93,0x7d9a,0x7db2,0x7dda,0x7de0,0x7de8,0x7e2e,0x7e3d,0x7e41,0x7e7c,0x7e8c,0x7eb8,0x7ecf,0x7ed3,0x7edc,0x7ee7,0x7eed,0x7f16,0x7f29,0x7f6e,0x8017,0x8054,0x806f,0x8072,0x80cc,0x80fd,0x8138,0x81c9,0x81ea,0x81f4,0x8207,0x822c,0x8272,0x8282,0x82b1,0x82f1,0x8367,0x83dc,0x84cb,0x8655,0x865f,0x86cd,0x8861,0x8865,0x8868,0x88c1,0x88c5,0x88dc-0x88dd,0x88fd,0x8907,0x8910,0x8981,0x898b,0x898f,0x8996,0x89c1,0x89c4,0x89c6,0x89c8,0x89e3,0x8a00,0x8a08,0x8a0a,0x8a18,0x8a2d,0x8a70,0x8a8d,0x8a9e,0x8aa4,0x8abf,0x8acb,0x8b77,0x8b8a,0x8ba1,0x8ba4,0x8bb0,0x8bbe,0x8bc6,0x8bed,0x8bef,0x8bf7,0x8c03,0x8c61,0x8cc7,0x8cea,0x8d1d,0x8d28,0x8d44,0x8d77,0x8db3,0x8def,0x8ee2,0x8efd,0x8f03,0x8f09,0x8f1d,0x8f38,0x8f49,0x8f6c,0x8f7d,0x8f93,0x8fa8,0x8fd0,0x8fd4,0x8fde,0x9000-0x9001,0x9009,0x901a,0x901f,0x9023,0x904b,0x9069,0x9078,0x90e8,0x91c7,0x91cd,0x91cf,0x92b3,0x9304,0x932f,0x9332,0x9375,0x9396,0x93e1,0x9418,0x949f,0x94a8,0x9501,0x9510,0x9519,0x952e,0x955c,0x9580,0x9583,0x9589,0x958b,0x9593,0x95dc,0x95e8,0x95ea,0x95ed,0x95f4,0x9632,0x9634,0x9664,0x9670,0x9694,0x96d9,0x96f6,0x96fb,0x9707,0x9732,0x9759,0x9762,0x97f3,0x9801,0x9805,0x9810,0x982d,0x983b,0x9854,0x985e,0x9875,0x9884,0x9891,0x98a8,0x98ce,0x9971,0x9ad4,0x9ad8,0x9ed1,0x9ed8,0x9ede,0x20-0x7e -o Z:/na51089_linux_sdk/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosanscjktc_black_16_1bpp.c --no-compress ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c index 5804b375e..1c1276c25 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -403,6 +403,7 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] = { ¬osans_black_48_1bpp }, { ¬osans_black_64_1bpp }, { ¬osans_black_128_1bpp }, + { ¬osans_black_8_1bpp }, }; lv_plugin_string_t* lv_plugin_language_table[] = { diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h index 90e1225df..49909b3aa 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -59,6 +59,7 @@ LV_FONT_DECLARE(notosans_black_32_1bpp); LV_FONT_DECLARE(notosans_black_48_1bpp); LV_FONT_DECLARE(notosans_black_64_1bpp); LV_FONT_DECLARE(notosans_black_128_1bpp); +LV_FONT_DECLARE(notosans_black_8_1bpp); void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event); void button_del_event_callback(lv_obj_t* obj, lv_event_t event); @@ -789,7 +790,8 @@ LV_IMG_DECLARE(icon_yes_m); #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_48_1BPP 7 #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_64_1BPP 8 #define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_128_1BPP 9 -#define LV_PLUGIN_FONT_TABLE_SIZE 10 +#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 10 +#define LV_PLUGIN_FONT_TABLE_SIZE 11 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_MODE 2 diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c old mode 100755 new mode 100644 index 4eb3af9de..c58d50339 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c @@ -199,42 +199,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_DISABLED, color); lv_obj_t *label_date = lv_label_create(parent, NULL); @@ -265,42 +259,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_DISABLED, color); lv_obj_t *label_time = lv_label_create(parent, NULL); @@ -380,42 +368,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_DISABLED, color); lv_obj_t *label_rec_time = lv_label_create(parent, NULL); @@ -545,42 +527,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_DISABLED, color); lv_obj_t *label_size = lv_label_create(parent, NULL); @@ -809,42 +785,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_DISABLED, color); lv_obj_t *label_zoom = lv_label_create(parent, NULL); @@ -876,42 +846,36 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_DISABLED, color); lv_obj_t *label_maxtime = lv_label_create(parent, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c index 1b30bb841..008c52642 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c @@ -159,42 +159,36 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_DISABLED, color); lv_obj_t *label_file_name = lv_label_create(parent, NULL); @@ -374,42 +368,36 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_DISABLED, color); lv_obj_t *label_play_time = lv_label_create(parent, NULL); @@ -1073,42 +1061,36 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_DISABLED, color); lv_obj_t *label_file_time = lv_label_create(parent, NULL); @@ -1141,42 +1123,36 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_DISABLED, color); lv_obj_t *label_file_date = lv_label_create(parent, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c index 8bb409e98..261f4a700 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c @@ -1550,42 +1550,36 @@ lv_obj_t* UIFlowPlayThumb_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_DISABLED, color); lv_obj_t *label_page_info = lv_label_create(parent, NULL); @@ -1618,42 +1612,36 @@ lv_obj_t* UIFlowPlayThumb_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_DISABLED, color); lv_obj_t *label_file_name = lv_label_create(parent, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c index d6c4daca8..bd6143a08 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c @@ -77,42 +77,36 @@ lv_obj_t* UIFlowUSB_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_DISABLED, color); lv_obj_t *label_usbmode = lv_label_create(container_1, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c index 616984e5b..40554a577 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c @@ -156,42 +156,36 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_DISABLED, color); lv_obj_t *label_usbt = lv_label_create(button_1, NULL); @@ -341,7 +335,6 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_msdc_s0, LV_STATE_FOCUSED, color); @@ -354,28 +347,24 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_msdc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_msdc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_msdc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_DISABLED, color); lv_obj_t *label_msdc = lv_label_create(button_msdc, NULL); @@ -525,7 +514,6 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pcc_s0, LV_STATE_FOCUSED, color); @@ -538,28 +526,24 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pcc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pcc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pcc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_DISABLED, color); lv_obj_t *label_pcc = lv_label_create(button_pcc, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c index 2712ae06e..a504b75b5 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c @@ -162,7 +162,6 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ref_s0, LV_STATE_FOCUSED, color); @@ -175,28 +174,24 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ref_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ref_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ref_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_DISABLED, color); lv_obj_t *label_ref = lv_label_create(button_ref, NULL); @@ -297,7 +292,6 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifioff_s0, LV_STATE_FOCUSED, color); @@ -310,28 +304,24 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifioff_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifioff_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifioff_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_DISABLED, color); lv_obj_t *label_wifioff = lv_label_create(button_wifioff, NULL); @@ -520,42 +510,36 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_DISABLED, color); lv_obj_t *label_ssid = lv_label_create(container_1, NULL); @@ -586,42 +570,36 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_DISABLED, color); lv_obj_t *label_pwa2 = lv_label_create(container_1, NULL); @@ -712,42 +690,36 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_DISABLED, color); lv_obj_t *label_wifimode = lv_label_create(container_1, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c index 0fa8a6faf..b3955a22d 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c @@ -112,7 +112,6 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_msg_s0, LV_STATE_FOCUSED, color); @@ -125,28 +124,24 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_msg_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_msg_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_msg_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_DISABLED, color); lv_obj_t *label_select_msg = lv_label_create(button_select_msg, NULL); @@ -273,42 +268,36 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_DISABLED, color); lv_obj_t *label_mac = lv_label_create(container_1, NULL); @@ -339,42 +328,36 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_DISABLED, color); lv_obj_t *label_wifista = lv_label_create(container_1, NULL); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c index 2e2e158df..a054a0f86 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c @@ -45,6 +45,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_CHECKED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_CHECKED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); @@ -53,6 +54,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_FOCUSED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); @@ -61,6 +63,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_EDITED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_EDITED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); @@ -69,6 +72,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_HOVERED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xcd, 0x1f, 0x48, 0x9a) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); @@ -77,6 +81,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_PRESSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_PRESSED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); @@ -85,6 +90,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_DISABLED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_DISABLED,¬osans_black_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); static lv_style_t message_box_1_s1; diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c index 695a8ee1f..21acdfbde 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIMovieMapping.c @@ -164,9 +164,9 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = { {1, 3, 36, 8, -8, 0}, {1, 4, 30, 200 * 1024, 30, 26, 10, 40, 26, 10, 40, -40, 1, 8, 4}, #else - {1920, 1080, 30, /*104857*/262144/* 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, + {1920, 1080, 30, 104857/*262144 2M = 2*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, /*104857*/262144/* 2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, + {1, 4, 30, 104857/*262144 2M = 2*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, #endif }, @@ -196,7 +196,7 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = { #else {1280, 720, 30, 58982/*131072 1M = 1*1024*1024/8 */, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, 58982/*131072 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, + {1, 4, 30, 58982/*131072 1M = 1*1024*1024/8 */, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, #endif }, @@ -220,7 +220,7 @@ static MOVIE_SIZE_ITEM g_MovieSizeTable[] = { #else {848, 480, 30, 32768/*110100*/, MEDIAREC_DAR_DEFAULT, IMAGERATIO_16_9}, {1, 3, 36, 8, -8, 0}, - {1, 4, 30, 32768/*110100*/, 30, 26, 15, 50, 26, 15, 50, 0, 1, 8, 4}, + {1, 4, 30, 32768/*110100*/, 30, 26, 15, 50, 26, 15, 50, 40, 1, 8, 4}, #endif }, diff --git a/rtos/code/application/source/cardv/rtos-main-hunting_lvgl.lds b/rtos/code/application/source/cardv/rtos-main-hunting_lvgl.lds old mode 100755 new mode 100644 index ac2192d14..83c8dfba2 --- a/rtos/code/application/source/cardv/rtos-main-hunting_lvgl.lds +++ b/rtos/code/application/source/cardv/rtos-main-hunting_lvgl.lds @@ -316,6 +316,7 @@ SECTIONS ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_32_1bpp.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_48_1bpp.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_16_1bpp.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) + ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Fonts/notosans_black_8_1bpp.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) ./SrcCode/UIWnd/LVGL_SPORTCAM/Resource/Palette/palette.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) ./SrcCode/System/SysMain.o (.text* .data* .data1* .rodata* .rodata1* .reginfo* .init* .exit*) } diff --git a/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c index f2441a53b..70be41e0b 100644 --- a/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_commu_mcu.c @@ -734,6 +734,10 @@ THREAD_RETTYPE sf_commu_mcu_task(void *arg) CHKPNT; while(sf_commu_mcu_exit == 0) { + if(len >= BUF_REG_SIZE){ + DBG_ERR("mcu buffer overflow6!!\n"); + } + readLen = sf_commu_read(buffer + len, 1); if(readLen > 0) @@ -747,6 +751,10 @@ THREAD_RETTYPE sf_commu_mcu_task(void *arg) while(i < len && start < 0) { + if(i >= BUF_REG_SIZE){ + DBG_ERR("mcu buffer overflow5!!\n"); + } + if(buffer[i] == 0x55) { temp_start1 = i; @@ -770,6 +778,10 @@ THREAD_RETTYPE sf_commu_mcu_task(void *arg) { while (i < len) { + if(i >= BUF_REG_SIZE){ + DBG_ERR("mcu buffer overflow4!!\n"); + } + if(buffer[i] == 0xFF) { temp_end1 = i; @@ -792,6 +804,19 @@ THREAD_RETTYPE sf_commu_mcu_task(void *arg) if(start >= 0 && end > 0) { copy_size = end - start + 1; + + if(start >= BUF_REG_SIZE){ + DBG_ERR("mcu buffer overflow1!! start = %lu\n", start); + } + + if((start + 2) >= BUF_REG_SIZE){ + DBG_ERR("mcu buffer overflow2!! start + 2=%lu\n", start + 2); + } + + if(copy_size > (BUF_REG_SIZE - start)){ + DBG_ERR("mcu buffer overflow3!! copy_size=%lu\n", copy_size); + } + if(buffer[start + 2] != 0xff) { if(buffer[start + 2] != 0x05 && buffer[start + 2] != 0x06 && buffer[start + 2] != 0xff) @@ -857,7 +882,7 @@ int sf_commu_mcu_task_start(void) printf("%s:%d %d\r\n", __FUNCTION__, __LINE__,rt); } - sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_commu_mcu_task", 10, 2048); + sfCommuMcuThread = vos_task_create(sf_commu_mcu_task, NULL, "sf_commu_mcu_task", 10, 8192); if(!sfCommuMcuThread) { DBG_ERR("[ERROR] sf_commu_mcu_task thread creat failed!\r\n");