Skip to content

#8 font name fixes, bump version #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2024
Merged

#8 font name fixes, bump version #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
],
"dependencies": [],
"version": "1.0.0",
"version": "1.1.0",
"license": "Apache-2.0",
"frameworks": "arduino,mbed",
"platforms": "*"
Expand Down
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

name=tcUnicodeHelper
version=1.0.0
version=1.1.0
maintainer=https://www.thecoderscorner.com
author=davetcc
category=Other
Expand Down
24 changes: 12 additions & 12 deletions src/Fonts/OpenSansCyrillicLatin12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
// Approximate size: 11473 bytes
// Source file: OpenSans-Regular.ttf
// Point size: 12pt
// Variable name: OpenSansRegular12pt
// Variable name: OpenSansCyrillicLatin12

#include <UnicodeFontDefs.h>

// Bitmaps for Cyrillic
const uint8_t OpenSansRegular12ptBitmaps_8[] PROGMEM = {
const uint8_t OpenSansCyrillicLatin12Bitmaps_8[] PROGMEM = {
0x60,0x81,0x00,0xfe,0x08,0x20,0x83,0xf8,0x20,0x82,0x08,0x3f,0x49,0x20,0x00,0xfe,0x08,0x20,0x83,0xf8,
0x20,0x82,0x08,0x3f,0xff,0x02,0x00,0x40,0x08,0x01,0x00,0x3f,0x84,0x18,0x81,0x10,0x22,0x04,0x41,0x88,
0xe0,0x0c,0x21,0x00,0xfe,0x08,0x20,0x82,0x08,0x20,0x82,0x08,0x20,0x1f,0x98,0x58,0x18,0x0c,0x07,0xfb,
Expand Down Expand Up @@ -206,7 +206,7 @@ const uint8_t OpenSansRegular12ptBitmaps_8[] PROGMEM = {
};

// Glyphs for Cyrillic
const UnicodeFontGlyph OpenSansRegular12ptGlyphs_8[] PROGMEM = {
const UnicodeFontGlyph OpenSansCyrillicLatin12Glyphs_8[] PROGMEM = {
{ 0, 0, 6, 16, 9, 2, -16} /* [Ѐ] 1024*/ ,
{ 1, 12, 6, 16, 9, 2, -16} /* [Ё] 1025*/ ,
{ 2, 24, 11, 12, 12, 0, -12} /* [Ђ] 1026*/ ,
Expand Down Expand Up @@ -461,7 +461,7 @@ const UnicodeFontGlyph OpenSansRegular12ptGlyphs_8[] PROGMEM = {
};

// Bitmaps for Latin Extended-A
const uint8_t OpenSansRegular12ptBitmaps_2[] PROGMEM = {
const uint8_t OpenSansCyrillicLatin12Bitmaps_2[] PROGMEM = {
0x1f,0x00,0x00,0x10,0x07,0x00,0xa0,0x34,0x04,0xc0,0x88,0x21,0x87,0xf1,0x82,0x20,0x64,0x05,0x80,0xc0,
0x3e,0x01,0xf2,0x30,0x20,0x5f,0xe1,0x83,0x8d,0xe8,0x11,0x03,0xc0,0x00,0x02,0x00,0xe0,0x14,0x06,0x80,
0x98,0x11,0x04,0x30,0xfe,0x30,0x44,0x0c,0x80,0xb0,0x18,0x22,0x78,0x03,0xe4,0x60,0x40,0xbf,0xc3,0x07,
Expand Down Expand Up @@ -555,7 +555,7 @@ const uint8_t OpenSansRegular12ptBitmaps_2[] PROGMEM = {
};

// Glyphs for Latin Extended-A
const UnicodeFontGlyph OpenSansRegular12ptGlyphs_2[] PROGMEM = {
const UnicodeFontGlyph OpenSansCyrillicLatin12Glyphs_2[] PROGMEM = {
{ 0, 0, 11, 14, 11, 0, -14} /* [Ā] 256*/ ,
{ 1, 20, 7, 11, 9, 1, -11} /* [ā] 257*/ ,
{ 2, 30, 11, 15, 11, 0, -15} /* [Ă] 258*/ ,
Expand Down Expand Up @@ -686,7 +686,7 @@ const UnicodeFontGlyph OpenSansRegular12ptGlyphs_2[] PROGMEM = {
};

// Bitmaps for Basic Latin
const uint8_t OpenSansRegular12ptBitmaps_0[] PROGMEM = {
const uint8_t OpenSansCyrillicLatin12Bitmaps_0[] PROGMEM = {
0x00,0x00,0xf5,0x55,0x0f,0xdc,0xe5,0x20,0x08,0x81,0x10,0x24,0x3f,0xf1,0x10,0x22,0x04,0x47,0xfe,0x12,
0x04,0x40,0x88,0x11,0x00,0x10,0x7e,0xd2,0x90,0xd0,0x70,0x1e,0x13,0x13,0x96,0xfc,0x10,0x10,0x70,0x49,
0x08,0x89,0x88,0x90,0x8a,0xe8,0xa9,0x95,0x17,0x51,0x09,0x11,0x91,0x10,0x93,0x0e,0x3c,0x0c,0xc1,0x08,
Expand Down Expand Up @@ -739,7 +739,7 @@ const uint8_t OpenSansRegular12ptBitmaps_0[] PROGMEM = {
};

// Glyphs for Basic Latin
const UnicodeFontGlyph OpenSansRegular12ptGlyphs_0[] PROGMEM = {
const UnicodeFontGlyph OpenSansCyrillicLatin12Glyphs_0[] PROGMEM = {
{ 31, 0, 1, 1, 10, 0, -1} /* [] 31*/ ,
{ 32, 1, 1, 1, 4, 0, -1} /* [ ] 32*/ ,
{ 33, 2, 2, 12, 4, 1, -12} /* [!] 33*/ ,
Expand Down Expand Up @@ -838,10 +838,10 @@ const UnicodeFontGlyph OpenSansRegular12ptGlyphs_0[] PROGMEM = {
{ 126, 969, 8, 2, 10, 1, -7} /* [~] 126*/
};

const UnicodeFontBlock OpenSansRegular12ptBlocks[] PROGMEM = {
{1024, OpenSansRegular12ptBitmaps_8, OpenSansRegular12ptGlyphs_8, 255} /* Cyrillic */,
{256, OpenSansRegular12ptBitmaps_2, OpenSansRegular12ptGlyphs_2, 127} /* Latin Extended-A */,
{0, OpenSansRegular12ptBitmaps_0, OpenSansRegular12ptGlyphs_0, 127} /* Basic Latin */
const UnicodeFontBlock OpenSansCyrillicLatin12Blocks[] PROGMEM = {
{1024, OpenSansCyrillicLatin12Bitmaps_8, OpenSansCyrillicLatin12Glyphs_8, 255} /* Cyrillic */,
{256, OpenSansCyrillicLatin12Bitmaps_2, OpenSansCyrillicLatin12Glyphs_2, 127} /* Latin Extended-A */,
{0, OpenSansCyrillicLatin12Bitmaps_0, OpenSansCyrillicLatin12Glyphs_0, 127} /* Basic Latin */
};

const UnicodeFont OpenSansRegular12pt[] PROGMEM = { {OpenSansRegular12ptBlocks, 3, 19, TCFONT_ONE_BIT_PER_PIXEL} };
const UnicodeFont OpenSansCyrillicLatin12[] PROGMEM = { {OpenSansCyrillicLatin12Blocks, 3, 19, TCFONT_ONE_BIT_PER_PIXEL} };
12 changes: 6 additions & 6 deletions src/Fonts/RobotoMedium18.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// Approximate size: 2937 bytes
// Source file: Roboto-Medium.ttf
// Point size: 18pt
// Variable name: RobotoMedium18pt
// Variable name: RobotoMedium18

const uint8_t RobotoMedium18ptBitmaps[] PROGMEM = {
const uint8_t RobotoMedium18Bitmaps[] PROGMEM = {
0xff,0xe0,0xf0,0x78,0x5a,0x2d,0x26,0x53,0x31,0x88,0xc4,0x66,0x32,0x9a,0x4d,0x17,0x0b,0x83,0xc1,0xff,
0xc0,0x00,0xff,0xff,0xff,0xff,0xfe,0x07,0xfc,0xcf,0x3c,0xf3,0xcf,0x30,0x06,0x30,0x18,0xc0,0x63,0x01,
0x9c,0x06,0x61,0xff,0xf7,0xff,0xc3,0x18,0x0c,0x60,0x33,0x01,0xcc,0x3f,0xfe,0xff,0xf8,0x63,0x01,0x9c,
Expand Down Expand Up @@ -116,7 +116,7 @@ const uint8_t RobotoMedium18ptBitmaps[] PROGMEM = {
0xc3,0x8e,0x38,0x20,0x3c,0x1b,0xf0,0xf9,0xcf,0x87,0xec,0x1e,0x00
};

const GFXglyph RobotoMedium18ptGlyphs[] PROGMEM = {
const GFXglyph RobotoMedium18Glyphs[] PROGMEM = {
{ 0, 9, 18, 11, 1, -18 } /* [] 31 */,
{ 21, 1, 1, 6, 0, -1 } /* [ ] 32 */,
{ 22, 3, 18, 7, 2, -18 } /* [!] 33 */,
Expand Down Expand Up @@ -215,9 +215,9 @@ const GFXglyph RobotoMedium18ptGlyphs[] PROGMEM = {
{ 2144, 13, 5, 17, 2, -10 } /* [~] 126 */
};

const GFXfont RobotoMedium18pt PROGMEM = {
(uint8_t*)RobotoMedium18ptBitmaps,
(GFXglyph*)RobotoMedium18ptGlyphs,
const GFXfont RobotoMedium18 PROGMEM = {
(uint8_t*)RobotoMedium18Bitmaps,
(GFXglyph*)RobotoMedium18Glyphs,
31, 126,
26
};
10 changes: 5 additions & 5 deletions src/Fonts/RobotoMedium24.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <UnicodeFontDefs.h>

// Bitmaps for Basic Latin
const uint8_t RobotoMedium24ptBitmaps_0[] PROGMEM = {
const uint8_t RobotoMedium24Bitmaps_0[] PROGMEM = {
0xff,0xf8,0x0f,0x01,0xe0,0x5a,0x0b,0x41,0x64,0x4c,0x89,0x92,0x31,0x46,0x28,0xc2,0x18,0x43,0x14,0x62,
0x8c,0x91,0x91,0x32,0x26,0x82,0xd0,0x5c,0x0b,0x80,0xf0,0x1f,0xff,0x00,0xfb,0xde,0xf7,0xbd,0xce,0x73,
0x9c,0xe7,0x39,0xce,0x70,0x00,0x07,0x7f,0xee,0xcf,0x9f,0x3e,0x7c,0xf9,0xf3,0xe7,0x03,0x86,0x00,0xe3,
Expand Down Expand Up @@ -204,7 +204,7 @@ const uint8_t RobotoMedium24ptBitmaps_0[] PROGMEM = {
};

// Glyphs for Basic Latin
const UnicodeFontGlyph RobotoMedium24ptGlyphs_0[] PROGMEM = {
const UnicodeFontGlyph RobotoMedium24Glyphs_0[] PROGMEM = {
{ 31, 0, 11, 24, 15, 2, -24} /* [] 31*/ ,
{ 32, 33, 1, 1, 8, 0, -1} /* [ ] 32*/ ,
{ 33, 34, 5, 24, 9, 2, -24} /* [!] 33*/ ,
Expand Down Expand Up @@ -303,8 +303,8 @@ const UnicodeFontGlyph RobotoMedium24ptGlyphs_0[] PROGMEM = {
{ 126, 3820, 18, 7, 22, 2, -13} /* [~] 126*/
};

const UnicodeFontBlock RobotoMedium24ptBlocks[] PROGMEM = {
{0, RobotoMedium24ptBitmaps_0, RobotoMedium24ptGlyphs_0, 127} /* Basic Latin */
const UnicodeFontBlock RobotoMedium24Blocks[] PROGMEM = {
{0, RobotoMedium24Bitmaps_0, RobotoMedium24Glyphs_0, 127} /* Basic Latin */
};

const UnicodeFont RobotoMedium24pt[] PROGMEM = { {RobotoMedium24ptBlocks, 1, 33, TCFONT_ONE_BIT_PER_PIXEL} };
const UnicodeFont RobotoMedium24[] PROGMEM = { {RobotoMedium24Blocks, 1, 33, TCFONT_ONE_BIT_PER_PIXEL} };