Skip to content

Commit 0942fdc

Browse files
committed
update fonts - key strength measurement
1 parent a2f6947 commit 0942fdc

8 files changed

Lines changed: 158 additions & 8 deletions

File tree

  • projects
    • maixpy_amigo/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_bit/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_cube/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_dock/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_m5stickv/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_wonder_mv/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_yahboom_devkit/compile/overrides/components/micropython/port/src/omv/img
    • maixpy_yahboom/compile/overrides/components/micropython/port/src/omv/img

‎projects/maixpy_amigo/compile/overrides/components/micropython/port/src/omv/img/font.c‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ struct font
788788

789789

790790
static uint8_t unicode_wide[] = {
791-
0x03,0x9F,
791+
0x03,0xA5,
792792
0x30,0x01,
793793
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x70,0x38,0x1C,0x0E,0x06,0x00,0x00,0x00,0x00,
794794
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1977,10 +1977,22 @@ static uint8_t unicode_wide[] = {
19771977
0x00,0xFE,0x06,0x06,0x06,0x06,0x7E,0x7E,0x40,0x41,0xC1,0xC0,0xFE,0x06,0x06,0x06,0x04,0x04,0x0C,0x0C,0xFC,0x78,0x00,0x00,
19781978
0x20,0x20,0x20,0x20,0x20,0x21,0x27,0x26,0x20,0xFF,0xFF,0x23,0x23,0x21,0x21,0x21,0x20,0x20,0x26,0x3E,0x78,0x40,0x00,0x00,
19791979
0x00,0x30,0x60,0x60,0xC0,0x80,0x00,0x00,0x00,0xF8,0xF8,0x00,0x00,0x00,0x80,0x80,0xC0,0xC0,0x60,0x30,0x18,0x00,0x00,0x00,
1980+
0x5F,0x31,
1981+
0x7F,0x00,0x00,0x00,0x00,0x3F,0x20,0x60,0x60,0x7F,0x7F,0x46,0x1C,0x30,0x63,0x06,0x1C,0x38,0xE1,0x0F,0x0F,0x00,0x00,0x00,
1982+
0xCF,0xC0,0xC0,0xC0,0xC0,0xCF,0x0C,0x0C,0x08,0xDF,0xDF,0xD9,0xC3,0xC6,0xDC,0xC0,0xC3,0x86,0x9C,0x83,0x03,0x00,0x00,0x00,
1983+
0xF8,0x18,0x18,0x18,0x18,0xF8,0x00,0x00,0x00,0xF8,0xF8,0xD8,0x18,0x18,0x78,0xD8,0x98,0x18,0x30,0xF0,0xE0,0x00,0x00,0x00,
19801984
0x5F,0x35,
19811985
0xFF,0xFF,0x03,0x03,0x03,0x03,0x7F,0x60,0x60,0x40,0x40,0xFF,0xC3,0x03,0x03,0x03,0x03,0x03,0x06,0x3E,0x3C,0x00,0x00,0x00,
19821986
0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0x30,0x30,0xFF,0xFF,0x33,0x31,0x31,0x30,0x30,0x30,0x3F,0xFE,0x00,0x00,0x00,0x00,
19831987
0xF8,0x00,0x00,0xF0,0xF0,0x00,0x00,0xF0,0x00,0x00,0xFC,0xFC,0x08,0x9C,0xB0,0xE0,0xC0,0x60,0xB8,0x1C,0x08,0x00,0x00,0x00,
1988+
0x5F,0x37,
1989+
0x00,0xFE,0xFE,0x06,0x06,0x06,0x7E,0x7E,0x40,0x40,0xC0,0xFE,0xFE,0xC6,0x06,0x06,0x06,0x06,0x06,0x06,0x7C,0x78,0x00,0x00,
1990+
0x0C,0x0C,0x18,0x18,0x30,0xFF,0xF3,0x03,0x03,0x7F,0x43,0x43,0x43,0x43,0x7F,0x03,0x03,0x03,0x03,0x1F,0xFF,0x00,0x00,0x00,
1991+
0x00,0x00,0x60,0x30,0x38,0xFC,0x0C,0x00,0x00,0xF8,0x18,0x18,0x18,0x18,0xF8,0x00,0x20,0x30,0x18,0xFC,0xFC,0x04,0x00,0x00,
1992+
0x5F,0x3A,
1993+
0xFF,0xFF,0x03,0x03,0x03,0x03,0x7F,0x40,0x40,0x40,0xC0,0xFF,0xC3,0x03,0x03,0x03,0x03,0x02,0x06,0x3E,0x3C,0x00,0x00,0x00,
1994+
0x3F,0x3F,0x20,0x20,0x20,0x3F,0x03,0x03,0x7F,0x7F,0x63,0x63,0x63,0x7F,0x7F,0x03,0x03,0x03,0x7F,0xFF,0x00,0x00,0x00,0x00,
1995+
0xF0,0xF0,0x30,0x30,0x30,0xF0,0x00,0x00,0xF8,0xF8,0x18,0x18,0x18,0xF8,0xF8,0x20,0x30,0x18,0xF8,0xFC,0x0C,0x00,0x00,0x00,
19841996
0x5F,0x53,
19851997
0x00,0xC0,0x60,0x60,0x30,0x30,0x10,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,
19861998
0xC0,0xC0,0xC1,0xC1,0xC3,0xC3,0xC6,0xC0,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,
@@ -2717,6 +2729,10 @@ static uint8_t unicode_wide[] = {
27172729
0x0C,0x18,0x19,0x30,0x30,0xFF,0xF0,0x00,0x7F,0x7F,0x60,0x60,0x7F,0x60,0x60,0x60,0x7F,0x60,0x60,0x60,0x67,0x63,0x00,0x00,
27182730
0x0C,0x0C,0x8C,0xCD,0x4F,0xEC,0x2C,0x0C,0xCC,0xC7,0xC0,0xCC,0xCC,0xCC,0xCD,0xCF,0xCC,0xCC,0xCC,0xCC,0xCF,0x83,0x00,0x00,
27192731
0x00,0x00,0x30,0xF0,0x80,0x00,0x08,0x0C,0x0C,0xF8,0x00,0x00,0x00,0x38,0xF0,0x80,0x00,0x04,0x0C,0x0C,0xFC,0xF8,0x00,0x00,
2732+
0x81,0x06,
2733+
0x00,0x7F,0x63,0x63,0x63,0x63,0x7F,0x7F,0x63,0x63,0x63,0x63,0x7F,0x7F,0x63,0x63,0x43,0x43,0xC3,0xC3,0xDE,0x8C,0x00,0x00,
2734+
0x0C,0x18,0x1F,0x10,0x30,0x60,0x7F,0xFF,0xA0,0xA7,0x27,0x26,0x26,0x66,0x66,0x66,0x66,0x66,0x46,0xC6,0xC7,0x00,0x00,0x00,
2735+
0x00,0x00,0xE0,0x60,0xC0,0xC0,0xFC,0xFC,0x00,0xF8,0xF8,0x18,0x18,0x18,0x18,0x70,0x00,0x0C,0x0C,0x0C,0xF8,0x00,0x00,0x00,
27202736
0x81,0x1A,
27212737
0x00,0x7E,0x66,0x66,0x66,0x66,0x7E,0x7E,0x66,0x67,0x67,0x66,0x7E,0x7E,0x66,0x46,0x46,0x46,0xC7,0xC6,0xDE,0x9C,0x00,0x00,
27222738
0x30,0x31,0x31,0xFD,0xFD,0x31,0x31,0x31,0x31,0xFF,0xFF,0x61,0x61,0x49,0x49,0xCD,0xC5,0xFF,0xFF,0x07,0x01,0x01,0x00,0x00,
@@ -3241,6 +3257,10 @@ static uint8_t unicode_wide[] = {
32413257
0x00,0x7F,0x7F,0x00,0x00,0x00,0x00,0x01,0x07,0x1E,0xF8,0x60,0x00,0x10,0x10,0x10,0x1F,0x10,0x10,0x10,0x1F,0x1F,0x00,0x00,
32423258
0x01,0xE1,0xE1,0x61,0x61,0xC1,0xC1,0x81,0x01,0x01,0x01,0x01,0x00,0xC3,0xC3,0xC3,0xC3,0xC7,0xCF,0xDC,0xF8,0xD0,0x00,0x00,
32433259
0x80,0x80,0x80,0x80,0x80,0xF0,0xF0,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0xC0,0x60,0x20,0x00,0x00,
3260+
0xAC,0x15,
3261+
0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x1E,0xF8,0x60,0x00,0x07,0x0E,0x1C,0x18,0x18,0x0C,0x07,0x01,0x00,0x00,
3262+
0x01,0x01,0xE1,0x61,0x61,0xE1,0xC1,0xC1,0x81,0x01,0x01,0x01,0x01,0x60,0xFE,0x07,0x01,0x01,0x01,0x03,0xFF,0xF8,0x00,0x00,
3263+
0x80,0x80,0x80,0x80,0x80,0x80,0xF0,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,
32443264
0xAC,0x1C,
32453265
0x00,0x00,0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x06,0x06,0x0C,0x1C,0x38,0x70,0xE0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
32463266
0x00,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x1F,0x1F,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,
@@ -3881,6 +3901,10 @@ static uint8_t unicode_wide[] = {
38813901
0x00,0x00,0x3E,0x7F,0x61,0xC0,0xC0,0xC0,0x80,0x80,0x80,0xC0,0xC0,0xC0,0x61,0x7F,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
38823902
0x03,0x03,0x03,0x83,0x83,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x83,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,
38833903
0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
3904+
0xC5,0x7D,
3905+
0x00,0x0C,0x3F,0x71,0xC0,0xC0,0xC0,0xC0,0xC0,0xE1,0x7F,0x0E,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
3906+
0x03,0x03,0x83,0xC3,0xC3,0x63,0x63,0x63,0xE3,0xC3,0x83,0x03,0x03,0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,
3907+
0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
38843908
0xC5,0xB4,
38853909
0x00,0x00,0x1E,0x7F,0x61,0xC0,0xC0,0xC0,0xC0,0x80,0xC0,0xC0,0xC0,0xC0,0x61,0x3F,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
38863910
0x01,0x01,0x01,0x81,0x81,0xC1,0xC1,0xC1,0xFF,0xFF,0xC1,0xC1,0xC1,0xC1,0x81,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,

‎projects/maixpy_bit/compile/overrides/components/micropython/port/src/omv/img/font.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ struct font
527527
};
528528

529529
static uint8_t unicode_wide[] = {
530-
0x03,0x9F,
530+
0x03,0xA5,
531531
0x30,0x01,
532532
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x0C,0x06,0x02,0x00,0x00,
533533
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1419,9 +1419,18 @@ static uint8_t unicode_wide[] = {
14191419
0x5F,0x20,
14201420
0x01,0xF9,0x09,0x09,0x09,0x79,0x41,0x47,0x41,0x79,0x09,0x09,0x09,0x09,0x51,0x21,
14211421
0x00,0x08,0x08,0x10,0x20,0x40,0x00,0xFE,0x40,0x20,0x20,0x10,0x08,0x44,0x82,0x00,
1422+
0x5F,0x31,
1423+
0x00,0x7E,0x02,0x02,0x7E,0x40,0x40,0x7E,0x22,0x12,0x06,0x1A,0x62,0x02,0x14,0x08,
1424+
0x00,0xFC,0x04,0x04,0xFC,0x80,0x80,0xFC,0x44,0x24,0x0C,0x34,0xC4,0x04,0x28,0x10,
14221425
0x5F,0x35,
14231426
0x00,0xF8,0x08,0x08,0x08,0x78,0x40,0x47,0x41,0x79,0x09,0x09,0x09,0x09,0x51,0x21,
14241427
0x00,0xFC,0x80,0xF8,0x80,0xF8,0x80,0xFE,0x40,0x24,0x28,0x10,0x08,0x44,0x82,0x00,
1428+
0x5F,0x37,
1429+
0x00,0xF8,0x08,0x09,0x0B,0x78,0x40,0x43,0x42,0x7A,0x0B,0x08,0x08,0x08,0x57,0x20,
1430+
0x20,0x40,0x88,0x04,0xFE,0x22,0x20,0xFE,0x22,0x22,0xFE,0x20,0x24,0x22,0xFE,0x02,
1431+
0x5F,0x3A,
1432+
0x00,0xF9,0x09,0x09,0x09,0x78,0x40,0x43,0x42,0x7A,0x0B,0x08,0x08,0x08,0x57,0x20,
1433+
0x00,0xFC,0x04,0x04,0xFC,0x20,0x20,0xFE,0x22,0x22,0xFE,0x20,0x24,0x22,0xFE,0x02,
14251434
0x5F,0x53,
14261435
0x01,0x21,0x11,0x09,0x09,0x01,0x7F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x7F,0x00,
14271436
0x00,0x08,0x08,0x10,0x20,0x00,0xF8,0x08,0x08,0x08,0xF8,0x08,0x08,0x08,0xF8,0x08,
@@ -1974,6 +1983,9 @@ static uint8_t unicode_wide[] = {
19741983
0x80,0xFD,
19751984
0x10,0x24,0x42,0xFF,0x01,0x00,0x7E,0x42,0x42,0x7E,0x42,0x42,0x7E,0x42,0x4A,0x44,
19761985
0x40,0x44,0x48,0x70,0x40,0x42,0x42,0x3E,0x00,0x44,0x48,0x70,0x40,0x42,0x42,0x3E,
1986+
0x81,0x06,
1987+
0x00,0x3C,0x24,0x25,0x26,0x3D,0x25,0x25,0x25,0x3D,0x25,0x25,0x25,0x45,0x55,0x8A,
1988+
0x40,0x40,0xFC,0x04,0x08,0xFE,0x00,0x7C,0x44,0x44,0x54,0x48,0x42,0x42,0x3E,0x00,
19771989
0x81,0x1A,
19781990
0x01,0x79,0x49,0x4B,0x49,0x79,0x49,0x4F,0x49,0x79,0x4A,0x4A,0x4F,0x4A,0x48,0x98,
19791991
0x00,0x00,0x1E,0x92,0x12,0x12,0x12,0xD2,0x12,0x12,0x1A,0x94,0xD0,0x50,0x10,0x10,
@@ -2367,6 +2379,9 @@ static uint8_t unicode_wide[] = {
23672379
0xAC,0x12,
23682380
0x00,0x00,0x3F,0x00,0x00,0x01,0x01,0x06,0x38,0x00,0x00,0x11,0x11,0x1F,0x11,0x0F,
23692381
0x00,0x00,0x84,0x84,0x84,0x07,0x04,0x04,0x04,0x04,0x00,0x10,0x10,0x10,0x28,0xC6,
2382+
0xAC,0x15,
2383+
0x00,0x00,0x3F,0x00,0x00,0x01,0x01,0x06,0x38,0x00,0x00,0x0F,0x10,0x10,0x10,0x0F,
2384+
0x00,0x00,0x84,0x84,0x84,0x07,0x04,0x04,0x04,0x04,0x00,0xF8,0x04,0x04,0x04,0xF8,
23702385
0xAC,0x1C,
23712386
0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00,0x01,0x01,0x02,0x0C,0x30,0x00,0x00,0x00,
23722387
0x00,0x00,0x12,0x92,0x92,0x92,0x92,0x9E,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
@@ -2847,6 +2862,9 @@ static uint8_t unicode_wide[] = {
28472862
0xC5,0x7C,
28482863
0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x00,
28492864
0x00,0x00,0x04,0x04,0x04,0x84,0x87,0x84,0x84,0x87,0x84,0x04,0x04,0x04,0x04,0x04,
2865+
0xC5,0x7D,
2866+
0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x1F,0x00,0x00,0x00,0x00,
2867+
0x00,0x00,0x04,0x04,0x87,0x84,0x84,0x07,0x04,0x04,0x00,0xFC,0x04,0x04,0x04,0x04,
28502868
0xC5,0xB4,
28512869
0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x00,
28522870
0x00,0x00,0x04,0x04,0x04,0x84,0x84,0xBC,0x84,0x84,0x84,0x04,0x04,0x04,0x04,0x04,

‎projects/maixpy_cube/compile/overrides/components/micropython/port/src/omv/img/font.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ struct font
534534

535535

536536
static uint8_t unicode_wide[] = {
537-
0x03,0x9F,
537+
0x03,0xA5,
538538
0x30,0x01,
539539
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x40,0x20,0x00,0x00,
540540
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1426,9 +1426,18 @@ static uint8_t unicode_wide[] = {
14261426
0x5F,0x20,
14271427
0x00,0x00,0x00,0xE4,0x24,0x24,0xE5,0x84,0x9F,0xE5,0x24,0x24,0x25,0xC6,
14281428
0x00,0x00,0x00,0x40,0x40,0x80,0x00,0x00,0xE0,0x00,0x80,0x80,0x40,0x20,
1429+
0x5F,0x31,
1430+
0x00,0x00,0x00,0xFB,0x08,0x08,0xFB,0x82,0xFB,0x28,0x49,0x9A,0x28,0x59,
1431+
0x00,0x00,0x00,0xE0,0x20,0x20,0xE0,0x00,0xE0,0xA0,0x20,0x60,0xA0,0x60,
14291432
0x5F,0x35,
14301433
0x00,0x00,0x00,0xE7,0x24,0x27,0xE4,0x87,0x84,0xEF,0x26,0x25,0x24,0xCE,
14311434
0x00,0x00,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xE0,0x00,0x40,0x80,0x60,
1435+
0x5F,0x37,
1436+
0x00,0x00,0x00,0xE2,0x24,0x2F,0xE1,0x8F,0x89,0xE9,0x2F,0x21,0x21,0xCF,
1437+
0x00,0x00,0x00,0x00,0x40,0xA0,0x00,0xE0,0x20,0x20,0xE0,0x00,0x40,0xA0,
1438+
0x5F,0x3A,
1439+
0x00,0x00,0x00,0xE7,0x24,0x27,0xE1,0x8F,0x89,0xE9,0x2F,0x21,0x21,0xCF,
1440+
0x00,0x00,0x00,0xC0,0x40,0xC0,0x00,0xE0,0x20,0x20,0xE0,0x00,0x40,0xA0,
14321441
0x5F,0x53,
14331442
0x00,0x00,0x00,0x08,0x88,0x49,0x08,0xFF,0x00,0x00,0xFF,0x00,0x00,0xFF,
14341443
0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
@@ -1981,6 +1990,9 @@ static uint8_t unicode_wide[] = {
19811990
0x80,0xFD,
19821991
0x00,0x00,0x00,0x42,0x93,0xEA,0x02,0xF9,0x88,0xFA,0x8B,0xFA,0x8A,0x99,
19831992
0x00,0x00,0x00,0x40,0x80,0x00,0x20,0xE0,0x00,0x40,0x80,0x00,0x20,0xE0,
1993+
0x81,0x06,
1994+
0x00,0x00,0x00,0xE4,0xA7,0xA8,0xEF,0xB8,0xAB,0xEA,0xAA,0xAA,0xAA,0xB1,
1995+
0x00,0x00,0x00,0x00,0x80,0x80,0xE0,0x00,0xC0,0x40,0xC0,0x00,0x20,0xE0,
19841996
0x81,0x1A,
19851997
0x00,0x00,0x00,0xE4,0xA4,0xBF,0xE4,0xA4,0xBF,0xE4,0xA8,0xAA,0xB2,0xBD,
19861998
0x00,0x00,0x00,0xE0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xE0,0x80,0x80,
@@ -2374,6 +2386,9 @@ static uint8_t unicode_wide[] = {
23742386
0xAC,0x12,
23752387
0x00,0x00,0x00,0xFC,0x04,0x04,0x08,0x10,0xE0,0x00,0x49,0x79,0x4A,0x7C,
23762388
0x00,0x00,0x00,0x40,0x40,0x60,0x40,0x40,0x40,0x00,0x00,0x00,0x80,0x40,
2389+
0xAC,0x15,
2390+
0x00,0x00,0x00,0xFC,0x04,0x04,0x08,0x10,0xE0,0x00,0x3F,0x40,0x40,0x3F,
2391+
0x00,0x00,0x00,0x40,0x40,0x60,0x40,0x40,0x40,0x00,0x80,0x40,0x40,0x80,
23772392
0xAC,0x1C,
23782393
0x00,0x00,0x00,0xFD,0x05,0x05,0x05,0x05,0x09,0x09,0x11,0x21,0xC1,0x01,
23792394
0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0xC0,0x40,0x40,0x40,0x40,0x40,
@@ -2854,6 +2869,9 @@ static uint8_t unicode_wide[] = {
28542869
0xC5,0x7C,
28552870
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x82,0x82,0x82,0x82,0x44,0x38,0x00,
28562871
0x00,0x00,0x00,0x40,0x40,0x40,0x60,0x40,0x40,0x40,0x60,0x40,0x40,0x40,
2872+
0xC5,0x7D,
2873+
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x44,0x38,0x00,0x7F,0x00,0x00,0x00,
2874+
0x00,0x00,0x00,0x40,0x60,0x40,0x60,0x40,0x40,0x00,0xC0,0x40,0x40,0x40,
28572875
0xC5,0xB4,
28582876
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x83,0x82,0x82,0x82,0x44,0x38,0x00,
28592877
0x00,0x00,0x00,0x40,0x40,0x40,0x40,0xC0,0x40,0x40,0x40,0x40,0x40,0x40,

‎projects/maixpy_dock/compile/overrides/components/micropython/port/src/omv/img/font.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ struct font
527527
};
528528

529529
static uint8_t unicode_wide[] = {
530-
0x03,0x9F,
530+
0x03,0xA5,
531531
0x30,0x01,
532532
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x0C,0x06,0x02,0x00,0x00,
533533
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1419,9 +1419,18 @@ static uint8_t unicode_wide[] = {
14191419
0x5F,0x20,
14201420
0x01,0xF9,0x09,0x09,0x09,0x79,0x41,0x47,0x41,0x79,0x09,0x09,0x09,0x09,0x51,0x21,
14211421
0x00,0x08,0x08,0x10,0x20,0x40,0x00,0xFE,0x40,0x20,0x20,0x10,0x08,0x44,0x82,0x00,
1422+
0x5F,0x31,
1423+
0x00,0x7E,0x02,0x02,0x7E,0x40,0x40,0x7E,0x22,0x12,0x06,0x1A,0x62,0x02,0x14,0x08,
1424+
0x00,0xFC,0x04,0x04,0xFC,0x80,0x80,0xFC,0x44,0x24,0x0C,0x34,0xC4,0x04,0x28,0x10,
14221425
0x5F,0x35,
14231426
0x00,0xF8,0x08,0x08,0x08,0x78,0x40,0x47,0x41,0x79,0x09,0x09,0x09,0x09,0x51,0x21,
14241427
0x00,0xFC,0x80,0xF8,0x80,0xF8,0x80,0xFE,0x40,0x24,0x28,0x10,0x08,0x44,0x82,0x00,
1428+
0x5F,0x37,
1429+
0x00,0xF8,0x08,0x09,0x0B,0x78,0x40,0x43,0x42,0x7A,0x0B,0x08,0x08,0x08,0x57,0x20,
1430+
0x20,0x40,0x88,0x04,0xFE,0x22,0x20,0xFE,0x22,0x22,0xFE,0x20,0x24,0x22,0xFE,0x02,
1431+
0x5F,0x3A,
1432+
0x00,0xF9,0x09,0x09,0x09,0x78,0x40,0x43,0x42,0x7A,0x0B,0x08,0x08,0x08,0x57,0x20,
1433+
0x00,0xFC,0x04,0x04,0xFC,0x20,0x20,0xFE,0x22,0x22,0xFE,0x20,0x24,0x22,0xFE,0x02,
14251434
0x5F,0x53,
14261435
0x01,0x21,0x11,0x09,0x09,0x01,0x7F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x7F,0x00,
14271436
0x00,0x08,0x08,0x10,0x20,0x00,0xF8,0x08,0x08,0x08,0xF8,0x08,0x08,0x08,0xF8,0x08,
@@ -1974,6 +1983,9 @@ static uint8_t unicode_wide[] = {
19741983
0x80,0xFD,
19751984
0x10,0x24,0x42,0xFF,0x01,0x00,0x7E,0x42,0x42,0x7E,0x42,0x42,0x7E,0x42,0x4A,0x44,
19761985
0x40,0x44,0x48,0x70,0x40,0x42,0x42,0x3E,0x00,0x44,0x48,0x70,0x40,0x42,0x42,0x3E,
1986+
0x81,0x06,
1987+
0x00,0x3C,0x24,0x25,0x26,0x3D,0x25,0x25,0x25,0x3D,0x25,0x25,0x25,0x45,0x55,0x8A,
1988+
0x40,0x40,0xFC,0x04,0x08,0xFE,0x00,0x7C,0x44,0x44,0x54,0x48,0x42,0x42,0x3E,0x00,
19771989
0x81,0x1A,
19781990
0x01,0x79,0x49,0x4B,0x49,0x79,0x49,0x4F,0x49,0x79,0x4A,0x4A,0x4F,0x4A,0x48,0x98,
19791991
0x00,0x00,0x1E,0x92,0x12,0x12,0x12,0xD2,0x12,0x12,0x1A,0x94,0xD0,0x50,0x10,0x10,
@@ -2367,6 +2379,9 @@ static uint8_t unicode_wide[] = {
23672379
0xAC,0x12,
23682380
0x00,0x00,0x3F,0x00,0x00,0x01,0x01,0x06,0x38,0x00,0x00,0x11,0x11,0x1F,0x11,0x0F,
23692381
0x00,0x00,0x84,0x84,0x84,0x07,0x04,0x04,0x04,0x04,0x00,0x10,0x10,0x10,0x28,0xC6,
2382+
0xAC,0x15,
2383+
0x00,0x00,0x3F,0x00,0x00,0x01,0x01,0x06,0x38,0x00,0x00,0x0F,0x10,0x10,0x10,0x0F,
2384+
0x00,0x00,0x84,0x84,0x84,0x07,0x04,0x04,0x04,0x04,0x00,0xF8,0x04,0x04,0x04,0xF8,
23702385
0xAC,0x1C,
23712386
0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00,0x01,0x01,0x02,0x0C,0x30,0x00,0x00,0x00,
23722387
0x00,0x00,0x12,0x92,0x92,0x92,0x92,0x9E,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12,
@@ -2847,6 +2862,9 @@ static uint8_t unicode_wide[] = {
28472862
0xC5,0x7C,
28482863
0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x00,
28492864
0x00,0x00,0x04,0x04,0x04,0x84,0x87,0x84,0x84,0x87,0x84,0x04,0x04,0x04,0x04,0x04,
2865+
0xC5,0x7D,
2866+
0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x1F,0x00,0x00,0x00,0x00,
2867+
0x00,0x00,0x04,0x04,0x87,0x84,0x84,0x07,0x04,0x04,0x00,0xFC,0x04,0x04,0x04,0x04,
28502868
0xC5,0xB4,
28512869
0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x20,0x20,0x20,0x11,0x0E,0x00,0x00,0x00,
28522870
0x00,0x00,0x04,0x04,0x04,0x84,0x84,0xBC,0x84,0x84,0x84,0x04,0x04,0x04,0x04,0x04,

‎projects/maixpy_m5stickv/compile/overrides/components/micropython/port/src/omv/img/font.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ struct font
534534

535535

536536
static uint8_t unicode_wide[] = {
537-
0x03,0x9F,
537+
0x03,0xA5,
538538
0x30,0x01,
539539
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x40,0x20,0x00,0x00,
540540
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -1426,9 +1426,18 @@ static uint8_t unicode_wide[] = {
14261426
0x5F,0x20,
14271427
0x00,0x00,0x00,0xE4,0x24,0x24,0xE5,0x84,0x9F,0xE5,0x24,0x24,0x25,0xC6,
14281428
0x00,0x00,0x00,0x40,0x40,0x80,0x00,0x00,0xE0,0x00,0x80,0x80,0x40,0x20,
1429+
0x5F,0x31,
1430+
0x00,0x00,0x00,0xFB,0x08,0x08,0xFB,0x82,0xFB,0x28,0x49,0x9A,0x28,0x59,
1431+
0x00,0x00,0x00,0xE0,0x20,0x20,0xE0,0x00,0xE0,0xA0,0x20,0x60,0xA0,0x60,
14291432
0x5F,0x35,
14301433
0x00,0x00,0x00,0xE7,0x24,0x27,0xE4,0x87,0x84,0xEF,0x26,0x25,0x24,0xCE,
14311434
0x00,0x00,0x00,0xC0,0x00,0xC0,0x00,0xC0,0x00,0xE0,0x00,0x40,0x80,0x60,
1435+
0x5F,0x37,
1436+
0x00,0x00,0x00,0xE2,0x24,0x2F,0xE1,0x8F,0x89,0xE9,0x2F,0x21,0x21,0xCF,
1437+
0x00,0x00,0x00,0x00,0x40,0xA0,0x00,0xE0,0x20,0x20,0xE0,0x00,0x40,0xA0,
1438+
0x5F,0x3A,
1439+
0x00,0x00,0x00,0xE7,0x24,0x27,0xE1,0x8F,0x89,0xE9,0x2F,0x21,0x21,0xCF,
1440+
0x00,0x00,0x00,0xC0,0x40,0xC0,0x00,0xE0,0x20,0x20,0xE0,0x00,0x40,0xA0,
14321441
0x5F,0x53,
14331442
0x00,0x00,0x00,0x08,0x88,0x49,0x08,0xFF,0x00,0x00,0xFF,0x00,0x00,0xFF,
14341443
0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
@@ -1981,6 +1990,9 @@ static uint8_t unicode_wide[] = {
19811990
0x80,0xFD,
19821991
0x00,0x00,0x00,0x42,0x93,0xEA,0x02,0xF9,0x88,0xFA,0x8B,0xFA,0x8A,0x99,
19831992
0x00,0x00,0x00,0x40,0x80,0x00,0x20,0xE0,0x00,0x40,0x80,0x00,0x20,0xE0,
1993+
0x81,0x06,
1994+
0x00,0x00,0x00,0xE4,0xA7,0xA8,0xEF,0xB8,0xAB,0xEA,0xAA,0xAA,0xAA,0xB1,
1995+
0x00,0x00,0x00,0x00,0x80,0x80,0xE0,0x00,0xC0,0x40,0xC0,0x00,0x20,0xE0,
19841996
0x81,0x1A,
19851997
0x00,0x00,0x00,0xE4,0xA4,0xBF,0xE4,0xA4,0xBF,0xE4,0xA8,0xAA,0xB2,0xBD,
19861998
0x00,0x00,0x00,0xE0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xA0,0xE0,0x80,0x80,
@@ -2374,6 +2386,9 @@ static uint8_t unicode_wide[] = {
23742386
0xAC,0x12,
23752387
0x00,0x00,0x00,0xFC,0x04,0x04,0x08,0x10,0xE0,0x00,0x49,0x79,0x4A,0x7C,
23762388
0x00,0x00,0x00,0x40,0x40,0x60,0x40,0x40,0x40,0x00,0x00,0x00,0x80,0x40,
2389+
0xAC,0x15,
2390+
0x00,0x00,0x00,0xFC,0x04,0x04,0x08,0x10,0xE0,0x00,0x3F,0x40,0x40,0x3F,
2391+
0x00,0x00,0x00,0x40,0x40,0x60,0x40,0x40,0x40,0x00,0x80,0x40,0x40,0x80,
23772392
0xAC,0x1C,
23782393
0x00,0x00,0x00,0xFD,0x05,0x05,0x05,0x05,0x09,0x09,0x11,0x21,0xC1,0x01,
23792394
0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0xC0,0x40,0x40,0x40,0x40,0x40,
@@ -2854,6 +2869,9 @@ static uint8_t unicode_wide[] = {
28542869
0xC5,0x7C,
28552870
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x82,0x82,0x82,0x82,0x44,0x38,0x00,
28562871
0x00,0x00,0x00,0x40,0x40,0x40,0x60,0x40,0x40,0x40,0x60,0x40,0x40,0x40,
2872+
0xC5,0x7D,
2873+
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x44,0x38,0x00,0x7F,0x00,0x00,0x00,
2874+
0x00,0x00,0x00,0x40,0x60,0x40,0x60,0x40,0x40,0x00,0xC0,0x40,0x40,0x40,
28572875
0xC5,0xB4,
28582876
0x00,0x00,0x00,0x38,0x44,0x82,0x82,0x83,0x82,0x82,0x82,0x44,0x38,0x00,
28592877
0x00,0x00,0x00,0x40,0x40,0x40,0x40,0xC0,0x40,0x40,0x40,0x40,0x40,0x40,

0 commit comments

Comments
 (0)