From f42e999b9dfbd65f6e859538726438692576280e Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 13 Feb 2022 21:36:11 +0100 Subject: [PATCH] [P036] Partially reverted previous changes, now tweaked for fitting in 4-lines display like in 2020 builds --- lib/esp8266-oled-ssd1306/Lato_Thin_8_font.h | 464 ----------------- .../Monospaced_plain_8_font.h | 464 ----------------- .../SansSerif_Plain_8_font.h | 492 ------------------ src/_P036_FrameOLED.ino | 3 + src/src/PluginStructs/P036_data_struct.cpp | 57 +- src/src/PluginStructs/P036_data_struct.h | 26 +- 6 files changed, 24 insertions(+), 1482 deletions(-) delete mode 100644 lib/esp8266-oled-ssd1306/Lato_Thin_8_font.h delete mode 100644 lib/esp8266-oled-ssd1306/Monospaced_plain_8_font.h delete mode 100644 lib/esp8266-oled-ssd1306/SansSerif_Plain_8_font.h diff --git a/lib/esp8266-oled-ssd1306/Lato_Thin_8_font.h b/lib/esp8266-oled-ssd1306/Lato_Thin_8_font.h deleted file mode 100644 index 07e75bd1a..000000000 --- a/lib/esp8266-oled-ssd1306/Lato_Thin_8_font.h +++ /dev/null @@ -1,464 +0,0 @@ -#ifndef LATO_THIN_8_FONT_H -#define LATO_THIN_8_FONT_H - -// OLED library version >= 3.0.0 -// Created by http://oleddisplay.squix.ch/ Consider a donation -// In case of problems make sure that you are using the font file with the correct version! -const char Lato_Thin_8[] PROGMEM = { - 0x08, // Width: 8 - 0x0A, // Height: 10 - 0x20, // First Char: 32 - 0xE0, // Numbers of Chars: 224 - - // Jump Table: - 0xFF, 0xFF, 0x00, 0x02, // 32:65535 - 0x00, 0x00, 0x01, 0x02, // 33:0 - 0x00, 0x01, 0x03, 0x03, // 34:1 - 0x00, 0x04, 0x07, 0x05, // 35:4 - 0x00, 0x0B, 0x07, 0x05, // 36:11 - 0x00, 0x12, 0x0B, 0x06, // 37:18 - 0x00, 0x1D, 0x09, 0x06, // 38:29 - 0x00, 0x26, 0x01, 0x02, // 39:38 - 0x00, 0x27, 0x04, 0x02, // 40:39 - 0x00, 0x2B, 0x03, 0x02, // 41:43 - 0x00, 0x2E, 0x05, 0x03, // 42:46 - 0x00, 0x33, 0x07, 0x05, // 43:51 - 0x00, 0x3A, 0x02, 0x02, // 44:58 - 0x00, 0x3C, 0x03, 0x03, // 45:60 - 0x00, 0x3F, 0x01, 0x02, // 46:63 - 0x00, 0x40, 0x05, 0x03, // 47:64 - 0x00, 0x45, 0x07, 0x05, // 48:69 - 0x00, 0x4C, 0x07, 0x05, // 49:76 - 0x00, 0x53, 0x07, 0x05, // 50:83 - 0x00, 0x5A, 0x07, 0x05, // 51:90 - 0x00, 0x61, 0x07, 0x05, // 52:97 - 0x00, 0x68, 0x07, 0x05, // 53:104 - 0x00, 0x6F, 0x07, 0x05, // 54:111 - 0x00, 0x76, 0x07, 0x05, // 55:118 - 0x00, 0x7D, 0x07, 0x05, // 56:125 - 0x00, 0x84, 0x07, 0x05, // 57:132 - 0x00, 0x8B, 0x01, 0x02, // 58:139 - 0x00, 0x8C, 0x04, 0x02, // 59:140 - 0x00, 0x90, 0x07, 0x05, // 60:144 - 0x00, 0x97, 0x07, 0x05, // 61:151 - 0x00, 0x9E, 0x07, 0x05, // 62:158 - 0x00, 0xA5, 0x05, 0x03, // 63:165 - 0x00, 0xAA, 0x0B, 0x07, // 64:170 - 0x00, 0xB5, 0x09, 0x05, // 65:181 - 0x00, 0xBE, 0x07, 0x05, // 66:190 - 0x00, 0xC5, 0x09, 0x05, // 67:197 - 0x00, 0xCE, 0x0B, 0x06, // 68:206 - 0x00, 0xD9, 0x07, 0x05, // 69:217 - 0x00, 0xE0, 0x07, 0x05, // 70:224 - 0x00, 0xE7, 0x09, 0x06, // 71:231 - 0x00, 0xF0, 0x09, 0x06, // 72:240 - 0x00, 0xF9, 0x01, 0x02, // 73:249 - 0x00, 0xFA, 0x03, 0x03, // 74:250 - 0x00, 0xFD, 0x09, 0x05, // 75:253 - 0x01, 0x06, 0x07, 0x04, // 76:262 - 0x01, 0x0D, 0x0B, 0x07, // 77:269 - 0x01, 0x18, 0x09, 0x06, // 78:280 - 0x01, 0x21, 0x0B, 0x06, // 79:289 - 0x01, 0x2C, 0x07, 0x05, // 80:300 - 0x01, 0x33, 0x0C, 0x06, // 81:307 - 0x01, 0x3F, 0x09, 0x05, // 82:319 - 0x01, 0x48, 0x07, 0x04, // 83:328 - 0x01, 0x4F, 0x07, 0x05, // 84:335 - 0x01, 0x56, 0x09, 0x06, // 85:342 - 0x01, 0x5F, 0x09, 0x05, // 86:351 - 0x01, 0x68, 0x0F, 0x08, // 87:360 - 0x01, 0x77, 0x09, 0x05, // 88:375 - 0x01, 0x80, 0x09, 0x05, // 89:384 - 0x01, 0x89, 0x07, 0x05, // 90:393 - 0x01, 0x90, 0x04, 0x02, // 91:400 - 0x01, 0x94, 0x05, 0x03, // 92:404 - 0x01, 0x99, 0x02, 0x02, // 93:409 - 0x01, 0x9B, 0x07, 0x05, // 94:411 - 0x01, 0xA2, 0x06, 0x04, // 95:418 - 0x01, 0xA8, 0x03, 0x03, // 96:424 - 0x01, 0xAB, 0x05, 0x04, // 97:427 - 0x01, 0xB0, 0x07, 0x04, // 98:432 - 0x01, 0xB7, 0x05, 0x04, // 99:439 - 0x01, 0xBC, 0x07, 0x04, // 100:444 - 0x01, 0xC3, 0x07, 0x04, // 101:451 - 0x01, 0xCA, 0x05, 0x03, // 102:458 - 0x01, 0xCF, 0x08, 0x04, // 103:463 - 0x01, 0xD7, 0x07, 0x04, // 104:471 - 0x01, 0xDE, 0x01, 0x02, // 105:478 - 0x01, 0xDF, 0x02, 0x02, // 106:479 - 0x01, 0xE1, 0x07, 0x04, // 107:481 - 0x01, 0xE8, 0x01, 0x02, // 108:488 - 0x01, 0xE9, 0x0B, 0x06, // 109:489 - 0x01, 0xF4, 0x07, 0x04, // 110:500 - 0x01, 0xFB, 0x07, 0x04, // 111:507 - 0x02, 0x02, 0x07, 0x04, // 112:514 - 0x02, 0x09, 0x08, 0x04, // 113:521 - 0x02, 0x11, 0x05, 0x03, // 114:529 - 0x02, 0x16, 0x05, 0x03, // 115:534 - 0x02, 0x1B, 0x05, 0x03, // 116:539 - 0x02, 0x20, 0x07, 0x04, // 117:544 - 0x02, 0x27, 0x07, 0x04, // 118:551 - 0x02, 0x2E, 0x0B, 0x06, // 119:558 - 0x02, 0x39, 0x05, 0x04, // 120:569 - 0x02, 0x3E, 0x07, 0x04, // 121:574 - 0x02, 0x45, 0x05, 0x04, // 122:581 - 0x02, 0x4A, 0x04, 0x02, // 123:586 - 0x02, 0x4E, 0x02, 0x02, // 124:590 - 0x02, 0x50, 0x03, 0x02, // 125:592 - 0x02, 0x53, 0x07, 0x05, // 126:595 - 0x02, 0x5A, 0x07, 0x04, // 127:602 - 0x02, 0x61, 0x07, 0x04, // 128:609 - 0x02, 0x68, 0x07, 0x04, // 129:616 - 0x02, 0x6F, 0x07, 0x04, // 130:623 - 0x02, 0x76, 0x07, 0x04, // 131:630 - 0x02, 0x7D, 0x07, 0x04, // 132:637 - 0x02, 0x84, 0x07, 0x04, // 133:644 - 0x02, 0x8B, 0x07, 0x04, // 134:651 - 0x02, 0x92, 0x07, 0x04, // 135:658 - 0x02, 0x99, 0x07, 0x04, // 136:665 - 0x02, 0xA0, 0x07, 0x04, // 137:672 - 0x02, 0xA7, 0x07, 0x04, // 138:679 - 0x02, 0xAE, 0x07, 0x04, // 139:686 - 0x02, 0xB5, 0x07, 0x04, // 140:693 - 0x02, 0xBC, 0x07, 0x04, // 141:700 - 0x02, 0xC3, 0x07, 0x04, // 142:707 - 0x02, 0xCA, 0x07, 0x04, // 143:714 - 0x02, 0xD1, 0x07, 0x04, // 144:721 - 0x02, 0xD8, 0x07, 0x04, // 145:728 - 0x02, 0xDF, 0x07, 0x04, // 146:735 - 0x02, 0xE6, 0x07, 0x04, // 147:742 - 0x02, 0xED, 0x07, 0x04, // 148:749 - 0x02, 0xF4, 0x07, 0x04, // 149:756 - 0x02, 0xFB, 0x07, 0x04, // 150:763 - 0x03, 0x02, 0x07, 0x04, // 151:770 - 0x03, 0x09, 0x07, 0x04, // 152:777 - 0x03, 0x10, 0x07, 0x04, // 153:784 - 0x03, 0x17, 0x07, 0x04, // 154:791 - 0x03, 0x1E, 0x07, 0x04, // 155:798 - 0x03, 0x25, 0x07, 0x04, // 156:805 - 0x03, 0x2C, 0x07, 0x04, // 157:812 - 0x03, 0x33, 0x07, 0x04, // 158:819 - 0x03, 0x3A, 0x07, 0x04, // 159:826 - 0xFF, 0xFF, 0x00, 0x02, // 160:65535 - 0x03, 0x41, 0x02, 0x02, // 161:833 - 0x03, 0x43, 0x07, 0x05, // 162:835 - 0x03, 0x4A, 0x07, 0x05, // 163:842 - 0x03, 0x51, 0x07, 0x05, // 164:849 - 0x03, 0x58, 0x07, 0x05, // 165:856 - 0x03, 0x5F, 0x02, 0x02, // 166:863 - 0x03, 0x61, 0x05, 0x04, // 167:865 - 0x03, 0x66, 0x05, 0x03, // 168:870 - 0x03, 0x6B, 0x0B, 0x07, // 169:875 - 0x03, 0x76, 0x03, 0x03, // 170:886 - 0x03, 0x79, 0x03, 0x03, // 171:889 - 0x03, 0x7C, 0x07, 0x05, // 172:892 - 0x03, 0x83, 0x03, 0x03, // 173:899 - 0x03, 0x86, 0x0B, 0x07, // 174:902 - 0x03, 0x91, 0x05, 0x03, // 175:913 - 0x03, 0x96, 0x05, 0x03, // 176:918 - 0x03, 0x9B, 0x07, 0x05, // 177:923 - 0x03, 0xA2, 0x03, 0x03, // 178:930 - 0x03, 0xA5, 0x03, 0x03, // 179:933 - 0x03, 0xA8, 0x03, 0x03, // 180:936 - 0x03, 0xAB, 0x09, 0x05, // 181:939 - 0x03, 0xB4, 0x09, 0x05, // 182:948 - 0x03, 0xBD, 0x01, 0x02, // 183:957 - 0x03, 0xBE, 0x04, 0x03, // 184:958 - 0x03, 0xC2, 0x03, 0x03, // 185:962 - 0x03, 0xC5, 0x05, 0x03, // 186:965 - 0x03, 0xCA, 0x05, 0x03, // 187:970 - 0x03, 0xCF, 0x09, 0x06, // 188:975 - 0x03, 0xD8, 0x09, 0x06, // 189:984 - 0x03, 0xE1, 0x09, 0x06, // 190:993 - 0x03, 0xEA, 0x06, 0x03, // 191:1002 - 0x03, 0xF0, 0x09, 0x05, // 192:1008 - 0x03, 0xF9, 0x09, 0x05, // 193:1017 - 0x04, 0x02, 0x09, 0x05, // 194:1026 - 0x04, 0x0B, 0x09, 0x05, // 195:1035 - 0x04, 0x14, 0x09, 0x05, // 196:1044 - 0x04, 0x1D, 0x09, 0x05, // 197:1053 - 0x04, 0x26, 0x0D, 0x07, // 198:1062 - 0x04, 0x33, 0x09, 0x05, // 199:1075 - 0x04, 0x3C, 0x07, 0x05, // 200:1084 - 0x04, 0x43, 0x07, 0x05, // 201:1091 - 0x04, 0x4A, 0x07, 0x05, // 202:1098 - 0x04, 0x51, 0x07, 0x05, // 203:1105 - 0x04, 0x58, 0x01, 0x02, // 204:1112 - 0x04, 0x59, 0x03, 0x02, // 205:1113 - 0x04, 0x5C, 0x03, 0x02, // 206:1116 - 0x04, 0x5F, 0x03, 0x02, // 207:1119 - 0x04, 0x62, 0x0B, 0x06, // 208:1122 - 0x04, 0x6D, 0x09, 0x06, // 209:1133 - 0x04, 0x76, 0x0B, 0x06, // 210:1142 - 0x04, 0x81, 0x0B, 0x06, // 211:1153 - 0x04, 0x8C, 0x0B, 0x06, // 212:1164 - 0x04, 0x97, 0x0B, 0x06, // 213:1175 - 0x04, 0xA2, 0x0B, 0x06, // 214:1186 - 0x04, 0xAD, 0x07, 0x05, // 215:1197 - 0x04, 0xB4, 0x0B, 0x06, // 216:1204 - 0x04, 0xBF, 0x09, 0x06, // 217:1215 - 0x04, 0xC8, 0x09, 0x06, // 218:1224 - 0x04, 0xD1, 0x09, 0x06, // 219:1233 - 0x04, 0xDA, 0x09, 0x06, // 220:1242 - 0x04, 0xE3, 0x09, 0x05, // 221:1251 - 0x04, 0xEC, 0x07, 0x05, // 222:1260 - 0x04, 0xF3, 0x07, 0x04, // 223:1267 - 0x04, 0xFA, 0x05, 0x04, // 224:1274 - 0x04, 0xFF, 0x05, 0x04, // 225:1279 - 0x05, 0x04, 0x05, 0x04, // 226:1284 - 0x05, 0x09, 0x05, 0x04, // 227:1289 - 0x05, 0x0E, 0x05, 0x04, // 228:1294 - 0x05, 0x13, 0x05, 0x04, // 229:1299 - 0x05, 0x18, 0x0B, 0x06, // 230:1304 - 0x05, 0x23, 0x06, 0x04, // 231:1315 - 0x05, 0x29, 0x07, 0x04, // 232:1321 - 0x05, 0x30, 0x07, 0x04, // 233:1328 - 0x05, 0x37, 0x07, 0x04, // 234:1335 - 0x05, 0x3E, 0x07, 0x04, // 235:1342 - 0x05, 0x45, 0x01, 0x02, // 236:1349 - 0x05, 0x46, 0x03, 0x02, // 237:1350 - 0x05, 0x49, 0x03, 0x02, // 238:1353 - 0x05, 0x4C, 0x03, 0x02, // 239:1356 - 0x05, 0x4F, 0x07, 0x04, // 240:1359 - 0x05, 0x56, 0x07, 0x04, // 241:1366 - 0x05, 0x5D, 0x07, 0x04, // 242:1373 - 0x05, 0x64, 0x07, 0x04, // 243:1380 - 0x05, 0x6B, 0x07, 0x04, // 244:1387 - 0x05, 0x72, 0x07, 0x04, // 245:1394 - 0x05, 0x79, 0x07, 0x04, // 246:1401 - 0x05, 0x80, 0x07, 0x05, // 247:1408 - 0x05, 0x87, 0x07, 0x04, // 248:1415 - 0x05, 0x8E, 0x07, 0x04, // 249:1422 - 0x05, 0x95, 0x07, 0x04, // 250:1429 - 0x05, 0x9C, 0x07, 0x04, // 251:1436 - 0x05, 0xA3, 0x07, 0x04, // 252:1443 - 0x05, 0xAA, 0x07, 0x04, // 253:1450 - 0x05, 0xB1, 0x07, 0x04, // 254:1457 - 0x05, 0xB8, 0x07, 0x04, // 255:1464 - - // Font Data: - 0xBC, // 33 - 0x00, 0x00, 0x0C, // 34 - 0x40, 0x00, 0xF8, 0x00, 0xD4, 0x00, 0x7C, // 35 - 0x00, 0x00, 0x9C, 0x00, 0x66, 0x01, 0xE4, // 36 - 0x1C, 0x00, 0xA4, 0x00, 0x7C, 0x00, 0xD0, 0x00, 0xAC, 0x00, 0xC0, // 37 - 0x60, 0x00, 0x9C, 0x00, 0xA4, 0x00, 0xC4, 0x00, 0xA0, // 38 - 0x0C, // 39 - 0xF8, 0x00, 0x04, 0x01, // 40 - 0x04, 0x01, 0xF8, // 41 - 0x00, 0x00, 0x0C, 0x00, 0x0C, // 42 - 0x20, 0x00, 0x20, 0x00, 0x78, 0x00, 0x20, // 43 - 0x80, 0x01, // 44 - 0x00, 0x00, 0x20, // 45 - 0x80, // 46 - 0x80, 0x00, 0x70, 0x00, 0x0C, // 47 - 0x78, 0x00, 0x84, 0x00, 0x84, 0x00, 0xFC, // 48 - 0x00, 0x00, 0x88, 0x00, 0xFC, 0x00, 0x80, // 49 - 0x00, 0x00, 0xCC, 0x00, 0xA4, 0x00, 0x9C, // 50 - 0x88, 0x00, 0x84, 0x00, 0xA4, 0x00, 0xDC, // 51 - 0x60, 0x00, 0x50, 0x00, 0x48, 0x00, 0xF4, // 52 - 0x00, 0x00, 0x9C, 0x00, 0x94, 0x00, 0xE4, // 53 - 0x00, 0x00, 0xF0, 0x00, 0x9C, 0x00, 0xE0, // 54 - 0x00, 0x00, 0x84, 0x00, 0x64, 0x00, 0x1C, // 55 - 0x00, 0x00, 0xDC, 0x00, 0xA4, 0x00, 0xDC, // 56 - 0x00, 0x00, 0x9C, 0x00, 0x64, 0x00, 0x1C, // 57 - 0x90, // 58 - 0x90, 0x00, 0x00, 0x01, // 59 - 0x00, 0x00, 0x20, 0x00, 0x50, 0x00, 0x50, // 60 - 0x00, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, // 61 - 0x00, 0x00, 0x50, 0x00, 0x50, 0x00, 0x20, // 62 - 0x04, 0x00, 0xA4, 0x00, 0x1C, // 63 - 0x00, 0x00, 0xF8, 0x00, 0x64, 0x01, 0x54, 0x01, 0x64, 0x01, 0xB8, // 64 - 0x80, 0x00, 0x70, 0x00, 0x4C, 0x00, 0x70, 0x00, 0x80, // 65 - 0x00, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0xDC, // 66 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0x84, // 67 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 68 - 0x00, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0xA4, // 69 - 0x00, 0x00, 0xFC, 0x00, 0x24, 0x00, 0x24, // 70 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0xE4, // 71 - 0x00, 0x00, 0xFC, 0x00, 0x20, 0x00, 0x20, 0x00, 0xFC, // 72 - 0xFC, // 73 - 0x80, 0x00, 0xFC, // 74 - 0x00, 0x00, 0xFC, 0x00, 0x50, 0x00, 0x48, 0x00, 0x84, // 75 - 0x00, 0x00, 0xFC, 0x00, 0x80, 0x00, 0x80, // 76 - 0x00, 0x00, 0xFC, 0x00, 0x20, 0x00, 0x40, 0x00, 0x30, 0x00, 0xFC, // 77 - 0x00, 0x00, 0xFC, 0x00, 0x10, 0x00, 0x20, 0x00, 0xFC, // 78 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 79 - 0x00, 0x00, 0xFC, 0x00, 0x24, 0x00, 0x1C, // 80 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, 0x01, // 81 - 0x00, 0x00, 0xFC, 0x00, 0x24, 0x00, 0x5C, 0x00, 0x80, // 82 - 0x88, 0x00, 0x94, 0x00, 0x94, 0x00, 0xE4, // 83 - 0x04, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x04, // 84 - 0x00, 0x00, 0xFC, 0x00, 0x80, 0x00, 0x80, 0x00, 0xFC, // 85 - 0x0C, 0x00, 0x30, 0x00, 0xC0, 0x00, 0x30, 0x00, 0x0C, // 86 - 0x0C, 0x00, 0xB0, 0x00, 0x60, 0x00, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x00, 0x70, 0x00, 0x0C, // 87 - 0x84, 0x00, 0x48, 0x00, 0x30, 0x00, 0x48, 0x00, 0x84, // 88 - 0x04, 0x00, 0x18, 0x00, 0xF0, 0x00, 0x08, 0x00, 0x04, // 89 - 0x84, 0x00, 0xC4, 0x00, 0xB4, 0x00, 0x8C, // 90 - 0x00, 0x00, 0xFE, 0x01, // 91 - 0x04, 0x00, 0x38, 0x00, 0xC0, // 92 - 0xFE, 0x01, // 93 - 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x08, // 94 - 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, // 95 - 0x00, 0x00, 0x04, // 96 - 0xD0, 0x00, 0xB0, 0x00, 0xF0, // 97 - 0x00, 0x00, 0xFC, 0x00, 0x90, 0x00, 0xF0, // 98 - 0x60, 0x00, 0x90, 0x00, 0x90, // 99 - 0xE0, 0x00, 0x90, 0x00, 0x90, 0x00, 0xFC, // 100 - 0x60, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xB0, // 101 - 0x10, 0x00, 0xFC, 0x00, 0x04, // 102 - 0x50, 0x01, 0xB0, 0x01, 0xB0, 0x01, 0x10, 0x01, // 103 - 0x00, 0x00, 0xFC, 0x00, 0x10, 0x00, 0xF0, // 104 - 0xF4, // 105 - 0xF4, 0x01, // 106 - 0x00, 0x00, 0xFC, 0x00, 0x50, 0x00, 0x80, // 107 - 0xFC, // 108 - 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, 0xF0, 0x00, 0x10, 0x00, 0xF0, // 109 - 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, 0xF0, // 110 - 0x60, 0x00, 0x90, 0x00, 0x90, 0x00, 0xF0, // 111 - 0x00, 0x00, 0xF0, 0x01, 0x90, 0x00, 0xF0, // 112 - 0xE0, 0x00, 0x90, 0x00, 0x90, 0x00, 0xF0, 0x01, // 113 - 0x00, 0x00, 0xF0, 0x00, 0x10, // 114 - 0xB0, 0x00, 0xB0, 0x00, 0xD0, // 115 - 0x10, 0x00, 0xFC, 0x00, 0x80, // 116 - 0x00, 0x00, 0xF0, 0x00, 0x80, 0x00, 0xF0, // 117 - 0x30, 0x00, 0xC0, 0x00, 0x40, 0x00, 0x30, // 118 - 0x30, 0x00, 0xC0, 0x00, 0x30, 0x00, 0x60, 0x00, 0xC0, 0x00, 0x30, // 119 - 0x90, 0x00, 0x60, 0x00, 0x90, // 120 - 0x10, 0x00, 0xE0, 0x01, 0x60, 0x00, 0x10, // 121 - 0x90, 0x00, 0xD0, 0x00, 0xB0, // 122 - 0xAC, 0x00, 0x52, 0x01, // 123 - 0xFC, 0x01, // 124 - 0x02, 0x01, 0xFC, // 125 - 0x00, 0x00, 0x30, 0x00, 0x20, 0x00, 0x30, // 126 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 127 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 128 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 129 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 130 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 131 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 132 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 133 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 134 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 135 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 136 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 137 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 138 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 139 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 140 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 141 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 142 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 143 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 144 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 145 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 146 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 147 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 148 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 149 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 150 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 151 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 152 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 153 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 154 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 155 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 156 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 157 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 158 - 0xFC, 0x00, 0xA4, 0x00, 0x9C, 0x00, 0xFC, // 159 - 0xF0, 0x01, // 161 - 0x00, 0x00, 0xF0, 0x00, 0xF8, 0x01, 0x90, // 162 - 0xA0, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0x84, // 163 - 0x00, 0x00, 0x70, 0x00, 0x50, 0x00, 0x70, // 164 - 0x04, 0x00, 0x78, 0x00, 0xF0, 0x00, 0x6C, // 165 - 0xDC, 0x01, // 166 - 0x00, 0x00, 0x3C, 0x01, 0xF4, // 167 - 0x00, 0x00, 0x04, 0x00, 0x04, // 168 - 0x00, 0x00, 0xFC, 0x00, 0xCC, 0x00, 0xCC, 0x00, 0xCC, 0x00, 0x78, // 169 - 0x00, 0x00, 0x1C, // 170 - 0x60, 0x00, 0x70, // 171 - 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, // 172 - 0x00, 0x00, 0x20, // 173 - 0x00, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xAC, 0x00, 0xD4, 0x00, 0x78, // 174 - 0x00, 0x00, 0x04, 0x00, 0x04, // 175 - 0x00, 0x00, 0x1C, 0x00, 0x0C, // 176 - 0xA0, 0x00, 0xA0, 0x00, 0xF8, 0x00, 0xA0, // 177 - 0x0C, 0x00, 0x0E, // 178 - 0x14, 0x00, 0x1E, // 179 - 0x00, 0x00, 0x04, // 180 - 0x00, 0x00, 0xF0, 0x01, 0x80, 0x00, 0xF0, 0x00, 0x80, // 181 - 0x08, 0x00, 0x1C, 0x00, 0xE4, 0x00, 0xFC, 0x00, 0x04, // 182 - 0x20, // 183 - 0x00, 0x00, 0x80, 0x01, // 184 - 0x00, 0x00, 0x1C, // 185 - 0x00, 0x00, 0x1C, 0x00, 0x0C, // 186 - 0x00, 0x00, 0x70, 0x00, 0x20, // 187 - 0x04, 0x00, 0xB8, 0x00, 0x60, 0x00, 0x98, 0x00, 0xE4, // 188 - 0x04, 0x00, 0xF8, 0x00, 0x30, 0x00, 0xC8, 0x00, 0xE4, // 189 - 0x14, 0x00, 0xAC, 0x00, 0x74, 0x00, 0x88, 0x00, 0xE4, // 190 - 0x80, 0x01, 0x50, 0x01, 0x00, 0x01, // 191 - 0x80, 0x00, 0x71, 0x00, 0x4E, 0x00, 0x70, 0x00, 0x80, // 192 - 0x80, 0x00, 0x70, 0x00, 0x4E, 0x00, 0x71, 0x00, 0x80, // 193 - 0x80, 0x00, 0x70, 0x00, 0x4E, 0x00, 0x72, 0x00, 0x80, // 194 - 0x80, 0x00, 0x72, 0x00, 0x4E, 0x00, 0x72, 0x00, 0x80, // 195 - 0x80, 0x00, 0x72, 0x00, 0x4C, 0x00, 0x72, 0x00, 0x80, // 196 - 0x80, 0x00, 0x70, 0x00, 0x4F, 0x00, 0x70, 0x00, 0x80, // 197 - 0x80, 0x00, 0x60, 0x00, 0x58, 0x00, 0x5C, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0x84, // 198 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x04, 0x01, 0x84, // 199 - 0x00, 0x00, 0xFD, 0x00, 0xA2, 0x00, 0xA4, // 200 - 0x00, 0x00, 0xFC, 0x00, 0xA2, 0x00, 0xA5, // 201 - 0x00, 0x00, 0xFC, 0x00, 0xA2, 0x00, 0xA4, // 202 - 0x00, 0x00, 0xFE, 0x00, 0xA4, 0x00, 0xA2, // 203 - 0xFF, // 204 - 0x00, 0x00, 0xFF, // 205 - 0xFE, 0x00, 0x02, // 206 - 0xFE, 0x00, 0x02, // 207 - 0x20, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 208 - 0x00, 0x00, 0xFC, 0x00, 0x12, 0x00, 0x22, 0x00, 0xFC, // 209 - 0x00, 0x00, 0xFC, 0x00, 0x85, 0x00, 0x82, 0x00, 0x84, 0x00, 0x78, // 210 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x82, 0x00, 0x85, 0x00, 0x78, // 211 - 0x00, 0x00, 0xFC, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00, 0x78, // 212 - 0x00, 0x00, 0xFC, 0x00, 0x82, 0x00, 0x82, 0x00, 0x84, 0x00, 0x78, // 213 - 0x00, 0x00, 0xFC, 0x00, 0x82, 0x00, 0x82, 0x00, 0x84, 0x00, 0x78, // 214 - 0x00, 0x00, 0x50, 0x00, 0x20, 0x00, 0x50, // 215 - 0x00, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0x94, 0x00, 0x8C, 0x00, 0x74, // 216 - 0x00, 0x00, 0xFD, 0x00, 0x82, 0x00, 0x80, 0x00, 0xFC, // 217 - 0x00, 0x00, 0xFC, 0x00, 0x80, 0x00, 0x83, 0x00, 0xFC, // 218 - 0x00, 0x00, 0xFC, 0x00, 0x83, 0x00, 0x82, 0x00, 0xFC, // 219 - 0x00, 0x00, 0xFC, 0x00, 0x82, 0x00, 0x82, 0x00, 0xFC, // 220 - 0x04, 0x00, 0x18, 0x00, 0xF2, 0x00, 0x09, 0x00, 0x04, // 221 - 0x00, 0x00, 0xFC, 0x00, 0x48, 0x00, 0x30, // 222 - 0x00, 0x00, 0xFC, 0x00, 0xB4, 0x00, 0xCC, // 223 - 0xD0, 0x00, 0xB4, 0x00, 0xF0, // 224 - 0xD0, 0x00, 0xB0, 0x00, 0xF4, // 225 - 0xD0, 0x00, 0xB4, 0x00, 0xF4, // 226 - 0xD0, 0x00, 0xAC, 0x00, 0xFC, // 227 - 0xD0, 0x00, 0xB4, 0x00, 0xF4, // 228 - 0xD0, 0x00, 0xAC, 0x00, 0xF4, // 229 - 0xD0, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xF0, 0x00, 0xB0, 0x00, 0xB0, // 230 - 0x60, 0x00, 0x90, 0x00, 0x90, 0x01, // 231 - 0x60, 0x00, 0xB4, 0x00, 0xB8, 0x00, 0xB0, // 232 - 0x60, 0x00, 0xB0, 0x00, 0xB4, 0x00, 0xB0, // 233 - 0x60, 0x00, 0xB4, 0x00, 0xB4, 0x00, 0xB0, // 234 - 0x60, 0x00, 0xB4, 0x00, 0xB4, 0x00, 0xB0, // 235 - 0xF4, // 236 - 0x00, 0x00, 0xF4, // 237 - 0xF4, 0x00, 0x04, // 238 - 0xF4, 0x00, 0x04, // 239 - 0x60, 0x00, 0x94, 0x00, 0x98, 0x00, 0xF4, // 240 - 0x00, 0x00, 0xFC, 0x00, 0x08, 0x00, 0xF4, // 241 - 0x60, 0x00, 0x90, 0x00, 0x94, 0x00, 0xF0, // 242 - 0x60, 0x00, 0x90, 0x00, 0x94, 0x00, 0xF0, // 243 - 0x60, 0x00, 0x98, 0x00, 0x94, 0x00, 0xF0, // 244 - 0x60, 0x00, 0x9C, 0x00, 0x88, 0x00, 0xF4, // 245 - 0x60, 0x00, 0x94, 0x00, 0x94, 0x00, 0xF0, // 246 - 0x20, 0x00, 0x20, 0x00, 0x68, 0x00, 0x20, // 247 - 0xE0, 0x00, 0xD0, 0x00, 0xB0, 0x00, 0xF0, // 248 - 0x00, 0x00, 0xF4, 0x00, 0x88, 0x00, 0xF0, // 249 - 0x00, 0x00, 0xF0, 0x00, 0x84, 0x00, 0xF0, // 250 - 0x00, 0x00, 0xF4, 0x00, 0x84, 0x00, 0xF0, // 251 - 0x00, 0x00, 0xF4, 0x00, 0x84, 0x00, 0xF0, // 252 - 0x10, 0x00, 0xE0, 0x01, 0x64, 0x00, 0x10, // 253 - 0x00, 0x00, 0xFC, 0x01, 0x90, 0x00, 0xF0, // 254 - 0x10, 0x00, 0xE4, 0x01, 0x64, 0x00, 0x10 // 255 -}; - -#endif // ifndef LATO_THIN_8_FONT_H diff --git a/lib/esp8266-oled-ssd1306/Monospaced_plain_8_font.h b/lib/esp8266-oled-ssd1306/Monospaced_plain_8_font.h deleted file mode 100644 index eb4f5af1a..000000000 --- a/lib/esp8266-oled-ssd1306/Monospaced_plain_8_font.h +++ /dev/null @@ -1,464 +0,0 @@ -#ifndef MONOSPACED_PLAIN_8_FONT_H -#define MONOSPACED_PLAIN_8_FONT_H - -// OLED library version >= 3.0.0 -// Created by http://oleddisplay.squix.ch/ Consider a donation -// In case of problems make sure that you are using the font file with the correct version! -const char Monospaced_plain_8[] PROGMEM = { - 0x05, // Width: 5 - 0x0A, // Height: 10 - 0x20, // First Char: 32 - 0xE0, // Numbers of Chars: 224 - - // Jump Table: - 0xFF, 0xFF, 0x00, 0x05, // 32:65535 - 0x00, 0x00, 0x05, 0x05, // 33:0 - 0x00, 0x05, 0x07, 0x05, // 34:5 - 0x00, 0x0C, 0x09, 0x05, // 35:12 - 0x00, 0x15, 0x09, 0x05, // 36:21 - 0x00, 0x1E, 0x09, 0x05, // 37:30 - 0x00, 0x27, 0x09, 0x05, // 38:39 - 0x00, 0x30, 0x05, 0x05, // 39:48 - 0x00, 0x35, 0x07, 0x05, // 40:53 - 0x00, 0x3C, 0x05, 0x05, // 41:60 - 0x00, 0x41, 0x09, 0x05, // 42:65 - 0x00, 0x4A, 0x09, 0x05, // 43:74 - 0x00, 0x53, 0x06, 0x05, // 44:83 - 0x00, 0x59, 0x05, 0x05, // 45:89 - 0x00, 0x5E, 0x05, 0x05, // 46:94 - 0x00, 0x63, 0x07, 0x05, // 47:99 - 0x00, 0x6A, 0x09, 0x05, // 48:106 - 0x00, 0x73, 0x07, 0x05, // 49:115 - 0x00, 0x7A, 0x09, 0x05, // 50:122 - 0x00, 0x83, 0x09, 0x05, // 51:131 - 0x00, 0x8C, 0x09, 0x05, // 52:140 - 0x00, 0x95, 0x09, 0x05, // 53:149 - 0x00, 0x9E, 0x09, 0x05, // 54:158 - 0x00, 0xA7, 0x09, 0x05, // 55:167 - 0x00, 0xB0, 0x09, 0x05, // 56:176 - 0x00, 0xB9, 0x09, 0x05, // 57:185 - 0x00, 0xC2, 0x05, 0x05, // 58:194 - 0x00, 0xC7, 0x06, 0x05, // 59:199 - 0x00, 0xCD, 0x09, 0x05, // 60:205 - 0x00, 0xD6, 0x07, 0x05, // 61:214 - 0x00, 0xDD, 0x09, 0x05, // 62:221 - 0x00, 0xE6, 0x07, 0x05, // 63:230 - 0x00, 0xED, 0x09, 0x05, // 64:237 - 0x00, 0xF6, 0x09, 0x05, // 65:246 - 0x00, 0xFF, 0x09, 0x05, // 66:255 - 0x01, 0x08, 0x09, 0x05, // 67:264 - 0x01, 0x11, 0x09, 0x05, // 68:273 - 0x01, 0x1A, 0x09, 0x05, // 69:282 - 0x01, 0x23, 0x09, 0x05, // 70:291 - 0x01, 0x2C, 0x09, 0x05, // 71:300 - 0x01, 0x35, 0x09, 0x05, // 72:309 - 0x01, 0x3E, 0x07, 0x05, // 73:318 - 0x01, 0x45, 0x07, 0x05, // 74:325 - 0x01, 0x4C, 0x09, 0x05, // 75:332 - 0x01, 0x55, 0x09, 0x05, // 76:341 - 0x01, 0x5E, 0x09, 0x05, // 77:350 - 0x01, 0x67, 0x09, 0x05, // 78:359 - 0x01, 0x70, 0x09, 0x05, // 79:368 - 0x01, 0x79, 0x09, 0x05, // 80:377 - 0x01, 0x82, 0x0A, 0x05, // 81:386 - 0x01, 0x8C, 0x09, 0x05, // 82:396 - 0x01, 0x95, 0x09, 0x05, // 83:405 - 0x01, 0x9E, 0x09, 0x05, // 84:414 - 0x01, 0xA7, 0x09, 0x05, // 85:423 - 0x01, 0xB0, 0x09, 0x05, // 86:432 - 0x01, 0xB9, 0x09, 0x05, // 87:441 - 0x01, 0xC2, 0x09, 0x05, // 88:450 - 0x01, 0xCB, 0x09, 0x05, // 89:459 - 0x01, 0xD4, 0x09, 0x05, // 90:468 - 0x01, 0xDD, 0x07, 0x05, // 91:477 - 0x01, 0xE4, 0x08, 0x05, // 92:484 - 0x01, 0xEC, 0x05, 0x05, // 93:492 - 0x01, 0xF1, 0x07, 0x05, // 94:497 - 0x01, 0xF8, 0x0A, 0x05, // 95:504 - 0x02, 0x02, 0x03, 0x05, // 96:514 - 0x02, 0x05, 0x09, 0x05, // 97:517 - 0x02, 0x0E, 0x09, 0x05, // 98:526 - 0x02, 0x17, 0x07, 0x05, // 99:535 - 0x02, 0x1E, 0x09, 0x05, // 100:542 - 0x02, 0x27, 0x09, 0x05, // 101:551 - 0x02, 0x30, 0x09, 0x05, // 102:560 - 0x02, 0x39, 0x0A, 0x05, // 103:569 - 0x02, 0x43, 0x09, 0x05, // 104:579 - 0x02, 0x4C, 0x07, 0x05, // 105:588 - 0x02, 0x53, 0x06, 0x05, // 106:595 - 0x02, 0x59, 0x09, 0x05, // 107:601 - 0x02, 0x62, 0x09, 0x05, // 108:610 - 0x02, 0x6B, 0x09, 0x05, // 109:619 - 0x02, 0x74, 0x09, 0x05, // 110:628 - 0x02, 0x7D, 0x09, 0x05, // 111:637 - 0x02, 0x86, 0x09, 0x05, // 112:646 - 0x02, 0x8F, 0x0A, 0x05, // 113:655 - 0x02, 0x99, 0x07, 0x05, // 114:665 - 0x02, 0xA0, 0x09, 0x05, // 115:672 - 0x02, 0xA9, 0x09, 0x05, // 116:681 - 0x02, 0xB2, 0x09, 0x05, // 117:690 - 0x02, 0xBB, 0x09, 0x05, // 118:699 - 0x02, 0xC4, 0x09, 0x05, // 119:708 - 0x02, 0xCD, 0x09, 0x05, // 120:717 - 0x02, 0xD6, 0x09, 0x05, // 121:726 - 0x02, 0xDF, 0x09, 0x05, // 122:735 - 0x02, 0xE8, 0x07, 0x05, // 123:744 - 0x02, 0xEF, 0x06, 0x05, // 124:751 - 0x02, 0xF5, 0x07, 0x05, // 125:757 - 0x02, 0xFC, 0x09, 0x05, // 126:764 - 0x03, 0x05, 0x08, 0x05, // 127:773 - 0x03, 0x0D, 0x08, 0x05, // 128:781 - 0x03, 0x15, 0x08, 0x05, // 129:789 - 0x03, 0x1D, 0x08, 0x05, // 130:797 - 0x03, 0x25, 0x08, 0x05, // 131:805 - 0x03, 0x2D, 0x08, 0x05, // 132:813 - 0x03, 0x35, 0x08, 0x05, // 133:821 - 0x03, 0x3D, 0x08, 0x05, // 134:829 - 0x03, 0x45, 0x08, 0x05, // 135:837 - 0x03, 0x4D, 0x08, 0x05, // 136:845 - 0x03, 0x55, 0x08, 0x05, // 137:853 - 0x03, 0x5D, 0x08, 0x05, // 138:861 - 0x03, 0x65, 0x08, 0x05, // 139:869 - 0x03, 0x6D, 0x08, 0x05, // 140:877 - 0x03, 0x75, 0x08, 0x05, // 141:885 - 0x03, 0x7D, 0x08, 0x05, // 142:893 - 0x03, 0x85, 0x08, 0x05, // 143:901 - 0x03, 0x8D, 0x08, 0x05, // 144:909 - 0x03, 0x95, 0x08, 0x05, // 145:917 - 0x03, 0x9D, 0x08, 0x05, // 146:925 - 0x03, 0xA5, 0x08, 0x05, // 147:933 - 0x03, 0xAD, 0x08, 0x05, // 148:941 - 0x03, 0xB5, 0x08, 0x05, // 149:949 - 0x03, 0xBD, 0x08, 0x05, // 150:957 - 0x03, 0xC5, 0x08, 0x05, // 151:965 - 0x03, 0xCD, 0x08, 0x05, // 152:973 - 0x03, 0xD5, 0x08, 0x05, // 153:981 - 0x03, 0xDD, 0x08, 0x05, // 154:989 - 0x03, 0xE5, 0x08, 0x05, // 155:997 - 0x03, 0xED, 0x08, 0x05, // 156:1005 - 0x03, 0xF5, 0x08, 0x05, // 157:1013 - 0x03, 0xFD, 0x08, 0x05, // 158:1021 - 0x04, 0x05, 0x08, 0x05, // 159:1029 - 0xFF, 0xFF, 0x00, 0x05, // 160:65535 - 0x04, 0x0D, 0x06, 0x05, // 161:1037 - 0x04, 0x13, 0x07, 0x05, // 162:1043 - 0x04, 0x1A, 0x07, 0x05, // 163:1050 - 0x04, 0x21, 0x07, 0x05, // 164:1057 - 0x04, 0x28, 0x09, 0x05, // 165:1064 - 0x04, 0x31, 0x06, 0x05, // 166:1073 - 0x04, 0x37, 0x08, 0x05, // 167:1079 - 0x04, 0x3F, 0x07, 0x05, // 168:1087 - 0x04, 0x46, 0x09, 0x05, // 169:1094 - 0x04, 0x4F, 0x07, 0x05, // 170:1103 - 0x04, 0x56, 0x07, 0x05, // 171:1110 - 0x04, 0x5D, 0x09, 0x05, // 172:1117 - 0x04, 0x66, 0x05, 0x05, // 173:1126 - 0x04, 0x6B, 0x09, 0x05, // 174:1131 - 0x04, 0x74, 0x05, 0x05, // 175:1140 - 0x04, 0x79, 0x05, 0x05, // 176:1145 - 0x04, 0x7E, 0x09, 0x05, // 177:1150 - 0x04, 0x87, 0x05, 0x05, // 178:1159 - 0x04, 0x8C, 0x05, 0x05, // 179:1164 - 0x04, 0x91, 0x05, 0x05, // 180:1169 - 0x04, 0x96, 0x09, 0x05, // 181:1174 - 0x04, 0x9F, 0x0A, 0x05, // 182:1183 - 0x04, 0xA9, 0x05, 0x05, // 183:1193 - 0x04, 0xAE, 0x06, 0x05, // 184:1198 - 0x04, 0xB4, 0x07, 0x05, // 185:1204 - 0x04, 0xBB, 0x07, 0x05, // 186:1211 - 0x04, 0xC2, 0x09, 0x05, // 187:1218 - 0x04, 0xCB, 0x08, 0x05, // 188:1227 - 0x04, 0xD3, 0x08, 0x05, // 189:1235 - 0x04, 0xDB, 0x08, 0x05, // 190:1243 - 0x04, 0xE3, 0x08, 0x05, // 191:1251 - 0x04, 0xEB, 0x09, 0x05, // 192:1259 - 0x04, 0xF4, 0x09, 0x05, // 193:1268 - 0x04, 0xFD, 0x09, 0x05, // 194:1277 - 0x05, 0x06, 0x09, 0x05, // 195:1286 - 0x05, 0x0F, 0x09, 0x05, // 196:1295 - 0x05, 0x18, 0x09, 0x05, // 197:1304 - 0x05, 0x21, 0x07, 0x05, // 198:1313 - 0x05, 0x28, 0x09, 0x05, // 199:1320 - 0x05, 0x31, 0x09, 0x05, // 200:1329 - 0x05, 0x3A, 0x09, 0x05, // 201:1338 - 0x05, 0x43, 0x09, 0x05, // 202:1347 - 0x05, 0x4C, 0x09, 0x05, // 203:1356 - 0x05, 0x55, 0x07, 0x05, // 204:1365 - 0x05, 0x5C, 0x07, 0x05, // 205:1372 - 0x05, 0x63, 0x07, 0x05, // 206:1379 - 0x05, 0x6A, 0x07, 0x05, // 207:1386 - 0x05, 0x71, 0x09, 0x05, // 208:1393 - 0x05, 0x7A, 0x09, 0x05, // 209:1402 - 0x05, 0x83, 0x09, 0x05, // 210:1411 - 0x05, 0x8C, 0x09, 0x05, // 211:1420 - 0x05, 0x95, 0x09, 0x05, // 212:1429 - 0x05, 0x9E, 0x09, 0x05, // 213:1438 - 0x05, 0xA7, 0x09, 0x05, // 214:1447 - 0x05, 0xB0, 0x09, 0x05, // 215:1456 - 0x05, 0xB9, 0x09, 0x05, // 216:1465 - 0x05, 0xC2, 0x09, 0x05, // 217:1474 - 0x05, 0xCB, 0x09, 0x05, // 218:1483 - 0x05, 0xD4, 0x09, 0x05, // 219:1492 - 0x05, 0xDD, 0x09, 0x05, // 220:1501 - 0x05, 0xE6, 0x09, 0x05, // 221:1510 - 0x05, 0xEF, 0x09, 0x05, // 222:1519 - 0x05, 0xF8, 0x09, 0x05, // 223:1528 - 0x06, 0x01, 0x09, 0x05, // 224:1537 - 0x06, 0x0A, 0x09, 0x05, // 225:1546 - 0x06, 0x13, 0x09, 0x05, // 226:1555 - 0x06, 0x1C, 0x09, 0x05, // 227:1564 - 0x06, 0x25, 0x09, 0x05, // 228:1573 - 0x06, 0x2E, 0x09, 0x05, // 229:1582 - 0x06, 0x37, 0x09, 0x05, // 230:1591 - 0x06, 0x40, 0x07, 0x05, // 231:1600 - 0x06, 0x47, 0x09, 0x05, // 232:1607 - 0x06, 0x50, 0x09, 0x05, // 233:1616 - 0x06, 0x59, 0x09, 0x05, // 234:1625 - 0x06, 0x62, 0x09, 0x05, // 235:1634 - 0x06, 0x6B, 0x07, 0x05, // 236:1643 - 0x06, 0x72, 0x07, 0x05, // 237:1650 - 0x06, 0x79, 0x07, 0x05, // 238:1657 - 0x06, 0x80, 0x07, 0x05, // 239:1664 - 0x06, 0x87, 0x09, 0x05, // 240:1671 - 0x06, 0x90, 0x09, 0x05, // 241:1680 - 0x06, 0x99, 0x09, 0x05, // 242:1689 - 0x06, 0xA2, 0x09, 0x05, // 243:1698 - 0x06, 0xAB, 0x09, 0x05, // 244:1707 - 0x06, 0xB4, 0x09, 0x05, // 245:1716 - 0x06, 0xBD, 0x09, 0x05, // 246:1725 - 0x06, 0xC6, 0x09, 0x05, // 247:1734 - 0x06, 0xCF, 0x09, 0x05, // 248:1743 - 0x06, 0xD8, 0x09, 0x05, // 249:1752 - 0x06, 0xE1, 0x09, 0x05, // 250:1761 - 0x06, 0xEA, 0x09, 0x05, // 251:1770 - 0x06, 0xF3, 0x09, 0x05, // 252:1779 - 0x06, 0xFC, 0x09, 0x05, // 253:1788 - 0x07, 0x05, 0x09, 0x05, // 254:1797 - 0x07, 0x0E, 0x09, 0x05, // 255:1806 - - // Font Data: - 0x00, 0x00, 0x00, 0x00, 0xBC, // 33 - 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, // 34 - 0xA8, 0x00, 0x7C, 0x00, 0xEA, 0x00, 0x3E, 0x00, 0x28, // 35 - 0x98, 0x00, 0xA8, 0x00, 0xFC, 0x01, 0xA8, 0x00, 0xC8, // 36 - 0x1C, 0x00, 0x34, 0x00, 0xFC, 0x00, 0xB0, 0x00, 0xE0, // 37 - 0x00, 0x00, 0x60, 0x00, 0x9C, 0x00, 0xF4, 0x00, 0xA4, // 38 - 0x00, 0x00, 0x00, 0x00, 0x0C, // 39 - 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x82, // 40 - 0x00, 0x00, 0x82, 0x00, 0x7C, // 41 - 0x24, 0x00, 0x18, 0x00, 0x3C, 0x00, 0x18, 0x00, 0x24, // 42 - 0x20, 0x00, 0x20, 0x00, 0xF8, 0x00, 0x20, 0x00, 0x20, // 43 - 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, // 44 - 0x00, 0x00, 0x20, 0x00, 0x20, // 45 - 0x00, 0x00, 0x00, 0x00, 0x80, // 46 - 0x00, 0x01, 0xE0, 0x00, 0x18, 0x00, 0x04, // 47 - 0x00, 0x00, 0x78, 0x00, 0x94, 0x00, 0x84, 0x00, 0x78, // 48 - 0x00, 0x00, 0x84, 0x00, 0xFC, 0x00, 0x80, // 49 - 0x00, 0x00, 0x84, 0x00, 0xC4, 0x00, 0xA4, 0x00, 0x98, // 50 - 0x00, 0x00, 0x84, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0xD8, // 51 - 0x00, 0x00, 0x60, 0x00, 0x58, 0x00, 0xFC, 0x00, 0x40, // 52 - 0x00, 0x00, 0x9C, 0x00, 0x94, 0x00, 0x94, 0x00, 0x64, // 53 - 0x00, 0x00, 0x78, 0x00, 0xAC, 0x00, 0xA4, 0x00, 0xE4, // 54 - 0x00, 0x00, 0x04, 0x00, 0x84, 0x00, 0x74, 0x00, 0x0C, // 55 - 0x00, 0x00, 0xD8, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0xD8, // 56 - 0x00, 0x00, 0x9C, 0x00, 0x94, 0x00, 0xD4, 0x00, 0x78, // 57 - 0x00, 0x00, 0x00, 0x00, 0x90, // 58 - 0x00, 0x00, 0x00, 0x00, 0x90, 0x01, // 59 - 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0xA0, 0x00, 0x90, // 60 - 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 0x50, // 61 - 0x00, 0x00, 0x90, 0x00, 0xA0, 0x00, 0x60, 0x00, 0x60, // 62 - 0x00, 0x00, 0x04, 0x00, 0xBC, 0x00, 0x0C, // 63 - 0x00, 0x00, 0xF0, 0x00, 0x08, 0x01, 0x68, 0x01, 0x70, // 64 - 0x00, 0x00, 0xC0, 0x00, 0x7C, 0x00, 0x7C, 0x00, 0xC0, // 65 - 0x00, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0xD8, // 66 - 0x00, 0x00, 0x78, 0x00, 0x84, 0x00, 0x84, 0x00, 0x84, // 67 - 0x00, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 68 - 0x00, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0xA4, // 69 - 0x00, 0x00, 0xFC, 0x00, 0x24, 0x00, 0x24, 0x00, 0x24, // 70 - 0x00, 0x00, 0x78, 0x00, 0x84, 0x00, 0xA4, 0x00, 0xE4, // 71 - 0x00, 0x00, 0xFC, 0x00, 0x20, 0x00, 0x20, 0x00, 0xFC, // 72 - 0x00, 0x00, 0x84, 0x00, 0xFC, 0x00, 0x84, // 73 - 0x00, 0x00, 0x80, 0x00, 0x84, 0x00, 0xFC, // 74 - 0x00, 0x00, 0xFC, 0x00, 0x10, 0x00, 0x68, 0x00, 0x84, // 75 - 0x00, 0x00, 0xFC, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, // 76 - 0x00, 0x00, 0xFC, 0x00, 0x38, 0x00, 0x38, 0x00, 0xFC, // 77 - 0x00, 0x00, 0xFC, 0x00, 0x18, 0x00, 0x60, 0x00, 0xFC, // 78 - 0x00, 0x00, 0x78, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 79 - 0x00, 0x00, 0xFC, 0x00, 0x14, 0x00, 0x14, 0x00, 0x1C, // 80 - 0x00, 0x00, 0x78, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, 0x01, // 81 - 0x00, 0x00, 0xFC, 0x00, 0x14, 0x00, 0x34, 0x00, 0x6C, // 82 - 0x00, 0x00, 0x98, 0x00, 0x94, 0x00, 0xB4, 0x00, 0xE4, // 83 - 0x04, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x04, 0x00, 0x04, // 84 - 0x00, 0x00, 0x7C, 0x00, 0x80, 0x00, 0x80, 0x00, 0x7C, // 85 - 0x00, 0x00, 0x0C, 0x00, 0xF0, 0x00, 0xF0, 0x00, 0x0C, // 86 - 0x1C, 0x00, 0xE0, 0x00, 0x10, 0x00, 0xE0, 0x00, 0x1C, // 87 - 0x00, 0x00, 0x84, 0x00, 0x78, 0x00, 0x78, 0x00, 0x84, // 88 - 0x04, 0x00, 0x08, 0x00, 0xF0, 0x00, 0x08, 0x00, 0x04, // 89 - 0x00, 0x00, 0x84, 0x00, 0xE4, 0x00, 0x9C, 0x00, 0x84, // 90 - 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x82, // 91 - 0x04, 0x00, 0x38, 0x00, 0xC0, 0x00, 0x00, 0x01, // 92 - 0x00, 0x00, 0x82, 0x00, 0xFE, // 93 - 0x08, 0x00, 0x04, 0x00, 0x04, 0x00, 0x08, // 94 - 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, // 95 - 0x00, 0x00, 0x04, // 96 - 0x00, 0x00, 0xF0, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xF0, // 97 - 0x00, 0x00, 0xFE, 0x00, 0x90, 0x00, 0x90, 0x00, 0x60, // 98 - 0x00, 0x00, 0x60, 0x00, 0x90, 0x00, 0x90, // 99 - 0x00, 0x00, 0x60, 0x00, 0x90, 0x00, 0x90, 0x00, 0xFE, // 100 - 0x00, 0x00, 0x60, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xB0, // 101 - 0x00, 0x00, 0x10, 0x00, 0xFC, 0x00, 0x12, 0x00, 0x12, // 102 - 0x00, 0x00, 0x60, 0x02, 0x90, 0x02, 0x90, 0x02, 0xF0, 0x01, // 103 - 0x00, 0x00, 0xFE, 0x00, 0x10, 0x00, 0x10, 0x00, 0xF0, // 104 - 0x00, 0x00, 0x90, 0x00, 0xF2, 0x00, 0x80, // 105 - 0x00, 0x02, 0x10, 0x02, 0xF2, 0x03, // 106 - 0x00, 0x00, 0xFE, 0x00, 0x60, 0x00, 0xF0, 0x00, 0x90, // 107 - 0x00, 0x00, 0x02, 0x00, 0xFE, 0x00, 0x80, 0x00, 0x80, // 108 - 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, 0xF0, 0x00, 0x10, // 109 - 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, 0x10, 0x00, 0xF0, // 110 - 0x00, 0x00, 0x60, 0x00, 0x90, 0x00, 0x90, 0x00, 0x60, // 111 - 0x00, 0x00, 0xF0, 0x03, 0x90, 0x00, 0x90, 0x00, 0x60, // 112 - 0x00, 0x00, 0x60, 0x00, 0x90, 0x00, 0x90, 0x00, 0xF0, 0x03, // 113 - 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, 0x10, // 114 - 0x00, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xD0, // 115 - 0x00, 0x00, 0x10, 0x00, 0xF8, 0x00, 0x90, 0x00, 0x90, // 116 - 0x00, 0x00, 0xF0, 0x00, 0x80, 0x00, 0x80, 0x00, 0xF0, // 117 - 0x00, 0x00, 0x10, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x10, // 118 - 0x30, 0x00, 0xC0, 0x00, 0x60, 0x00, 0xC0, 0x00, 0x30, // 119 - 0x00, 0x00, 0x90, 0x00, 0xF0, 0x00, 0xF0, 0x00, 0x90, // 120 - 0x00, 0x00, 0x10, 0x02, 0xE0, 0x03, 0x60, 0x00, 0x10, // 121 - 0x00, 0x00, 0x90, 0x00, 0xF0, 0x00, 0xB0, 0x00, 0x90, // 122 - 0x00, 0x00, 0x10, 0x00, 0xEE, 0x00, 0x82, // 123 - 0x00, 0x00, 0x00, 0x00, 0xFE, 0x01, // 124 - 0x00, 0x00, 0x82, 0x00, 0xEE, 0x00, 0x10, // 125 - 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, // 126 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 127 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 128 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 129 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 130 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 131 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 132 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 133 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 134 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 135 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 136 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 137 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 138 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 139 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 140 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 141 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 142 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 143 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 144 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 145 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 146 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 147 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 148 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 149 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 150 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 151 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 152 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 153 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 154 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 155 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 156 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 157 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 158 - 0xFC, 0x01, 0x04, 0x01, 0x04, 0x01, 0xFC, 0x01, // 159 - 0x00, 0x00, 0x00, 0x00, 0xD0, 0x03, // 161 - 0x00, 0x00, 0xF0, 0x00, 0xF8, 0x01, 0x90, // 162 - 0xA0, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0x84, // 163 - 0x00, 0x00, 0x70, 0x00, 0x50, 0x00, 0x70, // 164 - 0x54, 0x00, 0x58, 0x00, 0xE0, 0x00, 0x58, 0x00, 0x54, // 165 - 0x00, 0x00, 0x00, 0x00, 0xDC, 0x01, // 166 - 0x00, 0x00, 0x3C, 0x01, 0x54, 0x01, 0xE4, 0x01, // 167 - 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, // 168 - 0x70, 0x00, 0x88, 0x00, 0xB8, 0x00, 0xB8, 0x00, 0x70, // 169 - 0x00, 0x00, 0x5C, 0x00, 0x5C, 0x00, 0x5C, // 170 - 0x60, 0x00, 0x90, 0x00, 0x60, 0x00, 0x90, // 171 - 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x60, // 172 - 0x00, 0x00, 0x20, 0x00, 0x20, // 173 - 0x70, 0x00, 0x88, 0x00, 0xB8, 0x00, 0xF8, 0x00, 0x70, // 174 - 0x00, 0x00, 0x04, 0x00, 0x04, // 175 - 0x00, 0x00, 0x0C, 0x00, 0x0C, // 176 - 0xA0, 0x00, 0xA0, 0x00, 0xF0, 0x00, 0xA0, 0x00, 0xA0, // 177 - 0x00, 0x00, 0x1C, 0x00, 0x14, // 178 - 0x00, 0x00, 0x1C, 0x00, 0x14, // 179 - 0x00, 0x00, 0x00, 0x00, 0x04, // 180 - 0x00, 0x00, 0xF0, 0x03, 0x80, 0x00, 0x80, 0x00, 0xF0, // 181 - 0x00, 0x00, 0x1C, 0x00, 0xFC, 0x01, 0x04, 0x00, 0xFC, 0x01, // 182 - 0x00, 0x00, 0x00, 0x00, 0x20, // 183 - 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, // 184 - 0x00, 0x00, 0x14, 0x00, 0x1C, 0x00, 0x10, // 185 - 0x00, 0x00, 0x5C, 0x00, 0x54, 0x00, 0x5C, // 186 - 0x00, 0x00, 0x90, 0x00, 0x60, 0x00, 0x90, 0x00, 0x60, // 187 - 0x4A, 0x00, 0x4E, 0x00, 0xA8, 0x00, 0xE0, 0x01, // 188 - 0x4A, 0x00, 0x4E, 0x00, 0xE8, 0x01, 0x60, 0x01, // 189 - 0x4E, 0x00, 0x4A, 0x00, 0xA0, 0x00, 0xE0, 0x01, // 190 - 0x00, 0x00, 0x00, 0x03, 0xD0, 0x03, 0x00, 0x02, // 191 - 0x00, 0x00, 0xC2, 0x00, 0x7C, 0x00, 0x7C, 0x00, 0xC0, // 192 - 0x00, 0x00, 0xC0, 0x00, 0x7E, 0x00, 0x7C, 0x00, 0xC0, // 193 - 0x00, 0x00, 0xC0, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0xC0, // 194 - 0x00, 0x00, 0xC0, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0xC0, // 195 - 0x00, 0x00, 0xC0, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0xC0, // 196 - 0x00, 0x00, 0x80, 0x00, 0x7E, 0x00, 0x72, 0x00, 0x80, // 197 - 0xC0, 0x00, 0x7C, 0x00, 0xFC, 0x00, 0xA4, // 198 - 0x00, 0x00, 0x78, 0x02, 0x84, 0x03, 0x84, 0x00, 0x84, // 199 - 0x00, 0x00, 0xFE, 0x00, 0xA4, 0x00, 0xA4, 0x00, 0xA4, // 200 - 0x00, 0x00, 0xFC, 0x00, 0xA6, 0x00, 0xA4, 0x00, 0xA4, // 201 - 0x00, 0x00, 0xFE, 0x00, 0xA6, 0x00, 0xA4, 0x00, 0xA4, // 202 - 0x00, 0x00, 0xFE, 0x00, 0xA4, 0x00, 0xA6, 0x00, 0xA4, // 203 - 0x00, 0x00, 0x86, 0x00, 0xFC, 0x00, 0x84, // 204 - 0x00, 0x00, 0x84, 0x00, 0xFE, 0x00, 0x84, // 205 - 0x00, 0x00, 0x86, 0x00, 0xFE, 0x00, 0x84, // 206 - 0x00, 0x00, 0x86, 0x00, 0xFC, 0x00, 0x86, // 207 - 0x20, 0x00, 0xFC, 0x00, 0xA4, 0x00, 0x84, 0x00, 0x78, // 208 - 0x00, 0x00, 0xFC, 0x00, 0x1A, 0x00, 0x62, 0x00, 0xFC, // 209 - 0x00, 0x00, 0x7A, 0x00, 0x84, 0x00, 0x84, 0x00, 0x78, // 210 - 0x00, 0x00, 0x78, 0x00, 0x86, 0x00, 0x84, 0x00, 0x78, // 211 - 0x00, 0x00, 0x78, 0x00, 0x86, 0x00, 0x86, 0x00, 0x78, // 212 - 0x00, 0x00, 0x78, 0x00, 0x86, 0x00, 0x86, 0x00, 0x78, // 213 - 0x00, 0x00, 0x78, 0x00, 0x86, 0x00, 0x86, 0x00, 0x78, // 214 - 0x00, 0x00, 0x90, 0x00, 0x60, 0x00, 0x60, 0x00, 0x90, // 215 - 0x80, 0x00, 0x78, 0x00, 0xA4, 0x00, 0x94, 0x00, 0x7C, // 216 - 0x00, 0x00, 0x7E, 0x00, 0x80, 0x00, 0x80, 0x00, 0x7C, // 217 - 0x00, 0x00, 0x7C, 0x00, 0x82, 0x00, 0x80, 0x00, 0x7C, // 218 - 0x00, 0x00, 0x7C, 0x00, 0x82, 0x00, 0x82, 0x00, 0x7C, // 219 - 0x00, 0x00, 0x7C, 0x00, 0x82, 0x00, 0x82, 0x00, 0x7C, // 220 - 0x04, 0x00, 0x08, 0x00, 0xF2, 0x00, 0x08, 0x00, 0x04, // 221 - 0x00, 0x00, 0xFC, 0x00, 0x28, 0x00, 0x28, 0x00, 0x38, // 222 - 0x00, 0x00, 0xFC, 0x00, 0x02, 0x00, 0x9A, 0x00, 0xE4, // 223 - 0x00, 0x00, 0xF4, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xF0, // 224 - 0x00, 0x00, 0xF0, 0x00, 0xB4, 0x00, 0xB0, 0x00, 0xF0, // 225 - 0x00, 0x00, 0xF4, 0x00, 0xB4, 0x00, 0xB0, 0x00, 0xF0, // 226 - 0x00, 0x00, 0xFC, 0x00, 0xBC, 0x00, 0xBC, 0x00, 0xF0, // 227 - 0x00, 0x00, 0xF4, 0x00, 0xB0, 0x00, 0xB4, 0x00, 0xF0, // 228 - 0x00, 0x00, 0xF6, 0x00, 0xB6, 0x00, 0xB0, 0x00, 0xF0, // 229 - 0x00, 0x00, 0xF0, 0x00, 0x60, 0x00, 0xB0, 0x00, 0xB0, // 230 - 0x00, 0x00, 0x60, 0x02, 0x90, 0x03, 0x90, // 231 - 0x00, 0x00, 0x64, 0x00, 0xB0, 0x00, 0xB0, 0x00, 0xB0, // 232 - 0x00, 0x00, 0x60, 0x00, 0xB4, 0x00, 0xB0, 0x00, 0xB0, // 233 - 0x00, 0x00, 0x64, 0x00, 0xB4, 0x00, 0xB0, 0x00, 0xB0, // 234 - 0x00, 0x00, 0x64, 0x00, 0xB0, 0x00, 0xB4, 0x00, 0xB0, // 235 - 0x00, 0x00, 0x94, 0x00, 0xF0, 0x00, 0x80, // 236 - 0x00, 0x00, 0x90, 0x00, 0xF4, 0x00, 0x80, // 237 - 0x00, 0x00, 0x94, 0x00, 0xF4, 0x00, 0x80, // 238 - 0x00, 0x00, 0x94, 0x00, 0xF0, 0x00, 0x84, // 239 - 0x00, 0x00, 0x60, 0x00, 0x96, 0x00, 0x9C, 0x00, 0x70, // 240 - 0x00, 0x00, 0xFC, 0x00, 0x1C, 0x00, 0x1C, 0x00, 0xF0, // 241 - 0x00, 0x00, 0x64, 0x00, 0x90, 0x00, 0x90, 0x00, 0x60, // 242 - 0x00, 0x00, 0x60, 0x00, 0x94, 0x00, 0x90, 0x00, 0x60, // 243 - 0x00, 0x00, 0x60, 0x00, 0x94, 0x00, 0x94, 0x00, 0x60, // 244 - 0x00, 0x00, 0x60, 0x00, 0x9C, 0x00, 0x9C, 0x00, 0x60, // 245 - 0x00, 0x00, 0x64, 0x00, 0x90, 0x00, 0x90, 0x00, 0x64, // 246 - 0x20, 0x00, 0x20, 0x00, 0xA8, 0x00, 0x20, 0x00, 0x20, // 247 - 0x00, 0x00, 0xF0, 0x00, 0xD0, 0x00, 0xB0, 0x00, 0xF0, // 248 - 0x00, 0x00, 0xF4, 0x00, 0x80, 0x00, 0x80, 0x00, 0xF0, // 249 - 0x00, 0x00, 0xF0, 0x00, 0x84, 0x00, 0x80, 0x00, 0xF0, // 250 - 0x00, 0x00, 0xF0, 0x00, 0x84, 0x00, 0x84, 0x00, 0xF0, // 251 - 0x00, 0x00, 0xF4, 0x00, 0x80, 0x00, 0x80, 0x00, 0xF4, // 252 - 0x00, 0x00, 0x10, 0x02, 0xE4, 0x03, 0x60, 0x00, 0x10, // 253 - 0x00, 0x00, 0xFE, 0x03, 0x90, 0x00, 0x90, 0x00, 0x60, // 254 - 0x00, 0x00, 0x14, 0x02, 0xE0, 0x03, 0x64, 0x00, 0x10 // 255 -}; - -#endif // ifndef MONOSPACED_PLAIN_8_FONT_H diff --git a/lib/esp8266-oled-ssd1306/SansSerif_Plain_8_font.h b/lib/esp8266-oled-ssd1306/SansSerif_Plain_8_font.h deleted file mode 100644 index 0b079ba97..000000000 --- a/lib/esp8266-oled-ssd1306/SansSerif_Plain_8_font.h +++ /dev/null @@ -1,492 +0,0 @@ -/**The MIT License (MIT) - -Copyright (c) 2015 by Daniel Eichhorn - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -See more at http://blog.squix.ch -*/ - -#ifndef SANSSERIF_PLAIN_8_FONT_H -#define SANSSERIF_PLAIN_8_FONT_H - -// OLED library version >= 3.0.0 -// Created by http://oleddisplay.squix.ch/ Consider a donation -// In case of problems make sure that you are using the font file with the correct version! -// Created by http://oleddisplay.squix.ch/ Consider a donation -// In case of problems make sure that you are using the font file with the correct version! -const char SansSerif_plain_8[] PROGMEM = { - 0x08, // Width: 8 - 0x0A, // Height: 10 - 0x20, // First Char: 32 - 0xE0, // Numbers of Chars: 224 - - // Jump Table: - 0xFF, 0xFF, 0x00, 0x03, // 32:65535 - 0x00, 0x00, 0x03, 0x03, // 33:0 - 0x00, 0x03, 0x07, 0x04, // 34:3 - 0x00, 0x0A, 0x0B, 0x07, // 35:10 - 0x00, 0x15, 0x09, 0x05, // 36:21 - 0x00, 0x1E, 0x0F, 0x08, // 37:30 - 0x00, 0x2D, 0x0B, 0x06, // 38:45 - 0x00, 0x38, 0x03, 0x02, // 39:56 - 0x00, 0x3B, 0x05, 0x03, // 40:59 - 0x00, 0x40, 0x05, 0x03, // 41:64 - 0x00, 0x45, 0x07, 0x04, // 42:69 - 0x00, 0x4C, 0x0B, 0x07, // 43:76 - 0x00, 0x57, 0x04, 0x03, // 44:87 - 0x00, 0x5B, 0x05, 0x03, // 45:91 - 0x00, 0x60, 0x03, 0x03, // 46:96 - 0x00, 0x63, 0x05, 0x03, // 47:99 - 0x00, 0x68, 0x09, 0x05, // 48:104 - 0x00, 0x71, 0x07, 0x05, // 49:113 - 0x00, 0x78, 0x09, 0x05, // 50:120 - 0x00, 0x81, 0x09, 0x05, // 51:129 - 0x00, 0x8A, 0x09, 0x05, // 52:138 - 0x00, 0x93, 0x09, 0x05, // 53:147 - 0x00, 0x9C, 0x09, 0x05, // 54:156 - 0x00, 0xA5, 0x09, 0x05, // 55:165 - 0x00, 0xAE, 0x09, 0x05, // 56:174 - 0x00, 0xB7, 0x09, 0x05, // 57:183 - 0x00, 0xC0, 0x03, 0x03, // 58:192 - 0x00, 0xC3, 0x04, 0x03, // 59:195 - 0x00, 0xC7, 0x0B, 0x07, // 60:199 - 0x00, 0xD2, 0x0B, 0x07, // 61:210 - 0x00, 0xDD, 0x0B, 0x07, // 62:221 - 0x00, 0xE8, 0x07, 0x04, // 63:232 - 0x00, 0xEF, 0x0F, 0x08, // 64:239 - 0x00, 0xFE, 0x09, 0x05, // 65:254 - 0x01, 0x07, 0x09, 0x05, // 66:263 - 0x01, 0x10, 0x0B, 0x06, // 67:272 - 0x01, 0x1B, 0x0B, 0x06, // 68:283 - 0x01, 0x26, 0x09, 0x05, // 69:294 - 0x01, 0x2F, 0x07, 0x05, // 70:303 - 0x01, 0x36, 0x0B, 0x06, // 71:310 - 0x01, 0x41, 0x09, 0x06, // 72:321 - 0x01, 0x4A, 0x03, 0x02, // 73:330 - 0x01, 0x4D, 0x04, 0x02, // 74:333 - 0x01, 0x51, 0x09, 0x05, // 75:337 - 0x01, 0x5A, 0x07, 0x04, // 76:346 - 0x01, 0x61, 0x0B, 0x07, // 77:353 - 0x01, 0x6C, 0x09, 0x06, // 78:364 - 0x01, 0x75, 0x0B, 0x06, // 79:373 - 0x01, 0x80, 0x09, 0x05, // 80:384 - 0x01, 0x89, 0x0B, 0x06, // 81:393 - 0x01, 0x94, 0x0B, 0x06, // 82:404 - 0x01, 0x9F, 0x09, 0x05, // 83:415 - 0x01, 0xA8, 0x09, 0x05, // 84:424 - 0x01, 0xB1, 0x09, 0x06, // 85:433 - 0x01, 0xBA, 0x09, 0x05, // 86:442 - 0x01, 0xC3, 0x0D, 0x08, // 87:451 - 0x01, 0xD0, 0x09, 0x05, // 88:464 - 0x01, 0xD9, 0x09, 0x05, // 89:473 - 0x01, 0xE2, 0x09, 0x05, // 90:482 - 0x01, 0xEB, 0x06, 0x03, // 91:491 - 0x01, 0xF1, 0x06, 0x03, // 92:497 - 0x01, 0xF7, 0x06, 0x03, // 93:503 - 0x01, 0xFD, 0x09, 0x07, // 94:509 - 0x02, 0x06, 0x08, 0x04, // 95:518 - 0x02, 0x0E, 0x03, 0x04, // 96:526 - 0x02, 0x11, 0x09, 0x05, // 97:529 - 0x02, 0x1A, 0x09, 0x05, // 98:538 - 0x02, 0x23, 0x07, 0x04, // 99:547 - 0x02, 0x2A, 0x09, 0x05, // 100:554 - 0x02, 0x33, 0x09, 0x05, // 101:563 - 0x02, 0x3C, 0x05, 0x03, // 102:572 - 0x02, 0x41, 0x0A, 0x05, // 103:577 - 0x02, 0x4B, 0x09, 0x05, // 104:587 - 0x02, 0x54, 0x03, 0x02, // 105:596 - 0x02, 0x57, 0x04, 0x02, // 106:599 - 0x02, 0x5B, 0x07, 0x05, // 107:603 - 0x02, 0x62, 0x03, 0x02, // 108:610 - 0x02, 0x65, 0x0F, 0x08, // 109:613 - 0x02, 0x74, 0x09, 0x05, // 110:628 - 0x02, 0x7D, 0x09, 0x05, // 111:637 - 0x02, 0x86, 0x09, 0x05, // 112:646 - 0x02, 0x8F, 0x0A, 0x05, // 113:655 - 0x02, 0x99, 0x05, 0x03, // 114:665 - 0x02, 0x9E, 0x07, 0x04, // 115:670 - 0x02, 0xA5, 0x05, 0x03, // 116:677 - 0x02, 0xAA, 0x09, 0x05, // 117:682 - 0x02, 0xB3, 0x07, 0x05, // 118:691 - 0x02, 0xBA, 0x0B, 0x07, // 119:698 - 0x02, 0xC5, 0x07, 0x05, // 120:709 - 0x02, 0xCC, 0x09, 0x05, // 121:716 - 0x02, 0xD5, 0x07, 0x04, // 122:725 - 0x02, 0xDC, 0x08, 0x05, // 123:732 - 0x02, 0xE4, 0x04, 0x03, // 124:740 - 0x02, 0xE8, 0x07, 0x05, // 125:744 - 0x02, 0xEF, 0x0B, 0x07, // 126:751 - 0x02, 0xFA, 0x08, 0x05, // 127:762 - 0x03, 0x02, 0x08, 0x05, // 128:770 - 0x03, 0x0A, 0x08, 0x05, // 129:778 - 0x03, 0x12, 0x08, 0x05, // 130:786 - 0x03, 0x1A, 0x08, 0x05, // 131:794 - 0x03, 0x22, 0x08, 0x05, // 132:802 - 0x03, 0x2A, 0x08, 0x05, // 133:810 - 0x03, 0x32, 0x08, 0x05, // 134:818 - 0x03, 0x3A, 0x08, 0x05, // 135:826 - 0x03, 0x42, 0x08, 0x05, // 136:834 - 0x03, 0x4A, 0x08, 0x05, // 137:842 - 0x03, 0x52, 0x08, 0x05, // 138:850 - 0x03, 0x5A, 0x08, 0x05, // 139:858 - 0x03, 0x62, 0x08, 0x05, // 140:866 - 0x03, 0x6A, 0x08, 0x05, // 141:874 - 0x03, 0x72, 0x08, 0x05, // 142:882 - 0x03, 0x7A, 0x08, 0x05, // 143:890 - 0x03, 0x82, 0x08, 0x05, // 144:898 - 0x03, 0x8A, 0x08, 0x05, // 145:906 - 0x03, 0x92, 0x08, 0x05, // 146:914 - 0x03, 0x9A, 0x08, 0x05, // 147:922 - 0x03, 0xA2, 0x08, 0x05, // 148:930 - 0x03, 0xAA, 0x08, 0x05, // 149:938 - 0x03, 0xB2, 0x08, 0x05, // 150:946 - 0x03, 0xBA, 0x08, 0x05, // 151:954 - 0x03, 0xC2, 0x08, 0x05, // 152:962 - 0x03, 0xCA, 0x08, 0x05, // 153:970 - 0x03, 0xD2, 0x08, 0x05, // 154:978 - 0x03, 0xDA, 0x08, 0x05, // 155:986 - 0x03, 0xE2, 0x08, 0x05, // 156:994 - 0x03, 0xEA, 0x08, 0x05, // 157:1002 - 0x03, 0xF2, 0x08, 0x05, // 158:1010 - 0x03, 0xFA, 0x08, 0x05, // 159:1018 - 0xFF, 0xFF, 0x00, 0x03, // 160:65535 - 0x04, 0x02, 0x04, 0x03, // 161:1026 - 0x04, 0x06, 0x07, 0x05, // 162:1030 - 0x04, 0x0D, 0x07, 0x05, // 163:1037 - 0x04, 0x14, 0x09, 0x05, // 164:1044 - 0x04, 0x1D, 0x09, 0x05, // 165:1053 - 0x04, 0x26, 0x04, 0x03, // 166:1062 - 0x04, 0x2A, 0x08, 0x04, // 167:1066 - 0x04, 0x32, 0x07, 0x04, // 168:1074 - 0x04, 0x39, 0x0D, 0x08, // 169:1081 - 0x04, 0x46, 0x07, 0x04, // 170:1094 - 0x04, 0x4D, 0x09, 0x05, // 171:1101 - 0x04, 0x56, 0x0B, 0x07, // 172:1110 - 0x04, 0x61, 0x05, 0x03, // 173:1121 - 0x04, 0x66, 0x0D, 0x08, // 174:1126 - 0x04, 0x73, 0x05, 0x04, // 175:1139 - 0x04, 0x78, 0x05, 0x04, // 176:1144 - 0x04, 0x7D, 0x0B, 0x07, // 177:1149 - 0x04, 0x88, 0x05, 0x03, // 178:1160 - 0x04, 0x8D, 0x05, 0x03, // 179:1165 - 0x04, 0x92, 0x03, 0x04, // 180:1170 - 0x04, 0x95, 0x09, 0x05, // 181:1173 - 0x04, 0x9E, 0x0A, 0x05, // 182:1182 - 0x04, 0xA8, 0x03, 0x03, // 183:1192 - 0x04, 0xAB, 0x06, 0x04, // 184:1195 - 0x04, 0xB1, 0x05, 0x03, // 185:1201 - 0x04, 0xB6, 0x07, 0x04, // 186:1206 - 0x04, 0xBD, 0x09, 0x05, // 187:1213 - 0x04, 0xC6, 0x0F, 0x08, // 188:1222 - 0x04, 0xD5, 0x0F, 0x08, // 189:1237 - 0x04, 0xE4, 0x0F, 0x08, // 190:1252 - 0x04, 0xF3, 0x08, 0x04, // 191:1267 - 0x04, 0xFB, 0x09, 0x05, // 192:1275 - 0x05, 0x04, 0x09, 0x05, // 193:1284 - 0x05, 0x0D, 0x09, 0x05, // 194:1293 - 0x05, 0x16, 0x09, 0x05, // 195:1302 - 0x05, 0x1F, 0x09, 0x05, // 196:1311 - 0x05, 0x28, 0x09, 0x05, // 197:1320 - 0x05, 0x31, 0x0D, 0x08, // 198:1329 - 0x05, 0x3E, 0x0B, 0x06, // 199:1342 - 0x05, 0x49, 0x09, 0x05, // 200:1353 - 0x05, 0x52, 0x09, 0x05, // 201:1362 - 0x05, 0x5B, 0x09, 0x05, // 202:1371 - 0x05, 0x64, 0x09, 0x05, // 203:1380 - 0x05, 0x6D, 0x03, 0x02, // 204:1389 - 0x05, 0x70, 0x03, 0x02, // 205:1392 - 0x05, 0x73, 0x03, 0x02, // 206:1395 - 0x05, 0x76, 0x03, 0x02, // 207:1398 - 0x05, 0x79, 0x0B, 0x06, // 208:1401 - 0x05, 0x84, 0x09, 0x06, // 209:1412 - 0x05, 0x8D, 0x0B, 0x06, // 210:1421 - 0x05, 0x98, 0x0B, 0x06, // 211:1432 - 0x05, 0xA3, 0x0B, 0x06, // 212:1443 - 0x05, 0xAE, 0x0B, 0x06, // 213:1454 - 0x05, 0xB9, 0x0B, 0x06, // 214:1465 - 0x05, 0xC4, 0x0B, 0x07, // 215:1476 - 0x05, 0xCF, 0x0B, 0x06, // 216:1487 - 0x05, 0xDA, 0x09, 0x06, // 217:1498 - 0x05, 0xE3, 0x09, 0x06, // 218:1507 - 0x05, 0xEC, 0x09, 0x06, // 219:1516 - 0x05, 0xF5, 0x09, 0x06, // 220:1525 - 0x05, 0xFE, 0x09, 0x05, // 221:1534 - 0x06, 0x07, 0x09, 0x05, // 222:1543 - 0x06, 0x10, 0x09, 0x05, // 223:1552 - 0x06, 0x19, 0x09, 0x05, // 224:1561 - 0x06, 0x22, 0x09, 0x05, // 225:1570 - 0x06, 0x2B, 0x09, 0x05, // 226:1579 - 0x06, 0x34, 0x09, 0x05, // 227:1588 - 0x06, 0x3D, 0x09, 0x05, // 228:1597 - 0x06, 0x46, 0x09, 0x05, // 229:1606 - 0x06, 0x4F, 0x0F, 0x08, // 230:1615 - 0x06, 0x5E, 0x08, 0x04, // 231:1630 - 0x06, 0x66, 0x09, 0x05, // 232:1638 - 0x06, 0x6F, 0x09, 0x05, // 233:1647 - 0x06, 0x78, 0x09, 0x05, // 234:1656 - 0x06, 0x81, 0x09, 0x05, // 235:1665 - 0x06, 0x8A, 0x03, 0x02, // 236:1674 - 0x06, 0x8D, 0x03, 0x02, // 237:1677 - 0x06, 0x90, 0x03, 0x02, // 238:1680 - 0x06, 0x93, 0x03, 0x02, // 239:1683 - 0x06, 0x96, 0x09, 0x05, // 240:1686 - 0x06, 0x9F, 0x09, 0x05, // 241:1695 - 0x06, 0xA8, 0x09, 0x05, // 242:1704 - 0x06, 0xB1, 0x09, 0x05, // 243:1713 - 0x06, 0xBA, 0x09, 0x05, // 244:1722 - 0x06, 0xC3, 0x09, 0x05, // 245:1731 - 0x06, 0xCC, 0x09, 0x05, // 246:1740 - 0x06, 0xD5, 0x0B, 0x07, // 247:1749 - 0x06, 0xE0, 0x09, 0x05, // 248:1760 - 0x06, 0xE9, 0x09, 0x05, // 249:1769 - 0x06, 0xF2, 0x09, 0x05, // 250:1778 - 0x06, 0xFB, 0x09, 0x05, // 251:1787 - 0x07, 0x04, 0x09, 0x05, // 252:1796 - 0x07, 0x0D, 0x09, 0x05, // 253:1805 - 0x07, 0x16, 0x09, 0x05, // 254:1814 - 0x07, 0x1F, 0x09, 0x05, // 255:1823 - - // Font Data: - 0x00,0x00,0xBC, // 33 - 0x00,0x00,0x0C,0x00,0x00,0x00,0x0C, // 34 - 0x00,0x00,0xA8,0x00,0x7C,0x00,0xEA,0x00,0x3E,0x00,0x28, // 35 - 0x00,0x00,0x98,0x00,0xA8,0x00,0xFC,0x01,0xA8, // 36 - 0x00,0x00,0x1C,0x00,0x14,0x00,0xDC,0x00,0x30,0x00,0xEC,0x00,0xA0,0x00,0xE0, // 37 - 0x00,0x00,0x60,0x00,0xBC,0x00,0xF4,0x00,0xC4,0x00,0xA0, // 38 - 0x00,0x00,0x0C, // 39 - 0x00,0x00,0x7C,0x00,0x82, // 40 - 0x00,0x00,0x82,0x00,0x7C, // 41 - 0x24,0x00,0x18,0x00,0x3C,0x00,0x18, // 42 - 0x00,0x00,0x20,0x00,0x20,0x00,0xF8,0x00,0x20,0x00,0x20, // 43 - 0x00,0x00,0x80,0x01, // 44 - 0x00,0x00,0x20,0x00,0x20, // 45 - 0x00,0x00,0x80, // 46 - 0x80,0x01,0x70,0x00,0x0C, // 47 - 0x00,0x00,0x78,0x00,0x84,0x00,0x84,0x00,0x78, // 48 - 0x00,0x00,0x84,0x00,0xFC,0x00,0x80, // 49 - 0x00,0x00,0x84,0x00,0xC4,0x00,0xA4,0x00,0x98, // 50 - 0x00,0x00,0x84,0x00,0xA4,0x00,0xA4,0x00,0xD8, // 51 - 0x00,0x00,0x60,0x00,0x58,0x00,0xFC,0x00,0x40, // 52 - 0x00,0x00,0x9C,0x00,0x94,0x00,0x94,0x00,0x64, // 53 - 0x00,0x00,0x78,0x00,0xAC,0x00,0xA4,0x00,0xE4, // 54 - 0x00,0x00,0x04,0x00,0x84,0x00,0x74,0x00,0x0C, // 55 - 0x00,0x00,0xD8,0x00,0xA4,0x00,0xA4,0x00,0xD8, // 56 - 0x00,0x00,0x9C,0x00,0x94,0x00,0xD4,0x00,0x78, // 57 - 0x00,0x00,0x90, // 58 - 0x00,0x00,0x90,0x01, // 59 - 0x00,0x00,0x20,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x48, // 60 - 0x00,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50,0x00,0x50, // 61 - 0x00,0x00,0x48,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x20, // 62 - 0x00,0x00,0x04,0x00,0xB4,0x00,0x0C, // 63 - 0x00,0x00,0x70,0x00,0x88,0x00,0x74,0x01,0x54,0x01,0x74,0x01,0x4C,0x00,0x38, // 64 - 0x80,0x00,0x70,0x00,0x4C,0x00,0x70,0x00,0x80, // 65 - 0x00,0x00,0xFC,0x00,0xA4,0x00,0xA4,0x00,0xDC, // 66 - 0x00,0x00,0x78,0x00,0xCC,0x00,0x84,0x00,0x84,0x00,0x88, // 67 - 0x00,0x00,0xFC,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x78, // 68 - 0x00,0x00,0xFC,0x00,0xA4,0x00,0xA4,0x00,0xA4, // 69 - 0x00,0x00,0xFC,0x00,0x24,0x00,0x24, // 70 - 0x00,0x00,0x78,0x00,0x8C,0x00,0x84,0x00,0x94,0x00,0x78, // 71 - 0x00,0x00,0xFC,0x00,0x20,0x00,0x20,0x00,0xFC, // 72 - 0x00,0x00,0xFC, // 73 - 0x00,0x02,0xFC,0x03, // 74 - 0x00,0x00,0xFC,0x00,0x30,0x00,0x68,0x00,0xC4, // 75 - 0x00,0x00,0xFC,0x00,0x80,0x00,0x80, // 76 - 0x00,0x00,0xFC,0x00,0x1C,0x00,0x70,0x00,0x1C,0x00,0xFC, // 77 - 0x00,0x00,0xFC,0x00,0x18,0x00,0x60,0x00,0xFC, // 78 - 0x00,0x00,0x78,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x78, // 79 - 0x00,0x00,0xFC,0x00,0x14,0x00,0x14,0x00,0x1C, // 80 - 0x00,0x00,0x78,0x00,0x84,0x00,0x84,0x00,0x84,0x01,0x78, // 81 - 0x00,0x00,0xFC,0x00,0x14,0x00,0x34,0x00,0x6C,0x00,0x80, // 82 - 0x00,0x00,0x98,0x00,0x94,0x00,0xB4,0x00,0xE4, // 83 - 0x04,0x00,0x04,0x00,0xFC,0x00,0x04,0x00,0x04, // 84 - 0x00,0x00,0x7C,0x00,0x80,0x00,0x80,0x00,0x7C, // 85 - 0x04,0x00,0x38,0x00,0xC0,0x00,0x38,0x00,0x04, // 86 - 0x0C,0x00,0xF0,0x00,0x78,0x00,0x04,0x00,0x78,0x00,0xF0,0x00,0x0C, // 87 - 0x84,0x00,0x4C,0x00,0x30,0x00,0x4C,0x00,0x84, // 88 - 0x04,0x00,0x0C,0x00,0xF0,0x00,0x0C,0x00,0x04, // 89 - 0x00,0x00,0x84,0x00,0xE4,0x00,0xB4,0x00,0x8C, // 90 - 0x00,0x00,0xFC,0x01,0x04,0x01, // 91 - 0x0C,0x00,0x70,0x00,0x80,0x01, // 92 - 0x00,0x00,0x04,0x01,0xFC,0x01, // 93 - 0x00,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x08, // 94 - 0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 95 - 0x00,0x00,0x04, // 96 - 0x00,0x00,0xE0,0x00,0xB0,0x00,0xB0,0x00,0xF0, // 97 - 0x00,0x00,0xFE,0x00,0x90,0x00,0x90,0x00,0x60, // 98 - 0x00,0x00,0x60,0x00,0x90,0x00,0x90, // 99 - 0x00,0x00,0x60,0x00,0x90,0x00,0x90,0x00,0xFE, // 100 - 0x00,0x00,0x60,0x00,0xB0,0x00,0xB0,0x00,0xB0, // 101 - 0x10,0x00,0xFE,0x00,0x12, // 102 - 0x00,0x00,0x60,0x00,0x90,0x02,0x90,0x02,0xF0,0x01, // 103 - 0x00,0x00,0xFE,0x00,0x10,0x00,0x10,0x00,0xF0, // 104 - 0x00,0x00,0xF4, // 105 - 0x00,0x02,0xF4,0x03, // 106 - 0x00,0x00,0xFE,0x00,0x60,0x00,0x90, // 107 - 0x00,0x00,0xFE, // 108 - 0x00,0x00,0xF0,0x00,0x10,0x00,0x10,0x00,0xF0,0x00,0x10,0x00,0x10,0x00,0xF0, // 109 - 0x00,0x00,0xF0,0x00,0x10,0x00,0x10,0x00,0xF0, // 110 - 0x00,0x00,0x60,0x00,0x90,0x00,0x90,0x00,0x60, // 111 - 0x00,0x00,0xF0,0x03,0x90,0x00,0x90,0x00,0x60, // 112 - 0x00,0x00,0x60,0x00,0x90,0x00,0x90,0x00,0xF0,0x03, // 113 - 0x00,0x00,0xF0,0x00,0x10, // 114 - 0x00,0x00,0xB0,0x00,0xB0,0x00,0xD0, // 115 - 0x10,0x00,0xF8,0x00,0x90, // 116 - 0x00,0x00,0xF0,0x00,0x80,0x00,0x80,0x00,0xF0, // 117 - 0x10,0x00,0xE0,0x00,0xE0,0x00,0x10, // 118 - 0x30,0x00,0xC0,0x00,0x30,0x00,0x30,0x00,0xC0,0x00,0x30, // 119 - 0x90,0x00,0xF0,0x00,0xF0,0x00,0x90, // 120 - 0x00,0x00,0x10,0x02,0xE0,0x03,0x60,0x00,0x10, // 121 - 0x00,0x00,0x90,0x00,0xD0,0x00,0xF0, // 122 - 0x00,0x00,0x20,0x00,0xDC,0x01,0x04,0x01, // 123 - 0x00,0x00,0xFC,0x03, // 124 - 0x00,0x00,0x04,0x01,0xDC,0x01,0x20, // 125 - 0x00,0x00,0x20,0x00,0x20,0x00,0x60,0x00,0x40,0x00,0x40, // 126 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 127 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 128 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 129 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 130 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 131 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 132 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 133 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 134 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 135 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 136 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 137 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 138 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 139 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 140 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 141 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 142 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 143 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 144 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 145 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 146 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 147 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 148 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 149 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 150 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 151 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 152 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 153 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 154 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 155 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 156 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 157 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 158 - 0xFC,0x01,0x04,0x01,0x04,0x01,0xFC,0x01, // 159 - 0x00,0x00,0xD0,0x03, // 161 - 0x00,0x00,0xF0,0x00,0xF8,0x01,0x90, // 162 - 0xA0,0x00,0xFC,0x00,0xA4,0x00,0xA4, // 163 - 0x88,0x00,0x70,0x00,0x50,0x00,0x70,0x00,0x88, // 164 - 0x54,0x00,0x58,0x00,0xE0,0x00,0x58,0x00,0x54, // 165 - 0x00,0x00,0xDC,0x01, // 166 - 0x00,0x00,0x3C,0x01,0x54,0x01,0xE4,0x01, // 167 - 0x00,0x00,0x04,0x00,0x00,0x00,0x04, // 168 - 0x00,0x00,0x78,0x00,0xCC,0x00,0xB4,0x00,0xB4,0x00,0xCC,0x00,0x78, // 169 - 0x00,0x00,0x58,0x00,0x5C,0x00,0x5C, // 170 - 0x00,0x00,0x60,0x00,0xF0,0x00,0x60,0x00,0xF0, // 171 - 0x00,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0x60, // 172 - 0x00,0x00,0x20,0x00,0x20, // 173 - 0x00,0x00,0x78,0x00,0xCC,0x00,0xB4,0x00,0xB4,0x00,0xCC,0x00,0x78, // 174 - 0x00,0x00,0x04,0x00,0x04, // 175 - 0x00,0x00,0x0C,0x00,0x0C, // 176 - 0x00,0x00,0x90,0x00,0x90,0x00,0xFC,0x00,0x90,0x00,0x90, // 177 - 0x00,0x00,0x14,0x00,0x1C, // 178 - 0x00,0x00,0x1C,0x00,0x14, // 179 - 0x00,0x00,0x04, // 180 - 0x00,0x00,0xF0,0x03,0x80,0x00,0x80,0x00,0xF0, // 181 - 0x00,0x00,0x3C,0x00,0xFC,0x01,0x04,0x00,0xFC,0x01, // 182 - 0x00,0x00,0x20, // 183 - 0x00,0x00,0x00,0x02,0x00,0x03, // 184 - 0x00,0x00,0x14,0x00,0x1C, // 185 - 0x00,0x00,0x5C,0x00,0x54,0x00,0x5C, // 186 - 0x00,0x00,0xF0,0x00,0x60,0x00,0xF0,0x00,0x60, // 187 - 0x00,0x00,0x14,0x00,0x9C,0x00,0x70,0x00,0x18,0x00,0x04,0x00,0xC0,0x00,0xE0, // 188 - 0x00,0x00,0x14,0x00,0x9C,0x00,0x70,0x00,0x18,0x00,0x04,0x00,0xA0,0x00,0xE0, // 189 - 0x00,0x00,0x1C,0x00,0x94,0x00,0x60,0x00,0x18,0x00,0x04,0x00,0xC0,0x00,0xE0, // 190 - 0x00,0x00,0x00,0x03,0xD0,0x02,0x00,0x02, // 191 - 0x80,0x00,0x70,0x00,0x4E,0x00,0x72,0x00,0x80, // 192 - 0x80,0x00,0x70,0x00,0x4E,0x00,0x72,0x00,0x80, // 193 - 0x80,0x00,0x70,0x00,0x4C,0x00,0x70,0x00,0x80, // 194 - 0x80,0x00,0x72,0x00,0x4E,0x00,0x72,0x00,0x80, // 195 - 0x80,0x00,0x72,0x00,0x4C,0x00,0x72,0x00,0x80, // 196 - 0x80,0x00,0x60,0x00,0x5F,0x00,0x60,0x00,0x80, // 197 - 0x80,0x00,0x70,0x00,0x4C,0x00,0xFC,0x00,0xA4,0x00,0xA4,0x00,0xA4, // 198 - 0x00,0x00,0x78,0x00,0xCC,0x02,0x84,0x03,0x84,0x00,0x88, // 199 - 0x00,0x00,0xFC,0x00,0xA6,0x00,0xA6,0x00,0xA4, // 200 - 0x00,0x00,0xFC,0x00,0xA6,0x00,0xA6,0x00,0xA4, // 201 - 0x00,0x00,0xFC,0x00,0xA6,0x00,0xA6,0x00,0xA4, // 202 - 0x00,0x00,0xFC,0x00,0xA6,0x00,0xA4,0x00,0xA6, // 203 - 0x02,0x00,0xFE, // 204 - 0x02,0x00,0xFE, // 205 - 0x02,0x00,0xFE, // 206 - 0x02,0x00,0xFC, // 207 - 0x20,0x00,0xFC,0x00,0xA4,0x00,0x84,0x00,0xCC,0x00,0x78, // 208 - 0x00,0x00,0xFC,0x00,0x1A,0x00,0x62,0x00,0xFC, // 209 - 0x00,0x00,0x78,0x00,0x86,0x00,0x86,0x00,0x84,0x00,0x78, // 210 - 0x00,0x00,0x78,0x00,0x86,0x00,0x86,0x00,0x84,0x00,0x78, // 211 - 0x00,0x00,0x78,0x00,0x84,0x00,0x84,0x00,0x84,0x00,0x78, // 212 - 0x00,0x00,0x78,0x00,0x86,0x00,0x86,0x00,0x86,0x00,0x78, // 213 - 0x00,0x00,0x78,0x00,0x86,0x00,0x84,0x00,0x86,0x00,0x78, // 214 - 0x00,0x00,0x88,0x00,0x50,0x00,0x20,0x00,0x50,0x00,0x88, // 215 - 0x00,0x00,0xB8,0x00,0xE4,0x00,0x94,0x00,0x8C,0x00,0x74, // 216 - 0x00,0x00,0x7C,0x00,0x82,0x00,0x82,0x00,0x7C, // 217 - 0x00,0x00,0x7C,0x00,0x82,0x00,0x82,0x00,0x7C, // 218 - 0x00,0x00,0x7C,0x00,0x82,0x00,0x82,0x00,0x7C, // 219 - 0x00,0x00,0x7E,0x00,0x80,0x00,0x80,0x00,0x7E, // 220 - 0x04,0x00,0x0E,0x00,0xF2,0x00,0x0C,0x00,0x04, // 221 - 0x00,0x00,0xFC,0x00,0x28,0x00,0x28,0x00,0x38, // 222 - 0x00,0x00,0xFC,0x00,0x02,0x00,0x9A,0x00,0xE4, // 223 - 0x00,0x00,0xE4,0x00,0xB0,0x00,0xB0,0x00,0xF0, // 224 - 0x00,0x00,0xE4,0x00,0xB0,0x00,0xB0,0x00,0xF0, // 225 - 0x00,0x00,0xE0,0x00,0xB4,0x00,0xB4,0x00,0xF0, // 226 - 0x00,0x00,0xE0,0x00,0xBC,0x00,0xBC,0x00,0xF0, // 227 - 0x00,0x00,0xE0,0x00,0xB4,0x00,0xB4,0x00,0xF0, // 228 - 0x00,0x00,0xE0,0x00,0xB6,0x00,0xB6,0x00,0xF0, // 229 - 0x00,0x00,0xE0,0x00,0xB0,0x00,0xB0,0x00,0x60,0x00,0xB0,0x00,0xB0,0x00,0xB0, // 230 - 0x00,0x00,0x60,0x00,0x90,0x02,0x90,0x03, // 231 - 0x00,0x00,0x60,0x00,0xB4,0x00,0xB0,0x00,0xB0, // 232 - 0x00,0x00,0x60,0x00,0xB4,0x00,0xB0,0x00,0xB0, // 233 - 0x00,0x00,0x60,0x00,0xB4,0x00,0xB4,0x00,0xB0, // 234 - 0x00,0x00,0x60,0x00,0xB4,0x00,0xB0,0x00,0xB4, // 235 - 0x04,0x00,0xF0, // 236 - 0x04,0x00,0xF0, // 237 - 0x04,0x00,0xF4, // 238 - 0x04,0x00,0xF0, // 239 - 0x00,0x00,0x60,0x00,0x94,0x00,0x9C,0x00,0x70, // 240 - 0x00,0x00,0xFC,0x00,0x1C,0x00,0x1C,0x00,0xF0, // 241 - 0x00,0x00,0x64,0x00,0x90,0x00,0x90,0x00,0x60, // 242 - 0x00,0x00,0x64,0x00,0x90,0x00,0x90,0x00,0x60, // 243 - 0x00,0x00,0x60,0x00,0x94,0x00,0x94,0x00,0x60, // 244 - 0x00,0x00,0x60,0x00,0x9C,0x00,0x9C,0x00,0x60, // 245 - 0x00,0x00,0x64,0x00,0x90,0x00,0x90,0x00,0x64, // 246 - 0x00,0x00,0x20,0x00,0x20,0x00,0xA8,0x00,0x20,0x00,0x20, // 247 - 0x00,0x00,0xF0,0x00,0xD0,0x00,0xB0,0x00,0xF0, // 248 - 0x00,0x00,0xF4,0x00,0x80,0x00,0x80,0x00,0xF0, // 249 - 0x00,0x00,0xF4,0x00,0x80,0x00,0x80,0x00,0xF0, // 250 - 0x00,0x00,0xF0,0x00,0x84,0x00,0x84,0x00,0xF0, // 251 - 0x00,0x00,0xF0,0x00,0x84,0x00,0x84,0x00,0xF0, // 252 - 0x00,0x00,0x14,0x02,0xE0,0x03,0x60,0x00,0x10, // 253 - 0x00,0x00,0xFE,0x03,0x90,0x00,0x90,0x00,0x60, // 254 - 0x00,0x00,0x14,0x02,0xE0,0x03,0x64,0x00,0x10 // 255 -}; - -#endif - diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino index 37550eaec..33f95d216 100644 --- a/src/_P036_FrameOLED.ino +++ b/src/_P036_FrameOLED.ino @@ -14,6 +14,9 @@ // Added to the main repository with some optimizations and some limitations. // Al long as the device is not selected, no RAM is waisted. // +// @tonhuisman: 2022-02-13 +// CHG: Tweak font metrics for 4-lines display to not need to use an 8px font (height 10 pix). +// DEL: Removed the extra fonts added earlier in this change, including the mono-spaced font // @tonhuisman: 2022-02-06 // ADD: Setting and support for showing the content left-aligned, and oledframedcmd,leftalign,<0|1> subcommand // CHG: Move #define for settings to P036_data_struct.h file, diff --git a/src/src/PluginStructs/P036_data_struct.cpp b/src/src/PluginStructs/P036_data_struct.cpp index ad7bdb7de..7448de0aa 100644 --- a/src/src/PluginStructs/P036_data_struct.cpp +++ b/src/src/PluginStructs/P036_data_struct.cpp @@ -12,18 +12,7 @@ # include "../Helpers/StringParser.h" # include "../Helpers/SystemVariables.h" -# ifdef P036_FIVE_FONTS -# include -# endif // ifndef P036_FIVE_FONTS -# ifdef P036_USE_SANSERIF_8_FONT -# include -# endif // ifdef P036_USE_SANSERIF_8_FONT -# ifdef P036_USE_LATO_8_FONT -# include -# endif // ifdef P036_USE_LATO_8_FONT -# ifdef P036_USE_MONOSPACED_8_FONT -# include -# endif // ifdef P036_USE_MONOSPACED_8_FONT +# include # include P036_data_struct::P036_data_struct() : display(nullptr) {} @@ -42,21 +31,10 @@ void P036_data_struct::reset() { } const tFontSizes FontSizes[P36_MaxFontCount] = { - { ArialMT_Plain_24, 24, 28 }, // 9643 - { ArialMT_Plain_16, 16, 19 }, // 5049 - # ifdef P036_FIVE_FONTS - { Dialog_plain_12, 13, 15 }, // 3707 - # endif // ifdef P036_FIVE_FONTS - { ArialMT_Plain_10, 10, 13 }, // 2731 - # ifdef P036_USE_SANSERIF_8_FONT - { SansSerif_plain_8, 8, 10 }, // 2732 - # endif // ifdef P036_USE_SANSERIF_8_FONT - # ifdef P036_USE_LATO_8_FONT - { Lato_Thin_8, 8, 10 }, // 2371 - # endif // ifdef P036_USE_LATO_8_FONT - # ifdef P036_USE_MONOSPACED_8_FONT - { Monospaced_plain_8, 8, 10 } // 2715 - # endif // ifdef P036_USE_MONOSPACED_8_FONT + { ArialMT_Plain_24, 24, 28 }, // 9643 + { ArialMT_Plain_16, 16, 19 }, // 5049 + { Dialog_plain_12, 13, 15 }, // 3707 + { ArialMT_Plain_10, 10, 13 }, // 2731 }; const tSizeSettings SizeSettings[P36_MaxSizesCount] = { @@ -521,13 +499,13 @@ tFontSettings P036_data_struct::CalculateFontSettings(uint8_t lDefaultLines) { # endif // ifdef P036_FONT_CALC_LOG while (iFontIndex < 0) { - iMaxHeightForFont = round((iHeight /*- (iLinesPerFrame - 1)*/) / (iLinesPerFrame * 1.0f)); // at least 0/1? pixel space between lines + iMaxHeightForFont = round(iHeight / (iLinesPerFrame * 1.0f)); // no extra space between lines // Fonts already have their own extra space, no need to add an extra pixel space # ifdef P036_FONT_CALC_LOG uint8_t prLines = iLinesPerFrame; log.reserve(80); - log.clear() + log.clear(); log += F("CalculateFontSettings prLines: "); log += prLines; log += F(", max: "); @@ -560,17 +538,19 @@ tFontSettings P036_data_struct::CalculateFontSettings(uint8_t lDefaultLines) { } if (iFontIndex < 0) { + // FIXED: tonhuisman Reduce number of lines feature disabled for now, by tweaking the font metrics for 4 lines, see below // no font fits -> reduce number of lines per page - iLinesPerFrame--; + // iLinesPerFrame--; # ifdef P036_FONT_CALC_LOG log += F(", L: "); log += iLinesPerFrame; # endif // ifdef P036_FONT_CALC_LOG - if (iLinesPerFrame == 0) { - // lines per frame is at minimum - break; - } + // if (iLinesPerFrame == 0) { + // lines per frame is at minimum + break; + + // } } # ifdef P036_FONT_CALC_LOG log += F(", font: "); @@ -593,10 +573,11 @@ tFontSettings P036_data_struct::CalculateFontSettings(uint8_t lDefaultLines) { result.Top = (iHeight - (iMaxHeightForFont + (result.Space * (iLinesPerFrame - 1)))) / 2; } else { // no font found -> return font with shortest height - result.Top = 0; - result.Space = 1; - iLinesPerFrame = 1; - iFontIndex = P36_MaxFontCount - 1; + // FIXED: tonhuisman Tweaked to match the 13 pix font to fit for 4 lines display + // iLinesPerFrame = 1; // Disabled to show all 4 lines + result.Top = 0; + result.Space = bHideFooter ? 0 : -2; + iFontIndex = P36_MaxFontCount - 1; } result.fontData = FontSizes[iFontIndex].fontData; result.Height = FontSizes[iFontIndex].Height; diff --git a/src/src/PluginStructs/P036_data_struct.h b/src/src/PluginStructs/P036_data_struct.h index a6e8b0db6..9152b7adb 100644 --- a/src/src/PluginStructs/P036_data_struct.h +++ b/src/src/PluginStructs/P036_data_struct.h @@ -9,8 +9,6 @@ # ifdef LIMIT_BUILD_SIZE # define P036_LIMIT_BUILD_SIZE -# else // ifdef LIMIT_BUILD_SIZE -# define P036_FIVE_FONTS // Enable 5 fonts setup # endif // ifdef LIMIT_BUILD_SIZE // # define PLUGIN_036_DEBUG // additional debug messages in the log @@ -27,27 +25,7 @@ # define P36_NcharsV0 32 // max chars per line up to 22.11.2019 (V0) # define P36_NcharsV1 64 // max chars per line from 22.11.2019 (V1) # define P36_MaxSizesCount 3 // number of different OLED sizes -# ifdef P036_FIVE_FONTS -# define P36_MaxFontCount 5 // number of different fonts -# else // ifdef P036_FIVE_FONTS -# define P36_MaxFontCount 4 // number of different fonts -# endif // ifdef P036_FIVE_FONTS - -// Select the desired 8px font, as they have somewhat different readability, you can match to you personal taste -// Default used: P036_USE_MONOSPACED_8_FONT (as the name says, it's mono-spaced, not proportional like the other fonts) -// # define P036_USE_SANSERIF_8_FONT -// # define P036_USE_MONOSPACED_8_FONT -// # define P036_USE_LATO_8_FONT - -# if (defined(P036_USE_SANSERIF_8_FONT) && defined(P036_USE_MONOSPACED_8_FONT)) || \ - (defined(P036_USE_SANSERIF_8_FONT) && defined(P036_USE_LATO_8_FONT)) || \ - (defined(P036_USE_MONOSPACED_8_FONT) && defined(P036_USE_LATO_8_FONT)) -# pragma error "Only a single OLed 8 px font should be enabled!" -# endif // if (defined(P036_USE_SANSERIF_8_FONT) && defined(P036_USE_MONOSPACED_8_FONT)) || (defined(P036_USE_SANSERIF_8_FONT) && -// defined(P036_USE_LATO_8_FONT)) || (defined(P036_USE_MONOSPACED_8_FONT) && defined(P036_USE_LATO_8_FONT)) -# if !defined(P036_USE_SANSERIF_8_FONT) && !defined(P036_USE_LATO_8_FONT) && !defined(P036_USE_MONOSPACED_8_FONT) -# define P036_USE_MONOSPACED_8_FONT -# endif // if !defined(P036_USE_SANSERIF_8_FONT) && !defined(P036_USE_LATO_8_FONT) && !defined(P036_USE_MONOSPACED_8_FONT) +# define P36_MaxFontCount 4 // number of different fonts # define P36_MaxDisplayWidth 128 # define P36_MaxDisplayHeight 64 @@ -187,7 +165,7 @@ typedef struct { const char *fontData; // font for this line setting uint8_t Top; // top in pix for this line setting uint8_t Height; // font height in pix - uint8_t Space; // space in pix between lines for this line setting + int8_t Space; // space in pix between lines for this line setting, allow negative values to squeeze the lines closer! } tFontSettings; typedef struct {