From 6d5e645c1f7bc1c1482a47cee9a316cf71c3151a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 21 Sep 2023 12:40:18 +0200 Subject: [PATCH] Regen font table and include ID in comment --- Firmware/Fonts/FontGen.py | 2 +- Firmware/Fonts/FontTable.h | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Firmware/Fonts/FontGen.py b/Firmware/Fonts/FontGen.py index a68f464a0..5cfc1e652 100644 --- a/Firmware/Fonts/FontGen.py +++ b/Firmware/Fonts/FontGen.py @@ -50,7 +50,7 @@ def generateLineInTable(index, chars): line = "{{" for r in rows: line += f"0x{r:02X}, " - line += f"}}, '{fontTable[index].alternate}'}}, // '{fontTable[index].utf}'" + line += f"}}, '{fontTable[index].alternate}'}}, // '{fontTable[index].utf}', \\x{fontTable[index].default:02X}" return line def generateFont(): diff --git a/Firmware/Fonts/FontTable.h b/Firmware/Fonts/FontTable.h index 5e59affa2..0dc1e6eae 100644 --- a/Firmware/Fonts/FontTable.h +++ b/Firmware/Fonts/FontTable.h @@ -1,18 +1,18 @@ -{{0x00, 0x1F, 0x15, 0x11, 0x15, 0x1F, 0x00, 0x00, }, 'H'}, // '๐Ÿ„ท' -{{0x0C, 0x12, 0x12, 0x0C, 0x00, 0x00, 0x00, 0x00, }, '\xdf'}, // 'ยฐ' -{{0x04, 0x0A, 0x0A, 0x0A, 0x0A, 0x11, 0x11, 0x0E, }, 'h'}, // '๐ŸŒก' -{{0x04, 0x0E, 0x1F, 0x04, 0x1C, 0x00, 0x00, 0x00, }, '^'}, // 'โฌ' -{{0x00, 0x06, 0x19, 0x18, 0x03, 0x13, 0x0C, 0x00, }, '\xf3'}, // '๐Ÿ”ƒ' -{{0x00, 0x1C, 0x1F, 0x11, 0x11, 0x1F, 0x00, 0x00, }, '\xdb'}, // '๐Ÿ—€' -{{0x00, 0x04, 0x12, 0x09, 0x12, 0x04, 0x00, 0x00, }, '>'}, // 'ยป' -{{0x00, 0x0E, 0x13, 0x15, 0x11, 0x0E, 0x00, 0x00, }, '\xe5'}, // '๐Ÿ•‘' -{{0x00, 0x00, 0x11, 0x0A, 0x04, 0x11, 0x0A, 0x04, }, '\x7e'}, // 'โฌ' -{{0x00, 0x01, 0x03, 0x16, 0x1C, 0x08, 0x00, 0x00, }, '\x7e'}, // 'โœ”' -{{0x11, 0x0E, 0x00, 0x0E, 0x01, 0x0F, 0x11, 0x0F, }, 'a'}, // 'ฤƒ' -{{0x04, 0x0A, 0x00, 0x0E, 0x01, 0x0F, 0x11, 0x0F, }, 'a'}, // 'รข' -{{0x04, 0x0A, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x0E, }, 'i'}, // 'รฎ' -{{0x00, 0x0E, 0x10, 0x0E, 0x01, 0x1E, 0x04, 0x08, }, 's'}, // 'ศ™' -{{0x08, 0x1C, 0x08, 0x08, 0x09, 0x06, 0x04, 0x08, }, 't'}, // 'ศ›' -{{0x04, 0x0A, 0x00, 0x0E, 0x04, 0x04, 0x04, 0x0E, }, 'I'}, // 'รŽ' -{{0x0E, 0x11, 0x0C, 0x06, 0x11, 0x0E, 0x04, 0x08, }, 'S'}, // 'ศ˜' -{{0x1F, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x08, }, 'T'}, // 'ศš' +{{0x00, 0x1F, 0x15, 0x11, 0x15, 0x1F, 0x00, 0x00, }, 'H'}, // '๐Ÿ„ท', \x80 +{{0x0C, 0x12, 0x12, 0x0C, 0x00, 0x00, 0x00, 0x00, }, '\xdf'}, // 'ยฐ', \x81 +{{0x04, 0x0A, 0x0A, 0x0A, 0x0A, 0x11, 0x11, 0x0E, }, 'h'}, // '๐ŸŒก', \x82 +{{0x04, 0x0E, 0x1F, 0x04, 0x1C, 0x00, 0x00, 0x00, }, '^'}, // 'โฌ', \x83 +{{0x00, 0x06, 0x19, 0x18, 0x03, 0x13, 0x0C, 0x00, }, '\xf3'}, // '๐Ÿ”ƒ', \x84 +{{0x00, 0x1C, 0x1F, 0x11, 0x11, 0x1F, 0x00, 0x00, }, '\xdb'}, // '๐Ÿ—€', \x85 +{{0x00, 0x04, 0x12, 0x09, 0x12, 0x04, 0x00, 0x00, }, '>'}, // 'ยป', \x86 +{{0x00, 0x0E, 0x13, 0x15, 0x11, 0x0E, 0x00, 0x00, }, '\xe5'}, // '๐Ÿ•‘', \x87 +{{0x00, 0x00, 0x11, 0x0A, 0x04, 0x11, 0x0A, 0x04, }, '\x7e'}, // 'โฌ', \x88 +{{0x00, 0x01, 0x03, 0x16, 0x1C, 0x08, 0x00, 0x00, }, '\x7e'}, // 'โœ”', \x89 +{{0x11, 0x0E, 0x00, 0x0E, 0x01, 0x0F, 0x11, 0x0F, }, 'a'}, // 'ฤƒ', \x8A +{{0x04, 0x0A, 0x00, 0x0E, 0x01, 0x0F, 0x11, 0x0F, }, 'a'}, // 'รข', \x8B +{{0x04, 0x0A, 0x00, 0x0C, 0x04, 0x04, 0x04, 0x0E, }, 'i'}, // 'รฎ', \x8C +{{0x00, 0x0E, 0x10, 0x0E, 0x01, 0x1E, 0x04, 0x08, }, 's'}, // 'ศ™', \x8D +{{0x08, 0x1C, 0x08, 0x08, 0x09, 0x06, 0x04, 0x08, }, 't'}, // 'ศ›', \x8E +{{0x04, 0x0A, 0x00, 0x0E, 0x04, 0x04, 0x04, 0x0E, }, 'I'}, // 'รŽ', \x8F +{{0x0E, 0x11, 0x0C, 0x06, 0x11, 0x0E, 0x04, 0x08, }, 'S'}, // 'ศ˜', \x90 +{{0x1F, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x08, }, 'T'}, // 'ศš', \x91