A fork of https://github.com/crosspoint-reader/crosspoint-reader
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Swap out babyblue font for pixelarial14

+202 -17
+184
lib/EpdFont/builtinFonts/pixelarial14.h
··· 1 + /** 2 + * generated by fontconvert.py 3 + * name: pixelarial14 4 + * size: 8 5 + * mode: 1-bit 6 + */ 7 + #pragma once 8 + #include "EpdFontData.h" 9 + 10 + static const uint8_t pixelarial14Bitmaps[1145] = { 11 + 0xFF, 0xFF, 0xFF, 0xC0, 0xFF, 0xFF, 0xFF, 0x1C, 0x63, 0x8C, 0xF7, 0x98, 0xCF, 0xFF, 0xFF, 0xDC, 0xE7, 0xFE, 0xFF, 12 + 0xFF, 0xFB, 0x9C, 0x63, 0x0C, 0x60, 0x30, 0xF3, 0xFF, 0xBF, 0x1F, 0x9F, 0x9B, 0x37, 0xEF, 0xFB, 0xE3, 0x00, 0x70, 13 + 0x67, 0xCF, 0x37, 0x61, 0xBB, 0x0D, 0xF0, 0x7D, 0x81, 0xDD, 0xC0, 0xDF, 0x07, 0x98, 0xFC, 0xC7, 0x66, 0x7B, 0xF3, 14 + 0x07, 0x00, 0x3E, 0x0F, 0xE1, 0x8C, 0x31, 0x86, 0x60, 0xFC, 0x1F, 0x07, 0xE4, 0xC7, 0x98, 0xF3, 0x0E, 0x7F, 0xF7, 15 + 0xE6, 0xFF, 0xF0, 0x37, 0x66, 0xCC, 0xCC, 0xCC, 0xCC, 0xC6, 0x67, 0x30, 0xCE, 0x66, 0x33, 0x33, 0x33, 0x33, 0x36, 16 + 0x6E, 0xC0, 0x6F, 0xF6, 0xFF, 0x08, 0x0E, 0x07, 0x03, 0x8F, 0xFF, 0xFC, 0x70, 0x38, 0x1C, 0x0E, 0x00, 0xFF, 0xC0, 17 + 0xFB, 0xFF, 0x80, 0xF0, 0x1C, 0x73, 0xCC, 0x30, 0xC7, 0x18, 0x61, 0x8E, 0x30, 0xC0, 0x7E, 0xFF, 0xC3, 0xC3, 0xC3, 18 + 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0x7E, 0x37, 0xFF, 0x33, 0x33, 0x33, 0x33, 0x30, 0x7E, 0xFF, 0xC3, 0xC3, 19 + 0x03, 0x03, 0x07, 0x0E, 0x1C, 0x38, 0x70, 0xFF, 0xFF, 0x7E, 0xFF, 0xC3, 0xC3, 0x03, 0x3F, 0x3F, 0x03, 0x03, 0xC3, 20 + 0xC3, 0xFF, 0x7E, 0x03, 0x03, 0x83, 0xC3, 0xE3, 0x31, 0x99, 0xCD, 0xC6, 0xC3, 0x7F, 0xFF, 0xE0, 0x60, 0x30, 0x7F, 21 + 0x7F, 0xE0, 0xC0, 0xFE, 0xFF, 0xC3, 0x03, 0x03, 0xC3, 0xC7, 0xFE, 0x7E, 0x7E, 0xFF, 0xC3, 0xC0, 0xC0, 0xFE, 0xFF, 22 + 0xE3, 0xC3, 0xC3, 0xC3, 0xFF, 0x7E, 0xFF, 0xFF, 0x07, 0x06, 0x06, 0x1E, 0x1C, 0x1C, 0x1C, 0x38, 0x30, 0x30, 0x30, 23 + 0x7E, 0xFF, 0xC3, 0xC3, 0xC3, 0xFF, 0xFF, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0x7E, 0x7E, 0xFF, 0xC3, 0xC3, 0xC3, 0xC7, 24 + 0xFF, 0x7F, 0x03, 0x03, 0xC7, 0xFE, 0x7C, 0xF0, 0x00, 0x3C, 0xF0, 0x00, 0x3F, 0xF0, 0x03, 0x03, 0x1E, 0x7E, 0xF0, 25 + 0xF0, 0x70, 0x7E, 0x1F, 0x03, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xC0, 0xC0, 0x70, 0x7E, 0x1F, 0x0F, 0x1E, 0x7E, 26 + 0xF0, 0xC0, 0x7E, 0xFF, 0xC3, 0xC3, 0x03, 0x07, 0x1E, 0x1C, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3F, 0x87, 0xFE, 0xFF, 27 + 0x7D, 0xFB, 0xF1, 0xBF, 0x1B, 0xF3, 0xBF, 0xFF, 0xDF, 0xE6, 0x00, 0x7F, 0x03, 0xF0, 0x06, 0x01, 0xF0, 0x1F, 0x01, 28 + 0xF0, 0x1F, 0x03, 0xB8, 0x31, 0x87, 0xFC, 0x7F, 0xE7, 0xFE, 0xE0, 0x7C, 0x03, 0xC0, 0x30, 0xFF, 0x7F, 0xF0, 0x78, 29 + 0x3C, 0x1F, 0xFF, 0xFF, 0x83, 0xC1, 0xE0, 0xF0, 0x7F, 0xFF, 0xF0, 0x3F, 0x0F, 0xF3, 0x87, 0xE0, 0x3C, 0x01, 0x80, 30 + 0x30, 0x06, 0x00, 0xC0, 0x18, 0x0F, 0x87, 0xBF, 0xC3, 0xF0, 0xFF, 0x1F, 0xF3, 0x07, 0xE0, 0x3C, 0x07, 0x80, 0xF0, 31 + 0x1E, 0x03, 0xC0, 0x78, 0x0F, 0x07, 0xFF, 0xCF, 0xF0, 0xFF, 0xFF, 0xF0, 0x18, 0x0C, 0x07, 0xFF, 0xFF, 0x80, 0xC0, 32 + 0x60, 0x30, 0x1F, 0xFF, 0xF8, 0xFF, 0xFF, 0xF0, 0x18, 0x0C, 0x07, 0xFB, 0xFD, 0x80, 0xC0, 0x60, 0x30, 0x18, 0x0C, 33 + 0x00, 0x3F, 0x87, 0xFE, 0xE0, 0x7C, 0x03, 0xC0, 0x0C, 0x00, 0xC1, 0xFC, 0x1F, 0xC0, 0x3C, 0x03, 0xE0, 0x77, 0xFE, 34 + 0x3F, 0x80, 0xC1, 0xE0, 0xF0, 0x78, 0x3C, 0x1F, 0xFF, 0xFF, 0x83, 0xC1, 0xE0, 0xF0, 0x78, 0x3C, 0x18, 0xFF, 0xFF, 35 + 0xFF, 0xC0, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC1, 0x83, 0x07, 0x8F, 0x1F, 0xF7, 0xC0, 0xC0, 0x78, 0x3F, 0x0E, 0x61, 36 + 0x8C, 0x61, 0xBC, 0x3F, 0x87, 0xB8, 0xE3, 0x1C, 0x63, 0x0E, 0x60, 0xFC, 0x06, 0xC0, 0x60, 0x30, 0x18, 0x0C, 0x06, 37 + 0x03, 0x01, 0x80, 0xC0, 0x60, 0x30, 0x1F, 0xFF, 0xF8, 0xC0, 0x3E, 0x07, 0xE0, 0x7E, 0x07, 0xF1, 0xBF, 0x1B, 0xFB, 38 + 0xBD, 0xF3, 0xDF, 0x3D, 0xF3, 0xDF, 0x3C, 0x63, 0xC6, 0x30, 0xC1, 0xF0, 0xFC, 0x7E, 0x3F, 0x1F, 0xEF, 0x77, 0xBB, 39 + 0xC7, 0xE3, 0xF1, 0xF8, 0x7C, 0x18, 0x3F, 0x87, 0xFE, 0xE0, 0x7C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 40 + 0x3C, 0x03, 0xE0, 0x77, 0xFE, 0x3F, 0x80, 0xFF, 0x7F, 0xF0, 0x78, 0x3C, 0x1E, 0x0F, 0xFF, 0xFE, 0xC0, 0x60, 0x30, 41 + 0x18, 0x0C, 0x00, 0x3F, 0x87, 0xFE, 0xE0, 0x7C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x3C, 0x03, 0xC0, 0x3C, 0x37, 0xE3, 42 + 0xE7, 0xFF, 0x3F, 0x70, 0xFF, 0x9F, 0xFF, 0x01, 0xE0, 0x3C, 0x07, 0x80, 0xFF, 0xFF, 0xFC, 0xC6, 0x18, 0xE3, 0x0E, 43 + 0x60, 0xFC, 0x06, 0x7F, 0x7F, 0xF0, 0x78, 0x3C, 0x07, 0xE1, 0xFE, 0x0F, 0x01, 0xE0, 0xF0, 0x7F, 0xF7, 0xF0, 0xFF, 44 + 0xFF, 0xC7, 0x03, 0x81, 0xC0, 0xE0, 0x70, 0x38, 0x1C, 0x0E, 0x07, 0x03, 0x81, 0xC0, 0xC1, 0xE0, 0xF0, 0x78, 0x3C, 45 + 0x1E, 0x0F, 0x07, 0x83, 0xC1, 0xE0, 0xF8, 0xEF, 0xE3, 0xE0, 0xC0, 0x3C, 0x03, 0xE0, 0x76, 0x06, 0x60, 0x67, 0x1E, 46 + 0x31, 0x83, 0xB8, 0x1F, 0x01, 0xF0, 0x1F, 0x00, 0x60, 0x06, 0x00, 0xC1, 0x81, 0xE1, 0xF0, 0xF8, 0xD8, 0xEC, 0x6C, 47 + 0x66, 0x36, 0x33, 0x1B, 0x19, 0xDD, 0xFC, 0x6C, 0x7C, 0x36, 0x3E, 0x1B, 0x1F, 0x0F, 0x8F, 0x03, 0x83, 0x01, 0xC1, 48 + 0x80, 0xC0, 0x7C, 0x3D, 0x86, 0x30, 0xC3, 0x30, 0x7E, 0x07, 0x80, 0xF8, 0x33, 0x0E, 0x71, 0x86, 0x70, 0xFC, 0x06, 49 + 0xC0, 0x3E, 0x07, 0x71, 0xE3, 0x18, 0x31, 0x83, 0xF8, 0x1F, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0x06, 50 + 0x00, 0xFF, 0xFF, 0xFC, 0x0E, 0x01, 0x80, 0x30, 0x0E, 0x07, 0x80, 0xE0, 0x30, 0x06, 0x01, 0xC0, 0x7F, 0xFF, 0xFE, 51 + 0xFF, 0x6D, 0xB6, 0xDB, 0x6D, 0xB7, 0xE0, 0xC3, 0x0E, 0x18, 0x61, 0x87, 0x0C, 0x30, 0xC3, 0x87, 0x1C, 0xFD, 0xB6, 52 + 0xDB, 0x6D, 0xB6, 0xDF, 0xE0, 0x30, 0xF1, 0xF3, 0xE7, 0xDD, 0xF1, 0x80, 0xFF, 0xFF, 0xFC, 0xCE, 0x73, 0x00, 0x7E, 53 + 0x7E, 0xC3, 0xC3, 0x3F, 0x7F, 0x63, 0xE3, 0xC7, 0xFF, 0x7F, 0xC0, 0xC0, 0xFE, 0xFE, 0xE3, 0xE3, 0xC3, 0xC3, 0xC3, 54 + 0xC3, 0xE3, 0xFF, 0xFE, 0x78, 0xFB, 0x1E, 0x3C, 0x18, 0x30, 0x60, 0xC7, 0xFD, 0xF0, 0x03, 0x03, 0x7B, 0x7F, 0xC7, 55 + 0xC7, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0xFF, 0x7F, 0x7E, 0x7E, 0xC3, 0xC3, 0xFF, 0xFF, 0xC0, 0xC0, 0xC3, 0xFF, 0x7E, 56 + 0x3D, 0xEF, 0xBF, 0x61, 0x86, 0x18, 0x61, 0x86, 0x18, 0x60, 0x7B, 0x7F, 0xC7, 0xC7, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 57 + 0xFF, 0x7F, 0x03, 0xC3, 0xFF, 0x7E, 0xC0, 0xC0, 0xFE, 0xFE, 0xE3, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 58 + 0xFF, 0xFF, 0xFF, 0xC0, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0xE0, 0xC0, 0xC0, 0xC3, 0xC3, 0xC6, 0xDE, 59 + 0xFC, 0xF8, 0xFC, 0xEE, 0xC6, 0xC7, 0xC3, 0xFF, 0xFF, 0xFF, 0xC0, 0xF9, 0xEF, 0xDE, 0xE7, 0x3E, 0x73, 0xC6, 0x3C, 60 + 0x63, 0xC6, 0x3C, 0x63, 0xC6, 0x3C, 0x63, 0xC6, 0x30, 0xFE, 0xFE, 0xE3, 0xE3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 61 + 0xC3, 0x7E, 0x7E, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xFF, 0x7E, 0xFE, 0xFE, 0xE3, 0xE3, 0xC3, 0xC3, 0xC3, 62 + 0xC3, 0xE3, 0xFF, 0xFE, 0xC0, 0xC0, 0xC0, 0xC0, 0x7B, 0x7F, 0xC7, 0xC7, 0xC3, 0xC3, 0xC3, 0xC3, 0xC7, 0xFF, 0x7F, 63 + 0x03, 0x03, 0x03, 0x03, 0xFB, 0xFE, 0x38, 0xC3, 0x0C, 0x30, 0xC3, 0x0C, 0x00, 0x78, 0xFB, 0x1E, 0x3F, 0x8F, 0x81, 64 + 0x83, 0xC7, 0xFD, 0xF0, 0x61, 0x8F, 0xBF, 0x61, 0x86, 0x18, 0x61, 0x86, 0x1E, 0x7C, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 65 + 0xC3, 0xC3, 0xC3, 0xC7, 0xFF, 0x7F, 0xC1, 0xE0, 0xF0, 0x7C, 0x76, 0x33, 0xB8, 0xD8, 0x6C, 0x3E, 0x0E, 0x07, 0x00, 66 + 0xC6, 0x3C, 0x63, 0xC6, 0x3F, 0xF7, 0x7F, 0x67, 0xF6, 0x7F, 0x67, 0xF6, 0x7B, 0xE3, 0x18, 0x31, 0x80, 0xC3, 0xC3, 67 + 0x66, 0x66, 0x7E, 0x3C, 0x3C, 0x7E, 0x66, 0xE7, 0xC3, 0xC1, 0xE0, 0xF0, 0x7C, 0x76, 0x33, 0xB8, 0xD8, 0x6C, 0x36, 68 + 0x1F, 0x07, 0x03, 0x81, 0xC3, 0xE1, 0xC0, 0xFF, 0xFF, 0x06, 0x1E, 0x1C, 0x1C, 0x30, 0x30, 0x70, 0xFF, 0xFF, 0x37, 69 + 0x66, 0x66, 0x6E, 0xCE, 0x66, 0x66, 0x67, 0x30, 0xFF, 0xFF, 0xFF, 0xC0, 0xCE, 0x66, 0x66, 0x67, 0x37, 0x66, 0x66, 70 + 0x6E, 0xC0, 0xC3, 0x9B, 0xFF, 0xF9, 0xB8, 0x30, 0xDB, 0x66, 0xC0, 0x6D, 0xBD, 0x80, 0x7F, 0xEF, 0x3C, 0xF3, 0xC0, 71 + 0x7D, 0xF7, 0xDF, 0xF3, 0xC0, 72 + }; 73 + 74 + static const EpdGlyph pixelarial14Glyphs[] = { 75 + {0, 0, 4, 0, 0, 0, 0}, // 76 + {2, 13, 3, 0, 13, 4, 0}, // ! 77 + {4, 6, 5, 0, 13, 3, 4}, // " 78 + {11, 13, 12, 0, 13, 18, 7}, // # 79 + {7, 13, 8, 0, 13, 12, 25}, // $ 80 + {13, 13, 14, 0, 13, 22, 37}, // % 81 + {11, 13, 12, 0, 13, 18, 59}, // & 82 + {2, 6, 3, 0, 13, 2, 77}, // ' 83 + {4, 17, 5, 0, 13, 9, 79}, // ( 84 + {4, 17, 5, 0, 13, 9, 88}, // ) 85 + {4, 6, 5, 0, 13, 3, 97}, // * 86 + {9, 10, 10, 0, 11, 12, 100}, // + 87 + {2, 5, 3, 0, 2, 2, 112}, // , 88 + {6, 3, 6, 0, 6, 3, 114}, // - 89 + {2, 2, 3, 0, 2, 1, 117}, // . 90 + {6, 13, 6, 0, 13, 10, 118}, // / 91 + {8, 13, 9, 0, 13, 13, 128}, // 0 92 + {4, 13, 5, 0, 13, 7, 141}, // 1 93 + {8, 13, 9, 0, 13, 13, 148}, // 2 94 + {8, 13, 9, 0, 13, 13, 161}, // 3 95 + {9, 13, 10, 0, 13, 15, 174}, // 4 96 + {8, 13, 9, 0, 13, 13, 189}, // 5 97 + {8, 13, 9, 0, 13, 13, 202}, // 6 98 + {8, 13, 9, 0, 13, 13, 215}, // 7 99 + {8, 13, 9, 0, 13, 13, 228}, // 8 100 + {8, 13, 9, 0, 13, 13, 241}, // 9 101 + {2, 11, 3, 0, 11, 3, 254}, // : 102 + {2, 14, 3, 0, 11, 4, 257}, // ; 103 + {8, 10, 9, 0, 11, 10, 261}, // < 104 + {8, 6, 9, 0, 9, 6, 271}, // = 105 + {8, 10, 9, 0, 11, 10, 277}, // > 106 + {8, 13, 9, 0, 13, 13, 287}, // ? 107 + {12, 12, 13, 0, 9, 18, 300}, // @ 108 + {12, 13, 13, 0, 13, 20, 318}, // A 109 + {9, 13, 10, 0, 13, 15, 338}, // B 110 + {11, 13, 12, 0, 13, 18, 353}, // C 111 + {11, 13, 12, 0, 13, 18, 371}, // D 112 + {9, 13, 10, 0, 13, 15, 389}, // E 113 + {9, 13, 10, 0, 13, 15, 404}, // F 114 + {12, 13, 13, 0, 13, 20, 419}, // G 115 + {9, 13, 10, 0, 13, 15, 439}, // H 116 + {2, 13, 3, 0, 13, 4, 454}, // I 117 + {7, 13, 8, 0, 13, 12, 458}, // J 118 + {11, 13, 12, 0, 13, 18, 470}, // K 119 + {9, 13, 10, 0, 13, 15, 488}, // L 120 + {12, 13, 13, 0, 13, 20, 503}, // M 121 + {9, 13, 10, 0, 13, 15, 523}, // N 122 + {12, 13, 13, 0, 13, 20, 538}, // O 123 + {9, 13, 10, 0, 13, 15, 558}, // P 124 + {12, 13, 13, 0, 13, 20, 573}, // Q 125 + {11, 13, 12, 0, 13, 18, 593}, // R 126 + {9, 13, 10, 0, 13, 15, 611}, // S 127 + {9, 13, 10, 0, 13, 15, 626}, // T 128 + {9, 13, 10, 0, 13, 15, 641}, // U 129 + {12, 13, 13, 0, 13, 20, 656}, // V 130 + {17, 13, 18, 0, 13, 28, 676}, // W 131 + {11, 13, 12, 0, 13, 18, 704}, // X 132 + {12, 13, 13, 0, 13, 20, 722}, // Y 133 + {11, 13, 12, 0, 13, 18, 742}, // Z 134 + {3, 17, 4, 0, 13, 7, 760}, // [ 135 + {6, 13, 6, 0, 13, 10, 767}, // <backslash> 136 + {3, 17, 4, 0, 13, 7, 777}, // ] 137 + {7, 7, 8, 0, 13, 7, 784}, // ^ 138 + {11, 2, 12, 0, 2, 3, 791}, // _ 139 + {4, 5, 5, 0, 13, 3, 794}, // ` 140 + {8, 11, 9, 0, 11, 11, 797}, // a 141 + {8, 13, 9, 0, 13, 13, 808}, // b 142 + {7, 11, 8, 0, 11, 10, 821}, // c 143 + {8, 13, 9, 0, 13, 13, 831}, // d 144 + {8, 11, 9, 0, 11, 11, 844}, // e 145 + {6, 13, 6, 0, 13, 10, 855}, // f 146 + {8, 15, 9, 0, 11, 15, 865}, // g 147 + {8, 13, 9, 0, 13, 13, 880}, // h 148 + {2, 13, 3, 0, 13, 4, 893}, // i 149 + {4, 17, 5, 0, 13, 9, 897}, // j 150 + {8, 13, 9, 0, 13, 13, 906}, // k 151 + {2, 13, 3, 0, 13, 4, 919}, // l 152 + {12, 11, 13, 0, 11, 17, 923}, // m 153 + {8, 11, 9, 0, 11, 11, 940}, // n 154 + {8, 11, 9, 0, 11, 11, 951}, // o 155 + {8, 15, 9, 0, 11, 15, 962}, // p 156 + {8, 15, 9, 0, 11, 15, 977}, // q 157 + {6, 11, 6, 0, 11, 9, 992}, // r 158 + {7, 11, 8, 0, 11, 10, 1001}, // s 159 + {6, 13, 6, 0, 13, 10, 1011}, // t 160 + {8, 11, 9, 0, 11, 11, 1021}, // u 161 + {9, 11, 10, 0, 11, 13, 1032}, // v 162 + {12, 11, 13, 0, 11, 17, 1045}, // w 163 + {8, 11, 9, 0, 11, 11, 1062}, // x 164 + {9, 15, 10, 0, 11, 17, 1073}, // y 165 + {8, 11, 9, 0, 11, 11, 1090}, // z 166 + {4, 17, 5, 0, 13, 9, 1101}, // { 167 + {2, 13, 3, 0, 13, 4, 1110}, // | 168 + {4, 17, 5, 0, 13, 9, 1114}, // } 169 + {11, 4, 12, 0, 9, 6, 1123}, // ~ 170 + {3, 6, 4, 0, 13, 3, 1129}, // ‘ 171 + {3, 6, 4, 0, 13, 3, 1132}, // ’ 172 + {6, 6, 6, 0, 13, 5, 1135}, // “ 173 + {6, 6, 6, 0, 13, 5, 1140}, // ” 174 + }; 175 + 176 + static const EpdUnicodeInterval pixelarial14Intervals[] = { 177 + {0x20, 0x7E, 0x0}, 178 + {0x2018, 0x2019, 0x5F}, 179 + {0x201C, 0x201D, 0x61}, 180 + }; 181 + 182 + static const EpdFontData pixelarial14 = { 183 + pixelarial14Bitmaps, pixelarial14Glyphs, pixelarial14Intervals, 3, 17, 13, -4, false, 184 + };
+2 -2
src/config.h
··· 23 23 /** 24 24 * Generated with: 25 25 * ruby -rdigest -e 'puts [ 26 - * "./lib/EpdFont/builtinFonts/babyblue.h", 26 + * "./lib/EpdFont/builtinFonts/pixelarial14.h", 27 27 * ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)' 28 28 */ 29 - #define SMALL_FONT_ID 141891058 29 + #define SMALL_FONT_ID 2037928017
+8 -8
src/main.cpp
··· 5 5 #include <InputManager.h> 6 6 #include <SD.h> 7 7 #include <SPI.h> 8 + #include <builtinFonts/bookerly_2b.h> 9 + #include <builtinFonts/bookerly_bold_2b.h> 10 + #include <builtinFonts/bookerly_bold_italic_2b.h> 11 + #include <builtinFonts/bookerly_italic_2b.h> 12 + #include <builtinFonts/pixelarial14.h> 13 + #include <builtinFonts/ubuntu_10.h> 14 + #include <builtinFonts/ubuntu_bold_10.h> 8 15 9 16 #include "Battery.h" 10 17 #include "CrossPointState.h" 11 - #include "builtinFonts/babyblue.h" 12 - #include "builtinFonts/bookerly_2b.h" 13 - #include "builtinFonts/bookerly_bold_2b.h" 14 - #include "builtinFonts/bookerly_bold_italic_2b.h" 15 - #include "builtinFonts/bookerly_italic_2b.h" 16 - #include "builtinFonts/ubuntu_10.h" 17 - #include "builtinFonts/ubuntu_bold_10.h" 18 18 #include "config.h" 19 19 #include "screens/BootLogoScreen.h" 20 20 #include "screens/EpubReaderScreen.h" ··· 49 49 EpdFont bookerlyBoldItalicFont(&bookerly_bold_italic_2b); 50 50 EpdFontFamily bookerlyFontFamily(&bookerlyFont, &bookerlyBoldFont, &bookerlyItalicFont, &bookerlyBoldItalicFont); 51 51 52 - EpdFont smallFont(&babyblue); 52 + EpdFont smallFont(&pixelarial14); 53 53 EpdFontFamily smallFontFamily(&smallFont); 54 54 55 55 EpdFont ubuntu10Font(&ubuntu_10);
+8 -7
src/screens/EpubReaderScreen.cpp
··· 10 10 constexpr int PAGES_PER_REFRESH = 15; 11 11 constexpr unsigned long SKIP_CHAPTER_MS = 700; 12 12 constexpr float lineCompression = 0.95f; 13 - constexpr int marginTop = 10; 13 + constexpr int marginTop = 8; 14 14 constexpr int marginRight = 10; 15 - constexpr int marginBottom = 20; 15 + constexpr int marginBottom = 22; 16 16 constexpr int marginLeft = 10; 17 17 18 18 void EpubReaderScreen::taskTrampoline(void* param) { ··· 261 261 } 262 262 263 263 void EpubReaderScreen::renderStatusBar() const { 264 + constexpr auto textY = 776; 264 265 // Right aligned text for progress counter 265 266 const std::string progress = std::to_string(section->currentPage + 1) + " / " + std::to_string(section->pageCount); 266 267 const auto progressTextWidth = renderer.getTextWidth(SMALL_FONT_ID, progress.c_str()); 267 - renderer.drawText(SMALL_FONT_ID, GfxRenderer::getScreenWidth() - marginRight - progressTextWidth, 776, 268 + renderer.drawText(SMALL_FONT_ID, GfxRenderer::getScreenWidth() - marginRight - progressTextWidth, textY, 268 269 progress.c_str()); 269 270 270 271 // Left aligned battery icon and percentage 271 272 const uint16_t percentage = battery.readPercentage(); 272 273 const auto percentageText = std::to_string(percentage) + "%"; 273 274 const auto percentageTextWidth = renderer.getTextWidth(SMALL_FONT_ID, percentageText.c_str()); 274 - renderer.drawText(SMALL_FONT_ID, 20 + marginLeft, 776, percentageText.c_str()); 275 + renderer.drawText(SMALL_FONT_ID, 20 + marginLeft, textY, percentageText.c_str()); 275 276 276 277 // 1 column on left, 2 columns on right, 5 columns of battery body 277 278 constexpr int batteryWidth = 15; ··· 287 288 renderer.drawLine(x, y, x, y + batteryHeight - 1); 288 289 // Battery end 289 290 renderer.drawLine(x + batteryWidth - 4, y, x + batteryWidth - 4, y + batteryHeight - 1); 290 - renderer.drawLine(x + batteryWidth - 3, y + 2, x + batteryWidth - 3, y + batteryHeight - 3); 291 - renderer.drawLine(x + batteryWidth - 2, y + 2, x + batteryWidth - 2, y + batteryHeight - 3); 291 + renderer.drawLine(x + batteryWidth - 3, y + 2, x + batteryWidth - 1, y + 2); 292 + renderer.drawLine(x + batteryWidth - 3, y + batteryHeight - 3, x + batteryWidth - 1, y + batteryHeight - 3); 292 293 renderer.drawLine(x + batteryWidth - 1, y + 2, x + batteryWidth - 1, y + batteryHeight - 3); 293 294 294 295 // The +1 is to round up, so that we always fill at least one pixel ··· 311 312 titleWidth = renderer.getTextWidth(SMALL_FONT_ID, title.c_str()); 312 313 } 313 314 314 - renderer.drawText(SMALL_FONT_ID, titleMarginLeft + (availableTextWidth - titleWidth) / 2, 777, title.c_str()); 315 + renderer.drawText(SMALL_FONT_ID, titleMarginLeft + (availableTextWidth - titleWidth) / 2, textY, title.c_str()); 315 316 }