Skip to content

Commit

Permalink
cog fix and language fine tuning
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Pollak committed Mar 29, 2024
1 parent c9632e2 commit 1654bb5
Show file tree
Hide file tree
Showing 12 changed files with 244 additions and 203 deletions.
7 changes: 7 additions & 0 deletions keyboards/handwired/polykybd/base/disp_array.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,16 @@ void kdisp_write_gfx_text(const GFXfont **fonts, uint8_t num_fonts, int8_t x, in
int8_t y_cursor = y;
while (*text != 0) {
switch(*text) {
case u'\x18':
x_cursor = x;
y_cursor = y;
break;
case u'\b':
x_cursor = x_cursor>1 ? x_cursor - 2 : 0;
break;
case u'\f':
y_cursor = y_cursor>1 ? y_cursor - 2 : 0;
break;
case u'\t':
x_cursor += ((x_cursor-x)/40+1)*40;
break;
Expand Down
101 changes: 0 additions & 101 deletions keyboards/handwired/polykybd/base/fonts/generated/NotoSansKR_Regular_Consonants_19pt.h
View file

This file was deleted.

67 changes: 0 additions & 67 deletions keyboards/handwired/polykybd/base/fonts/generated/NotoSansKR_Regular_Vowels_19pt.h
View file

This file was deleted.

105 changes: 105 additions & 0 deletions keyboards/handwired/polykybd/base/fonts/generated/NotoSerifKR_Regular_Consonants_21pt.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// fontconvert -f~/repos/noto-serif-kr/NotoSerifKR-Regular.otf -s21 -v _Consonants_ 0x1100 0x1112
// Visualize your font via https://tchapi.github.io/Adafruit-GFX-Font-Customiser

const uint8_t NotoSerifKR_Regular_Consonants_21pt16bBitmaps[] PROGMEM = {
0x00, 0x00, 0x0E, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFE, 0x10, 0x00, 0x0E,
0x00, 0x00, 0x0E, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x0C,
0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x18,
0x00, 0x00, 0x18, 0x00, 0x13, 0xFF, 0xDF, 0xFE, 0xFF, 0xF3, 0xFF, 0x08,
0x1C, 0x01, 0xC0, 0x07, 0x00, 0x70, 0x01, 0x80, 0x1C, 0x00, 0x60, 0x07,
0x00, 0x38, 0x01, 0x80, 0x0E, 0x00, 0x60, 0x03, 0x00, 0x30, 0x00, 0xC0,
0x0C, 0x00, 0x30, 0x02, 0x00, 0x08, 0xE0, 0x00, 0x00, 0x3F, 0x00, 0x00,
0x01, 0xC0, 0x00, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x07, 0x00,
0x00, 0x01, 0xC0, 0x00, 0x00, 0x70, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x07,
0x00, 0x03, 0xE1, 0xFF, 0xFF, 0xFC, 0x1F, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF,
0x3F, 0xFF, 0xFF, 0x87, 0x00, 0x00, 0x03, 0x80, 0x00, 0x01, 0xC0, 0x00,
0x00, 0xE0, 0x00, 0x00, 0x70, 0x00, 0x00, 0x38, 0x00, 0x00, 0x1C, 0x00,
0x0F, 0x0F, 0xFF, 0xFF, 0xC1, 0xFF, 0xF0, 0x00, 0x00, 0xCF, 0x3F, 0xFF,
0xF7, 0xFF, 0x9F, 0xC0, 0xC0, 0x06, 0x00, 0x60, 0x03, 0x00, 0x30, 0x01,
0x80, 0x18, 0x00, 0xC0, 0x0C, 0x00, 0x60, 0x06, 0x00, 0x30, 0x03, 0x00,
0x18, 0x1D, 0xFF, 0xCF, 0xFC, 0xFF, 0xE7, 0xF0, 0x00, 0x00, 0x00, 0x00,
0x18, 0xFF, 0xFF, 0xFC, 0x3F, 0xFE, 0x3C, 0x00, 0x00, 0x3C, 0x00, 0x00,
0x38, 0x00, 0x00, 0x38, 0xF8, 0x0F, 0xFC, 0x7F, 0xFF, 0xFC, 0x38, 0x00,
0x00, 0x38, 0x00, 0x00, 0x38, 0x00, 0x08, 0x3F, 0xFF, 0xFF, 0x1F, 0xFF,
0xFF, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xF1, 0xC0, 0x00,
0xE3, 0x80, 0x01, 0xC7, 0x00, 0x03, 0x8E, 0x00, 0x07, 0x0C, 0x00, 0x0C,
0x1C, 0x00, 0x18, 0x3F, 0xFF, 0xF8, 0x7F, 0xFF, 0xF0, 0xC0, 0x00, 0x01,
0x80, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x03, 0xFF, 0x80, 0x03, 0xDF,
0x00, 0x07, 0x1C, 0x00, 0x1C, 0x70, 0x00, 0x71, 0xFF, 0xFF, 0xC7, 0xFF,
0xFF, 0x18, 0x00, 0x1C, 0x60, 0x00, 0x71, 0x80, 0x01, 0x86, 0x00, 0x06,
0x1F, 0xFF, 0xFC, 0x7F, 0xFF, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03,
0xC0, 0x3C, 0xF0, 0x77, 0x87, 0x9C, 0x1D, 0xE0, 0xE3, 0x07, 0x38, 0x30,
0xC1, 0xCF, 0x7C, 0x3F, 0xF3, 0xFF, 0x0F, 0xFC, 0xE0, 0xC3, 0x07, 0x38,
0x30, 0xC1, 0xCE, 0x0C, 0x30, 0x71, 0x83, 0x0F, 0xFC, 0x7F, 0xE3, 0xFF,
0x1F, 0xF8, 0xC0, 0x04, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00,
0x7C, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0xF0,
0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x0F, 0x7C, 0x00,
0x00, 0xF0, 0xF8, 0x00, 0x0F, 0x00, 0xFC, 0x01, 0xE0, 0x01, 0xF8, 0x1C,
0x00, 0x03, 0xE3, 0x80, 0x00, 0x07, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x80,
0x1C, 0x00, 0x03, 0xC0, 0x7C, 0x00, 0x07, 0x80, 0xF0, 0x00, 0x1E, 0x03,
0xC0, 0x00, 0x70, 0x0E, 0x00, 0x03, 0x80, 0x70, 0x00, 0x1F, 0x03, 0xC0,
0x00, 0xFF, 0x1F, 0x80, 0x07, 0x9E, 0xF7, 0xE0, 0x38, 0x1F, 0x87, 0xC1,
0xC0, 0x38, 0x07, 0xDC, 0x01, 0xC0, 0x0F, 0xC0, 0x0C, 0x00, 0x0C, 0x00,
0x40, 0x00, 0x00, 0x07, 0xF0, 0x07, 0xFF, 0x83, 0xC0, 0xF1, 0xC0, 0x1E,
0xF0, 0x03, 0xB8, 0x00, 0x6E, 0x00, 0x1F, 0x80, 0x06, 0xF0, 0x03, 0x9C,
0x01, 0xE3, 0xC0, 0xF0, 0x7F, 0xF8, 0x07, 0xF8, 0x00, 0x00, 0x00, 0x00,
0x00, 0x7F, 0xFF, 0xFF, 0x01, 0xFF, 0xFF, 0xF8, 0x01, 0xC0, 0x03, 0xC0,
0x00, 0x00, 0x1E, 0x00, 0x00, 0x01, 0xF0, 0x00, 0x00, 0x0F, 0x80, 0x00,
0x00, 0xF8, 0x00, 0x00, 0x0F, 0xC0, 0x00, 0x00, 0xFF, 0xF0, 0x00, 0x0F,
0x83, 0xFF, 0x01, 0xF8, 0x00, 0xFF, 0x1F, 0x00, 0x00, 0x3F, 0xC0, 0x00,
0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xE0, 0x7F, 0xFF, 0xFF, 0x80, 0x81, 0xE0,
0x1C, 0x00, 0x0F, 0x00, 0xF0, 0x00, 0x78, 0x07, 0x80, 0x03, 0xC0, 0x3C,
0x00, 0x1F, 0x81, 0xE0, 0x01, 0xE7, 0x8F, 0xF0, 0x0F, 0x0F, 0x71, 0xF8,
0xF0, 0x0F, 0x81, 0xFE, 0x00, 0x38, 0x01, 0xC0, 0x03, 0x80, 0x00, 0x00,
0x38, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x07, 0xFF, 0x00, 0x00, 0x1F,
0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x1E, 0x3F, 0xFF,
0xC0, 0x7F, 0xFF, 0xFC, 0x01, 0xC0, 0x07, 0xC0, 0x00, 0x00, 0xF8, 0x00,
0x00, 0x1F, 0x80, 0x00, 0x03, 0xE0, 0x00, 0x00, 0xFF, 0xFF, 0x80, 0x3F,
0x03, 0xFF, 0x1F, 0xC0, 0x00, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x1F, 0xFF, 0xFF, 0xC7, 0xFF, 0xFF, 0xC0, 0x00, 0x00, 0xE0, 0x00,
0x00, 0x70, 0x00, 0x00, 0x38, 0x00, 0x07, 0xF9, 0xFF, 0xFF, 0xFC, 0x3F,
0xF0, 0x0E, 0x00, 0x00, 0x07, 0x00, 0x00, 0x03, 0x00, 0x00, 0x01, 0x80,
0x00, 0x00, 0xC0, 0x00, 0x00, 0xC0, 0xF8, 0x07, 0xFF, 0x7F, 0xFF, 0xFF,
0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0xFE,
0x1F, 0xFF, 0xFE, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x1C, 0x00, 0x00,
0x1F, 0xFF, 0xFF, 0x0F, 0xFF, 0xFF, 0x00, 0x00, 0x07, 0xBF, 0xFF, 0xFF,
0xF7, 0xFF, 0xFE, 0x1C, 0x00, 0x07, 0x80, 0x07, 0x00, 0xF0, 0x00, 0xF0,
0x1C, 0x00, 0x1C, 0x07, 0x00, 0x07, 0x01, 0xC0, 0x01, 0xC0, 0x70, 0x00,
0x70, 0x19, 0x0F, 0x1F, 0xFF, 0xF8, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00,
0x00, 0x7F, 0xF0, 0x00, 0x07, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00,
0x7F, 0x80, 0x00, 0x7F, 0xF8, 0x00, 0x38, 0x07, 0x00, 0x1C, 0x01, 0xC0,
0x03, 0x80, 0x70, 0x00, 0xF0, 0x3C, 0x00, 0x1F, 0xFC, 0x00, 0x00, 0x78,
0x00 };

const GFXglyph NotoSerifKR_Regular_Consonants_21pt16bGlyphs[] PROGMEM = {
// bmpOff, w, h,xAdv, xOff, yOff range 0 (0x1100 - 0x1112)
{ 0, 24, 13, 40, 8, -32 }, // 0x1100 (#0)
{ 39, 26, 12, 40, 6, -32 }, // 0x1101 (#1)
{ 78, 26, 12, 40, 7, -32 }, // 0x1102 (#2)
{ 117, 25, 11, 40, 7, -31 }, // 0x1103 (#3)
{ 152, 25, 12, 40, 7, -32 }, // 0x1104 (#4)
{ 190, 24, 13, 40, 8, -33 }, // 0x1105 (#5)
{ 229, 23, 13, 40, 8, -32 }, // 0x1106 (#6)
{ 267, 22, 15, 40, 8, -34 }, // 0x1107 (#7)
{ 309, 26, 14, 40, 6, -33 }, // 0x1108 (#8)
{ 355, 29, 14, 40, 6, -33 }, // 0x1109 (#9)
{ 406, 30, 14, 40, 5, -33 }, // 0x110A (#10)
{ 459, 18, 13, 40, 11, -33 }, // 0x110B (#11)
{ 489, 30, 14, 40, 5, -33 }, // 0x110C (#12)
{ 542, 30, 13, 40, 5, -32 }, // 0x110D (#13)
{ 591, 29, 15, 40, 6, -34 }, // 0x110E (#14)
{ 646, 25, 14, 40, 7, -32 }, // 0x110F (#15)
{ 690, 24, 12, 40, 7, -32 }, // 0x1110 (#16)
{ 726, 26, 12, 40, 7, -32 }, // 0x1111 (#17)
{ 765, 26, 16, 40, 7, -35 } }; // 0x1112 (#18)

const GFXfont NotoSerifKR_Regular_Consonants_21pt16b PROGMEM = {
(uint8_t *)NotoSerifKR_Regular_Consonants_21pt16bBitmaps,
(GFXglyph *)NotoSerifKR_Regular_Consonants_21pt16bGlyphs,
0x1100, // first
0x1112, // last
59 //height
};

// Approx. 957 bytes
Loading

0 comments on commit 1654bb5

Please sign in to comment.