From 002de13655cde6f86aaa98f5c8389bc7de9411fc Mon Sep 17 00:00:00 2001 From: true Date: Sat, 26 Oct 2024 01:04:48 -0700 Subject: [PATCH] re-enable peripherals, update about menu a little bit, add two fonts --- nametag8_CH592/user/main.c | 22 +- nametag8_CH592/user/misc/accel.c | 1 + nametag8_CH592/user/render/font.h | 4 +- nametag8_CH592/user/render/font_static.c | 399 +++++++++++++++++++++++ nametag8_CH592/user/render/font_table.c | 8 +- nametag8_CH592/user/ui/menu_base.c | 2 +- nametag8_CH592/user/ui/menu_def.c | 2 +- nametag8_CH592/user/ui/menu_entry_0.c | 16 +- nametag8_CH592/user/ui/menu_entry_6.c | 70 ++-- 9 files changed, 472 insertions(+), 52 deletions(-) diff --git a/nametag8_CH592/user/main.c b/nametag8_CH592/user/main.c index 2f12138..952eb48 100644 --- a/nametag8_CH592/user/main.c +++ b/nametag8_CH592/user/main.c @@ -50,13 +50,14 @@ #define FLAG_OLED_UPDATE (1 << 0) #define FLAG_RGBLED_RUN (1 << 1) #define FLAG_ACCEL_POLL (1 << 2) +#define FLAG_CH32V_RESEND_CONF (1 << 3) #define FLAG_RGBLED_SEND (1 << 5) #define PROG_TICK_RATE ((32768-8192-4096) / 256) // not sure why this value can't be 32768/256 // this was checked with a stopwatch and is close enough // this value IS FRAMERATE DEPENDENT for some reason... figure it out later -const uint8_t vers[] = "241015a"; +const uint8_t vers[] = "241026a"; uint32_t cpu_use = 0; uint32_t cpu_max = 0; @@ -205,20 +206,24 @@ void lowprio_task() { SYS_DisableAllIrq(&interrupt_flags); // temporary: re-send sub interrupts, sub button holds, enable rgb_hwen - ch32sub_intr_defaults(); - btn_commit_hold(); - ch32sub_rgb_hwen(1); + if (flags_lo & FLAG_CH32V_RESEND_CONF) { + flags_lo &= ~FLAG_CH32V_RESEND_CONF; + ch32sub_intr_defaults(); + btn_commit_hold(); + ch32sub_rgb_hwen(1); + } + // process sub MCU interrupt, if pending ch32sub_process(); if (flags_lo & FLAG_RGBLED_SEND) { flags_lo &= ~FLAG_RGBLED_SEND; - // rgbled_send(); + rgbled_send(); } if (flags_lo & FLAG_ACCEL_POLL) { flags_lo &= ~FLAG_ACCEL_POLL; - // accel_poll(); + accel_poll(); } // send the last oled frame data @@ -318,6 +323,11 @@ void RTC_IRQHandler(void) uptime_hour = (uint16_t)(uptime / 3600); uptime_min = (uint8_t)((uptime / 60) % 60); uptime_sec = (uint8_t)((uptime ) % 60); + + // in case the sub MCU crashes or whatever, make sure state is consistent + if (uptime & 1) { + flags_lo |= FLAG_CH32V_RESEND_CONF; + } } oled_tick++; diff --git a/nametag8_CH592/user/misc/accel.c b/nametag8_CH592/user/misc/accel.c index cf26449..ad0e758 100644 --- a/nametag8_CH592/user/misc/accel.c +++ b/nametag8_CH592/user/misc/accel.c @@ -21,6 +21,7 @@ AccelData accel; uint8_t accel_found = 0; int16_t movement; +uint16_t movement_worst; // hardware diff --git a/nametag8_CH592/user/render/font.h b/nametag8_CH592/user/render/font.h index de1dfd1..8dd9a40 100644 --- a/nametag8_CH592/user/render/font.h +++ b/nametag8_CH592/user/render/font.h @@ -37,14 +37,16 @@ typedef struct FontTable { extern const uint8_t font_Dialog_plain_8[]; extern const uint8_t font_DejaVu_Sans_Mono_Bold_11[]; +extern const uint8_t font_DSEG14_Classic_18[]; extern const uint8_t font_Nimbus_Mono_L_Bold_20[]; extern const uint8_t font_DialogInput_Bold_24[]; +extern const uint8_t font_Luckiest_Guy_23[]; extern const uint8_t font_Chewy_24[]; extern const uint8_t font_Crushed_25[]; extern const uint8_t font_Nimbus_Sans_L_25[]; extern const uint8_t font_Orbitron_28[]; -extern const FontTable font_table[8]; +extern const FontTable font_table[10]; diff --git a/nametag8_CH592/user/render/font_static.c b/nametag8_CH592/user/render/font_static.c index c825216..9238719 100644 --- a/nametag8_CH592/user/render/font_static.c +++ b/nametag8_CH592/user/render/font_static.c @@ -411,6 +411,204 @@ const uint8_t font_DejaVu_Sans_Mono_Bold_11[] = { 0x00,0x00,0x04,0x08,0x04,0x08,0x7C,0x0F,0x7C,0x0F,0x80,0x00,0x80, // 125 }; +// Created by https://oleddisplay.squix.ch/ Consider a donation +// In case of problems make sure that you are using the font file with the correct version! +const uint8_t font_DSEG14_Classic_18[] = { + 0x0F, // Width: 15 + 0x14, // Height: 20 + 0x20, // First Char: 32 + 0x5E, // Numbers of Chars: 94 + + // Jump Table: + 0xFF, 0xFF, 0x00, 0x04, // 32:65535 + 0xFF, 0xFF, 0x00, 0x0F, // 33:65535 + 0x00, 0x00, 0x17, 0x0F, // 34:0 + 0x00, 0x17, 0x12, 0x07, // 35:23 + 0x00, 0x29, 0x27, 0x0F, // 36:41 + 0x00, 0x50, 0x27, 0x0F, // 37:80 + 0x00, 0x77, 0x27, 0x0F, // 38:119 + 0x00, 0x9E, 0x17, 0x0F, // 39:158 + 0x00, 0xB5, 0x21, 0x0F, // 40:181 + 0x00, 0xD6, 0x11, 0x0F, // 41:214 + 0x00, 0xE7, 0x23, 0x0F, // 42:231 + 0x01, 0x0A, 0x23, 0x0F, // 43:266 + 0x01, 0x2D, 0x11, 0x0F, // 44:301 + 0x01, 0x3E, 0x23, 0x0F, // 45:318 + 0xFF, 0xFF, 0x00, 0x00, // 46:65535 + 0x01, 0x61, 0x1F, 0x0F, // 47:353 + 0x01, 0x80, 0x27, 0x0F, // 48:384 + 0x01, 0xA7, 0x27, 0x0F, // 49:423 + 0x01, 0xCE, 0x26, 0x0F, // 50:462 + 0x01, 0xF4, 0x27, 0x0F, // 51:500 + 0x02, 0x1B, 0x27, 0x0F, // 52:539 + 0x02, 0x42, 0x27, 0x0F, // 53:578 + 0x02, 0x69, 0x27, 0x0F, // 54:617 + 0x02, 0x90, 0x27, 0x0F, // 55:656 + 0x02, 0xB7, 0x27, 0x0F, // 56:695 + 0x02, 0xDE, 0x27, 0x0F, // 57:734 + 0x03, 0x05, 0x08, 0x04, // 58:773 + 0x03, 0x0D, 0x12, 0x07, // 59:781 + 0x03, 0x1F, 0x24, 0x0F, // 60:799 + 0x03, 0x43, 0x24, 0x0F, // 61:835 + 0x03, 0x67, 0x24, 0x0F, // 62:871 + 0x03, 0x8B, 0x26, 0x0F, // 63:907 + 0x03, 0xB1, 0x27, 0x0F, // 64:945 + 0x03, 0xD8, 0x27, 0x0F, // 65:984 + 0x03, 0xFF, 0x27, 0x0F, // 66:1023 + 0x04, 0x26, 0x24, 0x0F, // 67:1062 + 0x04, 0x4A, 0x27, 0x0F, // 68:1098 + 0x04, 0x71, 0x24, 0x0F, // 69:1137 + 0x04, 0x95, 0x23, 0x0F, // 70:1173 + 0x04, 0xB8, 0x27, 0x0F, // 71:1208 + 0x04, 0xDF, 0x27, 0x0F, // 72:1247 + 0x05, 0x06, 0x24, 0x0F, // 73:1286 + 0x05, 0x2A, 0x27, 0x0F, // 74:1322 + 0x05, 0x51, 0x21, 0x0F, // 75:1361 + 0x05, 0x72, 0x24, 0x0F, // 76:1394 + 0x05, 0x96, 0x27, 0x0F, // 77:1430 + 0x05, 0xBD, 0x27, 0x0F, // 78:1469 + 0x05, 0xE4, 0x27, 0x0F, // 79:1508 + 0x06, 0x0B, 0x26, 0x0F, // 80:1547 + 0x06, 0x31, 0x27, 0x0F, // 81:1585 + 0x06, 0x58, 0x26, 0x0F, // 82:1624 + 0x06, 0x7E, 0x27, 0x0F, // 83:1662 + 0x06, 0xA5, 0x22, 0x0F, // 84:1701 + 0x06, 0xC7, 0x27, 0x0F, // 85:1735 + 0x06, 0xEE, 0x1F, 0x0F, // 86:1774 + 0x07, 0x0D, 0x27, 0x0F, // 87:1805 + 0x07, 0x34, 0x21, 0x0F, // 88:1844 + 0x07, 0x55, 0x1F, 0x0F, // 89:1877 + 0x07, 0x74, 0x24, 0x0F, // 90:1908 + 0x07, 0x98, 0x12, 0x07, // 91:1944 + 0x07, 0xAA, 0x21, 0x0F, // 92:1962 + 0x07, 0xCB, 0x12, 0x07, // 93:1995 + 0x07, 0xDD, 0x11, 0x0F, // 94:2013 + 0x07, 0xEE, 0x24, 0x0F, // 95:2030 + 0x08, 0x12, 0x11, 0x0F, // 96:2066 + 0x08, 0x23, 0x27, 0x0F, // 97:2083 + 0x08, 0x4A, 0x27, 0x0F, // 98:2122 + 0x08, 0x71, 0x24, 0x0F, // 99:2161 + 0x08, 0x95, 0x27, 0x0F, // 100:2197 + 0x08, 0xBC, 0x24, 0x0F, // 101:2236 + 0x08, 0xE0, 0x23, 0x0F, // 102:2272 + 0x09, 0x03, 0x27, 0x0F, // 103:2307 + 0x09, 0x2A, 0x27, 0x0F, // 104:2346 + 0x09, 0x51, 0x24, 0x0F, // 105:2385 + 0x09, 0x75, 0x27, 0x0F, // 106:2421 + 0x09, 0x9C, 0x21, 0x0F, // 107:2460 + 0x09, 0xBD, 0x24, 0x0F, // 108:2493 + 0x09, 0xE1, 0x27, 0x0F, // 109:2529 + 0x0A, 0x08, 0x27, 0x0F, // 110:2568 + 0x0A, 0x2F, 0x27, 0x0F, // 111:2607 + 0x0A, 0x56, 0x26, 0x0F, // 112:2646 + 0x0A, 0x7C, 0x27, 0x0F, // 113:2684 + 0x0A, 0xA3, 0x26, 0x0F, // 114:2723 + 0x0A, 0xC9, 0x27, 0x0F, // 115:2761 + 0x0A, 0xF0, 0x22, 0x0F, // 116:2800 + 0x0B, 0x12, 0x27, 0x0F, // 117:2834 + 0x0B, 0x39, 0x1F, 0x0F, // 118:2873 + 0x0B, 0x58, 0x27, 0x0F, // 119:2904 + 0x0B, 0x7F, 0x21, 0x0F, // 120:2943 + 0x0B, 0xA0, 0x1F, 0x0F, // 121:2976 + 0x0B, 0xBF, 0x24, 0x0F, // 122:3007 + 0x0B, 0xE3, 0x12, 0x07, // 123:3043 + 0x0B, 0xF5, 0x18, 0x0F, // 124:3061 + 0x0C, 0x0D, 0x12, 0x07, // 125:3085 + + // Font Data: + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x03, // 34 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 35 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xFC,0xF3,0x0F,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 36 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x0C,0x00,0xF0,0xCC,0x03,0xC0,0xED,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0xC0,0xED,0x00,0x70,0x8C,0x03,0x00,0xFC,0x03,0x00,0xF8,0x07, // 37 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0xFC,0xC0,0x0F,0xCC,0xE1,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xCC,0xE1,0x0C,0x7C,0x80,0x0F,0x04,0xF0,0x0B,0x00,0xF8,0x07, // 38 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x03, // 39 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE1,0x00,0x70,0x80,0x03, // 40 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xC0,0x03,0xC0,0xE1, // 41 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0xF0,0xCC,0x03,0xC0,0xED,0x00,0x00,0x0C,0x00,0xF0,0xF3,0x03,0x00,0x0C,0x00,0xC0,0xED,0x00,0x70,0x8C,0x03,0x00,0x0C, // 42 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0xF0,0xF3,0x03,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C, // 43 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0, // 44 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C, // 45 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01,0x00,0x70, // 47 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0xC0,0x0F,0x0C,0xE0,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xCC,0x01,0x0C,0x7C,0x00,0x0C,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 48 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 49 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0x0F,0x08,0xF8,0x07, // 50 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 51 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0xF0,0xFF,0x03,0xF8,0xFF,0x07, // 52 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 53 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 54 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0xF4,0xF3,0x03,0xF8,0xFF,0x07, // 55 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 56 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 57 + 0x00,0x00,0x00,0xC0,0xC1,0x00,0x80,0xC0, // 58 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 59 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0xC0,0x0F,0x00,0xE0,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xC0,0x01,0x0C,0x70,0x00,0x0C,0x00,0x00,0x08, // 60 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x08,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x00,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x08, // 61 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0xF0,0x00,0x0C,0xC0,0x01,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0xE0,0x0C,0x00,0x80,0x0F,0x00,0x00,0x08, // 62 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xF0,0x03,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0xF4,0x0F,0x00,0xF8,0x07, // 63 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0xF0,0x0F,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 64 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0xF4,0xFF,0x03,0xF8,0xFF,0x07, // 65 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 66 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x04,0x00,0x08, // 67 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 68 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0x0C,0x08, // 69 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x04,0x0C, // 70 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 71 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0xF0,0xFF,0x03,0xF8,0xFF,0x07, // 72 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x04,0x00,0x08, // 73 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xF0,0xF3,0x0B,0xF8,0xFF,0x07, // 74 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE1,0x00,0x70,0x80,0x03, // 75 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x08, // 76 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0xC0,0x01,0x00,0x70,0x00,0x00,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 77 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0x03,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 78 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 79 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0xF4,0x0F,0x00,0xF8,0x07, // 80 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0xE0,0x0C,0x0C,0x80,0x0F,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 81 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0xEC,0x00,0x0C,0x8C,0x03,0xF4,0x0F,0x00,0xF8,0x07, // 82 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x0C,0x08,0xFC,0x0C,0x0C,0xCC,0x0D,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0xEC,0x0C,0x0C,0x8C,0x0F,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 83 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0xFC,0xF3,0x03,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x04, // 84 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xF0,0xF3,0x0B,0xF8,0xFF,0x07, // 85 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01,0x00,0x70, // 86 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0x03,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 87 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xC0,0x03,0xC0,0xE1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE1,0x00,0x70,0x80,0x03, // 88 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0xC0,0x01,0x00,0x70, // 89 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0xC0,0x0F,0x0C,0xE0,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xCC,0x01,0x0C,0x7C,0x00,0x0C,0x04,0x00,0x08, // 90 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 91 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0x03, // 92 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 93 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01, // 94 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x08, // 95 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01, // 96 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0xF4,0xFF,0x03,0xF8,0xFF,0x07, // 97 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0xF4,0xFF,0x0B,0xF8,0xFF,0x07, // 98 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x04,0x00,0x08, // 99 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 100 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x08,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0x0C,0x08, // 101 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x04,0x0C, // 102 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x0C,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 103 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0xF0,0xFF,0x03,0xF8,0xFF,0x07, // 104 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xFC,0xF3,0x0F,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x04,0x00,0x08, // 105 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xF0,0xF3,0x0B,0xF8,0xFF,0x07, // 106 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE1,0x00,0x70,0x80,0x03, // 107 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x08, // 108 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0xC0,0x01,0x00,0x70,0x00,0x00,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 109 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0x03,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 110 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 111 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0xF4,0x0F,0x00,0xF8,0x07, // 112 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x00,0x08,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0xE0,0x0C,0x0C,0x80,0x0F,0xF4,0xF3,0x0B,0xF8,0xFF,0x07, // 113 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x04,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x00,0x00,0x0C,0x0C,0x00,0x0C,0xEC,0x00,0x0C,0x8C,0x03,0xF4,0x0F,0x00,0xF8,0x07, // 114 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x07,0x00,0x04,0x0C,0x08,0xFC,0x0C,0x0C,0xCC,0x0D,0x0C,0x0C,0x0C,0x0C,0x0C,0x00,0x0C,0x0C,0x0C,0x0C,0x0C,0xEC,0x0C,0x0C,0x8C,0x0F,0x04,0xFC,0x0B,0x00,0xF8,0x07, // 115 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0xFC,0xF3,0x03,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x04, // 116 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x08,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0x00,0x00,0x0C,0xF0,0xF3,0x0B,0xF8,0xFF,0x07, // 117 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01,0x00,0x70, // 118 + 0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0xFF,0x07,0x00,0x00,0x00,0x00,0xC0,0x03,0x00,0xE0,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0x03,0xF0,0xF3,0x03,0xF8,0xFF,0x07, // 119 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xC0,0x03,0xC0,0xE1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xE1,0x00,0x70,0x80,0x03, // 120 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0xC0,0x01,0x00,0x00,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x00,0xC0,0x01,0x00,0x70, // 121 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x08,0x0C,0xC0,0x0F,0x0C,0xE0,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0x0C,0x00,0x0C,0xCC,0x01,0x0C,0x7C,0x00,0x0C,0x04,0x00,0x08, // 122 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 123 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF3,0x03, // 124 + 0x00,0x00,0x00,0x00,0xFF,0x0F,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0x01,0x08,0x00,0xFF,0x0F, // 125 +}; + const uint8_t font_Nimbus_Mono_L_Bold_20[] = { 0x0C, // Width: 12 0x19, // Height: 25 @@ -807,6 +1005,207 @@ const uint8_t font_DialogInput_Bold_24[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x7F,0xFE,0x07,0xE0,0xFF,0xFF,0x07,0xC0,0xFF,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 125 }; +// Created by https://oleddisplay.squix.ch/ Consider a donation +// In case of problems make sure that you are using the font file with the correct version! +const uint8_t font_Luckiest_Guy_23[] = { + 0x18, // Width: 24 + 0x18, // Height: 24 + 0x20, // First Char: 32 + 0x5E, // Numbers of Chars: 94 + + // Jump Table: + 0xFF, 0xFF, 0x00, 0x05, // 32:65535 + 0x00, 0x00, 0x10, 0x06, // 33:0 + 0x00, 0x10, 0x1F, 0x0B, // 34:16 + 0x00, 0x2F, 0x26, 0x0E, // 35:47 + 0x00, 0x55, 0x1D, 0x0A, // 36:85 + 0x00, 0x72, 0x2F, 0x11, // 37:114 + 0x00, 0xA1, 0x29, 0x0E, // 38:161 + 0x00, 0xCA, 0x0D, 0x05, // 39:202 + 0x00, 0xD7, 0x1B, 0x09, // 40:215 + 0x00, 0xF2, 0x17, 0x09, // 41:242 + 0x01, 0x09, 0x22, 0x0C, // 42:265 + 0x01, 0x2B, 0x1D, 0x0A, // 43:299 + 0x01, 0x48, 0x0E, 0x05, // 44:328 + 0x01, 0x56, 0x17, 0x09, // 45:342 + 0x01, 0x6D, 0x0E, 0x05, // 46:365 + 0x01, 0x7B, 0x1F, 0x0C, // 47:379 + 0x01, 0x9A, 0x29, 0x0F, // 48:410 + 0x01, 0xC3, 0x18, 0x09, // 49:451 + 0x01, 0xDB, 0x21, 0x0C, // 50:475 + 0x01, 0xFC, 0x23, 0x0C, // 51:508 + 0x02, 0x1F, 0x23, 0x0C, // 52:543 + 0x02, 0x42, 0x23, 0x0C, // 53:578 + 0x02, 0x65, 0x26, 0x0D, // 54:613 + 0x02, 0x8B, 0x1F, 0x0C, // 55:651 + 0x02, 0xAA, 0x26, 0x0D, // 56:682 + 0x02, 0xD0, 0x23, 0x0D, // 57:720 + 0x02, 0xF3, 0x0E, 0x06, // 58:755 + 0x03, 0x01, 0x0F, 0x06, // 59:769 + 0x03, 0x10, 0x1D, 0x0A, // 60:784 + 0x03, 0x2D, 0x17, 0x09, // 61:813 + 0x03, 0x44, 0x1D, 0x0A, // 62:836 + 0x03, 0x61, 0x23, 0x0D, // 63:865 + 0x03, 0x84, 0x2C, 0x0F, // 64:900 + 0x03, 0xB0, 0x29, 0x0E, // 65:944 + 0x03, 0xD9, 0x29, 0x0E, // 66:985 + 0x04, 0x02, 0x22, 0x0C, // 67:1026 + 0x04, 0x24, 0x26, 0x0D, // 68:1060 + 0x04, 0x4A, 0x1F, 0x0B, // 69:1098 + 0x04, 0x69, 0x1F, 0x0B, // 70:1129 + 0x04, 0x88, 0x29, 0x0E, // 71:1160 + 0x04, 0xB1, 0x2A, 0x0E, // 72:1201 + 0x04, 0xDB, 0x13, 0x07, // 73:1243 + 0x04, 0xEE, 0x20, 0x0C, // 74:1262 + 0x05, 0x0E, 0x29, 0x0E, // 75:1294 + 0x05, 0x37, 0x1D, 0x0A, // 76:1335 + 0x05, 0x54, 0x34, 0x12, // 77:1364 + 0x05, 0x88, 0x2E, 0x10, // 78:1416 + 0x05, 0xB6, 0x29, 0x0F, // 79:1462 + 0x05, 0xDF, 0x28, 0x0E, // 80:1503 + 0x06, 0x07, 0x2F, 0x10, // 81:1543 + 0x06, 0x36, 0x29, 0x0E, // 82:1590 + 0x06, 0x5F, 0x23, 0x0C, // 83:1631 + 0x06, 0x82, 0x22, 0x0C, // 84:1666 + 0x06, 0xA4, 0x29, 0x0E, // 85:1700 + 0x06, 0xCD, 0x28, 0x0E, // 86:1741 + 0x06, 0xF5, 0x3D, 0x15, // 87:1781 + 0x07, 0x32, 0x28, 0x0E, // 88:1842 + 0x07, 0x5A, 0x28, 0x0E, // 89:1882 + 0x07, 0x82, 0x20, 0x0B, // 90:1922 + 0x07, 0xA2, 0x18, 0x08, // 91:1954 + 0x07, 0xBA, 0x21, 0x0C, // 92:1978 + 0x07, 0xDB, 0x17, 0x08, // 93:2011 + 0x07, 0xF2, 0x20, 0x0B, // 94:2034 + 0x08, 0x12, 0x15, 0x07, // 95:2066 + 0x08, 0x27, 0x13, 0x07, // 96:2087 + 0x08, 0x3A, 0x29, 0x0E, // 97:2106 + 0x08, 0x63, 0x29, 0x0E, // 98:2147 + 0x08, 0x8C, 0x23, 0x0C, // 99:2188 + 0x08, 0xAF, 0x26, 0x0D, // 100:2223 + 0x08, 0xD5, 0x26, 0x0D, // 101:2261 + 0x08, 0xFB, 0x1F, 0x0B, // 102:2299 + 0x09, 0x1A, 0x29, 0x0E, // 103:2330 + 0x09, 0x43, 0x2A, 0x0E, // 104:2371 + 0x09, 0x6D, 0x11, 0x07, // 105:2413 + 0x09, 0x7E, 0x20, 0x0C, // 106:2430 + 0x09, 0x9E, 0x29, 0x0E, // 107:2462 + 0x09, 0xC7, 0x1D, 0x0A, // 108:2503 + 0x09, 0xE4, 0x3B, 0x15, // 109:2532 + 0x0A, 0x1F, 0x2C, 0x0F, // 110:2591 + 0x0A, 0x4B, 0x29, 0x0F, // 111:2635 + 0x0A, 0x74, 0x28, 0x0E, // 112:2676 + 0x0A, 0x9C, 0x2F, 0x10, // 113:2716 + 0x0A, 0xCB, 0x29, 0x0E, // 114:2763 + 0x0A, 0xF4, 0x23, 0x0C, // 115:2804 + 0x0B, 0x17, 0x22, 0x0D, // 116:2839 + 0x0B, 0x39, 0x28, 0x0E, // 117:2873 + 0x0B, 0x61, 0x28, 0x0E, // 118:2913 + 0x0B, 0x89, 0x3D, 0x15, // 119:2953 + 0x0B, 0xC6, 0x29, 0x0E, // 120:3014 + 0x0B, 0xEF, 0x28, 0x0E, // 121:3055 + 0x0C, 0x17, 0x20, 0x0B, // 122:3095 + 0x0C, 0x37, 0x1B, 0x09, // 123:3127 + 0x0C, 0x52, 0x12, 0x07, // 124:3154 + 0x0C, 0x64, 0x1A, 0x09, // 125:3172 + + // Font Data: + 0x00,0x00,0x00,0xFF,0xCF,0x01,0xFF,0xEF,0x03,0xFF,0xEF,0x03,0xFF,0xCF,0x01,0xFF, // 33 + 0x07,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x0F,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x07, // 34 + 0x00,0x20,0x00,0x80,0x1C,0x00,0xE0,0x7C,0x00,0xE0,0x7F,0x00,0xF0,0x7F,0x00,0xF0,0x1F,0x00,0xF0,0x7C,0x00,0xE0,0x7F,0x00,0xF8,0x7F,0x00,0xF8,0x7F,0x00,0xF8,0x1F,0x00,0xE8,0x1C,0x00,0xE0,0x04, // 35 + 0x00,0x00,0x00,0xE0,0x39,0x00,0xE0,0x3B,0x00,0xFF,0xFB,0x07,0x70,0x3B,0x00,0x7F,0xFB,0x07,0x70,0x3F,0x00,0x70,0x3F,0x00,0x70,0x1F,0x00,0x00,0x04, // 36 + 0x40,0x00,0x00,0xF0,0x01,0x00,0xF0,0x03,0x00,0x38,0x03,0x00,0x38,0x03,0x00,0xF0,0x43,0x00,0xF0,0xF9,0x00,0xC0,0x7E,0x00,0xC0,0x0F,0x00,0xF0,0x39,0x00,0x7C,0x7C,0x00,0x08,0x6E,0x00,0x00,0x66,0x00,0x00,0x6E,0x00,0x00,0x7E,0x00,0x00,0x3C, // 37 + 0x00,0x70,0x00,0x00,0xF8,0x00,0xF8,0xFC,0x00,0xFC,0xFF,0x01,0xFC,0xFF,0x01,0xDC,0xCF,0x01,0xCC,0xEF,0x01,0xFC,0xFF,0x00,0xFC,0xFF,0x00,0xFC,0xFC,0x00,0x78,0x7C,0x00,0x00,0x7E,0x00,0x00,0xFE,0x00,0x00,0x64, // 38 + 0x07,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00,0x1F, // 39 + 0x80,0x07,0x00,0xF0,0x7F,0x00,0xFC,0xFF,0x01,0xFE,0xFF,0x03,0xFF,0xFF,0x07,0x3F,0xF0,0x07,0x0F,0xC0,0x03,0x07,0x00,0x03,0x02,0x00,0x02, // 40 + 0x02,0x00,0x03,0x06,0x80,0x03,0x0F,0xC0,0x07,0xFF,0xF8,0x07,0xFF,0xFF,0x03,0xFE,0xFF,0x01,0xFC,0xFF,0x00,0xF0,0x3F, // 41 + 0x20,0x00,0x00,0x30,0x02,0x00,0x78,0x07,0x00,0xF0,0x07,0x00,0xFE,0x0F,0x00,0xFE,0x03,0x00,0xFE,0x01,0x00,0xFF,0x03,0x00,0xF0,0x0F,0x00,0xF8,0x07,0x00,0x3C,0x03,0x00,0x20, // 42 + 0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x0F,0x00,0xE0,0x3F,0x00,0xE0,0x3F,0x00,0xE0,0x3F,0x00,0xE0,0x7F,0x00,0x00,0x0F,0x00,0x00,0x0F,0x00,0x00,0x0F, // 43 + 0x00,0xE0,0x00,0x00,0xF0,0x01,0x00,0xF0,0x07,0x00,0xF0,0x03,0x00,0xE0, // 44 + 0x00,0x00,0x00,0x80,0x07,0x00,0x80,0x07,0x00,0x80,0x07,0x00,0x80,0x07,0x00,0x80,0x07,0x00,0x80,0x07,0x00,0x80,0x07, // 45 + 0x00,0xC0,0x00,0x00,0xE0,0x01,0x00,0xF0,0x01,0x00,0xE0,0x01,0x00,0xE0, // 46 + 0x00,0x00,0x01,0x00,0xC0,0x01,0x00,0xF8,0x01,0x00,0xFE,0x01,0xC0,0xFF,0x03,0xF0,0xFF,0x00,0xFC,0x1F,0x00,0xFF,0x07,0x00,0xFE,0x00,0x00,0x1E,0x00,0x00,0x06, // 47 + 0x80,0x07,0x00,0xF0,0x1F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x00,0x7E,0xF0,0x01,0x3E,0xE0,0x01,0x3E,0xE0,0x01,0x3E,0xF0,0x01,0xFE,0xFF,0x01,0xFC,0xFF,0x00,0xFC,0x7F,0x00,0xF0,0x3F,0x00,0xE0,0x1F, // 48 + 0x18,0x00,0x00,0x7C,0x00,0x00,0x3E,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01, // 49 + 0x00,0xF0,0x00,0x3E,0xF0,0x00,0x1E,0xF8,0x00,0x1F,0xF8,0x00,0x1F,0xFC,0x01,0x3F,0xFE,0x01,0xFF,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xF7,0x01,0xFC,0xF3,0x01,0xF8,0xF1,0x01, // 50 + 0x02,0xF8,0x00,0x3E,0xF0,0x00,0x1F,0xF0,0x01,0x9F,0xF3,0x01,0x8F,0xE3,0x01,0x9F,0xE3,0x01,0xDF,0xF7,0x01,0xFF,0xFF,0x01,0xFF,0xFF,0x01,0xFE,0xFF,0x00,0xFC,0x7F,0x00,0x30,0x1C, // 51 + 0x00,0x0E,0x00,0xF8,0x0F,0x00,0xFC,0x0F,0x00,0xFC,0x0F,0x00,0xFC,0x0F,0x00,0x0C,0x0E,0x00,0xFC,0xFF,0x01,0xFF,0xFF,0x01,0xFF,0xFF,0x01,0xFF,0xFF,0x01,0xFF,0xFF,0x01,0x00,0x0E, // 52 + 0x00,0xC8,0x00,0xFE,0xF3,0x00,0xFE,0xF3,0x01,0xFE,0xF3,0x01,0xFE,0xF3,0x01,0x9E,0xF3,0x01,0x9E,0xF3,0x01,0x9E,0xFF,0x01,0x9E,0xFF,0x01,0x9E,0xFF,0x00,0x1F,0x7F,0x00,0x00,0x3E, // 53 + 0x80,0x07,0x00,0xF0,0x3F,0x00,0xF8,0xFF,0x00,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0xBE,0xF7,0x01,0x9F,0xE3,0x01,0x9F,0xE3,0x01,0x9F,0xF7,0x01,0x9E,0xFF,0x01,0x9E,0xFF,0x00,0x26,0x7F,0x00,0x00,0x3E, // 54 + 0x3E,0x00,0x00,0x3E,0x00,0x01,0x1E,0xE0,0x01,0x1E,0xF8,0x01,0x1E,0xFE,0x01,0x9E,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x7F,0x00,0xFE,0x1F,0x00,0xFE,0x03,0x00,0x7E, // 55 + 0x00,0x18,0x00,0xF8,0x7E,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x01,0x1E,0xE3,0x01,0x1F,0xE3,0x01,0x1E,0xE3,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFC,0xFF,0x00,0xF8,0x7E,0x00,0x00,0x3C, // 56 + 0xE0,0x00,0x00,0xF8,0xE1,0x00,0xFC,0xF3,0x01,0xFE,0xF3,0x01,0xBE,0xE7,0x01,0x9E,0xE7,0x01,0x1E,0xF3,0x01,0x9E,0xFB,0x01,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFC,0x3F,0x00,0xF0,0x1F, // 57 + 0x80,0x40,0x00,0xC0,0xE1,0x01,0xE0,0xF3,0x01,0xE0,0xF3,0x01,0xC0,0xE1, // 58 + 0x80,0x40,0x00,0xC0,0xE1,0x00,0xE0,0xF3,0x07,0xE0,0xF3,0x03,0xC0,0xE1,0x01, // 59 + 0x80,0x00,0x00,0x80,0x0F,0x00,0xC0,0x0F,0x00,0xE0,0x1F,0x00,0xE0,0x3F,0x00,0xF0,0x3C,0x00,0xF8,0x7C,0x00,0x78,0xF8,0x00,0x7C,0x78,0x00,0x40,0x10, // 60 + 0x00,0x00,0x00,0xC0,0x3D,0x00,0xC0,0x3D,0x00,0xC0,0x3D,0x00,0xC0,0x3D,0x00,0xC0,0x3D,0x00,0xC0,0x3D,0x00,0xC0,0x3D, // 61 + 0x00,0x00,0x00,0x70,0x30,0x00,0x7C,0xF8,0x00,0xF8,0x78,0x00,0xF0,0x3C,0x00,0xF0,0x3D,0x00,0xE0,0x1F,0x00,0xC0,0x1F,0x00,0xC0,0x0F,0x00,0x80,0x07, // 62 + 0x04,0x00,0x00,0x3E,0x00,0x00,0x3E,0x00,0x00,0x3E,0xD8,0x01,0x1E,0xFE,0x03,0x1E,0xFF,0x03,0xBE,0xFF,0x03,0xFE,0xCF,0x01,0xFE,0x07,0x00,0xFC,0x03,0x00,0xFC,0x03,0x00,0xF8,0x01, // 63 + 0x00,0x00,0x00,0xC0,0x1F,0x00,0xF0,0x3F,0x00,0xF0,0x7F,0x00,0x78,0x72,0x00,0x38,0xEF,0x00,0xB8,0xEF,0x00,0x9C,0xE9,0x00,0x1C,0x6F,0x00,0xBC,0x1F,0x00,0xB8,0x1F,0x00,0x78,0x18,0x00,0xF0,0x1F,0x00,0xE0,0x0F,0x00,0x80,0x03, // 64 + 0x00,0xE0,0x00,0x00,0xFC,0x00,0x80,0xFF,0x00,0xF8,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x3B,0x00,0xFE,0x38,0x00,0xFE,0x3F,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xE0,0xFF,0x00,0x00,0xFF,0x00,0x00,0xF0, // 65 + 0x00,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x1E,0xE3,0x01,0x3E,0xE7,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFC,0xFE,0x00,0x78,0xFC,0x00,0x00,0x30, // 66 + 0x80,0x0F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x01,0x7E,0xF8,0x01,0x3E,0xF0,0x01,0x3E,0xF0,0x01,0x3E,0xF8,0x00,0x3E,0xF8,0x00,0x06, // 67 + 0x00,0x00,0x01,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x3E,0xF0,0x00,0x3E,0xF0,0x00,0x7E,0xFC,0x00,0xFC,0x7F,0x00,0xFC,0x7F,0x00,0xF8,0x3F,0x00,0xE0,0x0F, // 68 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x9E,0xF3,0x01,0x9E,0xF3,0x01,0x9E,0xF3,0x01,0x1E,0xF0,0x01,0x1E, // 69 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x9E,0x03,0x00,0x9E,0x03,0x00,0x9E,0x03,0x00,0x9E,0x03,0x00,0x1E, // 70 + 0x80,0x0F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x7E,0xF0,0x01,0xBF,0xF7,0x01,0x9F,0xF7,0x01,0x9F,0xF7,0x01,0x9F,0xFF,0x01,0x9E,0xFF,0x01,0xBE,0xFF,0x00,0x80,0x7F, // 71 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x00,0x0C,0x00,0x00,0x0C,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01, // 72 + 0x00,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x7F,0x00,0x06, // 73 + 0x00,0xF8,0x00,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x7F,0x00,0xFE,0x1F, // 74 + 0x00,0x00,0x02,0xFF,0xFF,0x03,0xFE,0xFF,0x03,0xFE,0xFF,0x03,0xFE,0xFF,0x03,0xFE,0x1F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFE,0xFF,0x01,0xFF,0xFE,0x01,0x7E,0xFC,0x01,0x1E,0xF0,0x01,0x0E,0xC0,0x01,0x06,0x80, // 75 + 0x00,0x00,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0x06,0xF8,0x00,0x00,0xF8,0x00,0x00,0xF8,0x00,0x00,0xF8, // 76 + 0x00,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x0F,0x00,0xF0,0xFF,0x00,0x80,0xFF,0x00,0x80,0xFF,0x00,0xF0,0x1F,0x00,0xFC,0x03,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE, // 77 + 0x00,0x80,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x03,0x00,0xF8,0x0F,0x00,0xE0,0x7F,0x00,0x80,0xFF,0x01,0xF8,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0x7E, // 78 + 0x80,0x07,0x00,0xE0,0x3F,0x00,0xF0,0x7F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xF8,0x00,0x7C,0xF0,0x01,0x7C,0xF0,0x01,0x7C,0xF8,0x00,0xFC,0xFF,0x00,0xF8,0xFF,0x00,0xF8,0x7F,0x00,0xF0,0x3F,0x00,0xE0,0x1F, // 79 + 0x00,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x1E,0x0F,0x00,0x1E,0x0F,0x00,0xBE,0x0F,0x00,0xFE,0x07,0x00,0xFE,0x07,0x00,0xFC,0x03,0x00,0xF8,0x03,0x00,0xE0, // 80 + 0xC0,0x07,0x00,0xF0,0x1F,0x00,0xF8,0x7F,0x00,0xFC,0x7F,0x00,0xFC,0xFF,0x00,0xFE,0xFC,0x00,0x7E,0xF8,0x01,0x3E,0xF0,0x01,0x3E,0xF0,0x01,0x7E,0xF8,0x00,0xFE,0xFF,0x07,0xFC,0xFF,0x07,0xFC,0xFF,0x03,0xF8,0xBF,0x01,0xF0,0x1F,0x01,0x80,0x03, // 81 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x1F,0x00,0x0E,0x0E,0x00,0x1E,0x3F,0x00,0x9E,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFC,0xF7,0x00,0xF8,0xC3,0x00,0xF0,0x80, // 82 + 0x60,0xC0,0x00,0xF8,0xF9,0x00,0xFC,0xF3,0x01,0xFE,0xF3,0x01,0xFE,0xF7,0x01,0xFF,0xF7,0x01,0x9F,0xF7,0x01,0x9F,0xFF,0x01,0x9F,0xFF,0x01,0x9E,0xFF,0x00,0x3E,0x7F,0x00,0x00,0x3E, // 83 + 0x3E,0x00,0x00,0x3E,0x00,0x00,0x3E,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x0F,0x00,0x3E,0x00,0x00,0x3E,0x00,0x00,0x3E, // 84 + 0xE0,0x03,0x00,0xFC,0x3F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x01,0xFC,0xFF,0x01,0xFC,0xFE,0x01,0x00,0xE0,0x03,0x00,0xE0,0x01,0x00,0xFE,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x7F,0x00,0xFE,0x1F,0x00,0xFE,0x01, // 85 + 0x0E,0x00,0x00,0x7E,0x00,0x00,0xFE,0x07,0x00,0xFE,0x3F,0x00,0xFE,0xFF,0x01,0xF0,0xFF,0x01,0x00,0xFF,0x01,0x00,0xFF,0x01,0xF0,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x0F,0x00,0xFE,0x00,0x00,0x0E, // 86 + 0x0E,0x00,0x00,0xFE,0x03,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x00,0xFF,0x01,0xC0,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x3F,0x00,0xFE,0x01,0x00,0xFE,0x7F,0x00,0xFE,0xFF,0x01,0xC0,0xFF,0x01,0x00,0xFE,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x7F,0x00,0xFE,0x01,0x00,0x06, // 87 + 0x04,0xC0,0x00,0x1E,0xF0,0x00,0x7E,0xFC,0x00,0xFE,0xFE,0x01,0xFE,0xFF,0x01,0xFC,0x7F,0x00,0xF0,0x1F,0x00,0xF0,0x3F,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x01,0xFE,0xFC,0x00,0x3E,0xF0,0x00,0x0E,0xC0,0x00,0x02, // 88 + 0x04,0x00,0x00,0x3C,0x00,0x00,0xFC,0x00,0x00,0xFC,0xFF,0x01,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0xE0,0xFF,0x01,0xE0,0xFF,0x01,0xF8,0xFF,0x01,0xFC,0x01,0x00,0xFE,0x00,0x00,0x7C,0x00,0x00,0x1C,0x00,0x00,0x0C, // 89 + 0x00,0xF0,0x00,0x1E,0xF8,0x01,0x1E,0xFE,0x01,0x1E,0xFF,0x01,0x9E,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xF7,0x01,0xFE,0xF1,0x01,0xFE,0xF0,0x00,0x3E,0xF0,0x00,0x1E,0xF0, // 90 + 0x00,0x00,0x00,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0x03,0x80,0x07,0x03,0x80,0x07,0x07,0x80,0x07, // 91 + 0x02,0x00,0x00,0x0C,0x00,0x00,0x7E,0x00,0x00,0xFE,0x01,0x00,0xFF,0x0F,0x00,0xFC,0x3F,0x00,0xE0,0xFF,0x00,0x80,0xFF,0x03,0x00,0xFC,0x01,0x00,0xE0,0x01,0x00,0x80,0x01, // 92 + 0x07,0x80,0x07,0x07,0x00,0x07,0x07,0x00,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0x3F, // 93 + 0x80,0x01,0x00,0xE0,0x01,0x00,0xF8,0x01,0x00,0xFE,0x01,0x00,0xFE,0x01,0x00,0x3E,0x00,0x00,0xFE,0x00,0x00,0xFE,0x03,0x00,0xFC,0x01,0x00,0xE0,0x01,0x00,0x80,0x01, // 94 + 0x00,0x00,0x3C,0x00,0x00,0x3C,0x00,0x00,0x3C,0x00,0x00,0x3C,0x00,0x00,0x3C,0x00,0x00,0x3C,0x00,0x00,0x3C, // 95 + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x03,0x00,0x00,0x01,0x00,0x00,0x01, // 96 + 0x00,0xE0,0x00,0x00,0xFC,0x00,0x80,0xFF,0x00,0xF8,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x3B,0x00,0xFE,0x38,0x00,0xFE,0x3F,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xE0,0xFF,0x00,0x00,0xFF,0x00,0x00,0xF0, // 97 + 0x00,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x1E,0xE3,0x01,0x3E,0xE7,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFC,0xFE,0x00,0x78,0xFC,0x00,0x00,0x30, // 98 + 0x80,0x0F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0x7E,0xF0,0x01,0x7E,0xF0,0x01,0x3E,0xF0,0x01,0x3E,0xF0,0x01,0x3E,0xF0,0x01,0x00,0x08, // 99 + 0x00,0x00,0x01,0xFC,0xFF,0x01,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0x3E,0xF0,0x00,0x3E,0xF0,0x00,0xFC,0xFC,0x00,0xFC,0x7F,0x00,0xFC,0x3F,0x00,0xF8,0x1F,0x00,0xE0,0x0F, // 100 + 0x80,0x0F,0x00,0xF0,0x3F,0x00,0xF8,0xFF,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x01,0x7E,0xFF,0x01,0x3E,0xF7,0x01,0x3E,0xE7,0x01,0x3E,0xF3,0x01,0xFE,0xF3,0x01,0xFC,0xF3,0x00,0xF8,0x0B,0x00,0xF0,0x03, // 101 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x9E,0x03,0x00,0x9E,0x03,0x00,0x9E,0x03,0x00,0x9E,0x03,0x00,0x1E, // 102 + 0x80,0x0F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0x7E,0xF8,0x01,0xBE,0xF7,0x01,0xBE,0xF7,0x01,0x9E,0xF7,0x01,0x9E,0xFF,0x01,0x9E,0xFF,0x00,0xBE,0xFF,0x00,0x80,0x7F, // 103 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x00,0x0C,0x00,0x00,0x0C,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01, // 104 + 0x06,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF, // 105 + 0x00,0xF8,0x00,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0x00,0xF0,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0x7F,0x00,0xFE,0x1F, // 106 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x1F,0x00,0xE0,0x3F,0x00,0xF8,0x7F,0x00,0xFC,0xFF,0x01,0xFE,0xFE,0x01,0x7C,0xFC,0x01,0x3C,0xF0,0x01,0x1C,0xC0,0x00,0x0C,0x80, // 107 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0x06,0xF8,0x00,0x00,0xF8,0x00,0x00,0xF8,0x00,0x00,0xF8, // 108 + 0x00,0xE0,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x1E,0x00,0x00,0x1E,0x80,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFC,0xFF,0x00,0x1E,0x00,0x00,0x1E,0xE0,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFC,0xFF,0x00,0xF0,0xFF, // 109 + 0x00,0xE0,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0x3C,0x00,0x00,0x1E,0x00,0x00,0x3E,0xF0,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFC,0xFF,0x00,0xF8,0xFF,0x00,0x00,0x1E, // 110 + 0xC0,0x07,0x00,0xF0,0x1F,0x00,0xF8,0x3F,0x00,0xFC,0x7F,0x00,0xFC,0x7F,0x00,0x7E,0xFC,0x00,0x3E,0xF8,0x00,0x3E,0xF8,0x00,0x7E,0xF8,0x00,0xFE,0xFF,0x00,0xFC,0x7F,0x00,0xFC,0x7F,0x00,0xF8,0x3F,0x00,0xE0,0x0F, // 111 + 0x00,0x00,0x00,0xFC,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0x3E,0x0E,0x00,0x3E,0x0E,0x00,0x3E,0x0F,0x00,0xFE,0x0F,0x00,0xFC,0x07,0x00,0xFC,0x07,0x00,0xF8,0x03,0x00,0xE0, // 112 + 0xC0,0x07,0x00,0xF0,0x1F,0x00,0xF8,0x7F,0x00,0xFC,0x7F,0x00,0xFC,0xFF,0x00,0xFE,0xFC,0x00,0x7E,0xF8,0x01,0x3E,0xF0,0x01,0x3E,0xF0,0x01,0x7E,0xF8,0x00,0xFE,0xFF,0x07,0xFC,0xFF,0x07,0xFC,0xFF,0x03,0xF8,0xBF,0x01,0xF0,0x1F,0x01,0x80,0x03, // 113 + 0x00,0x00,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x1F,0x00,0x0E,0x0E,0x00,0x1E,0x3F,0x00,0x9E,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFC,0xF7,0x00,0xF8,0xC3,0x00,0xF0,0x80, // 114 + 0xE0,0xC8,0x00,0xF8,0xF3,0x00,0xFC,0xF3,0x01,0xFC,0xF7,0x01,0xFE,0xF7,0x01,0xBE,0xF7,0x01,0xBE,0xF7,0x01,0xBE,0xFF,0x01,0xBE,0xFF,0x01,0xBE,0xFF,0x00,0x3E,0x7F,0x00,0x00,0x3E, // 115 + 0x3E,0x00,0x00,0x3E,0x00,0x00,0x3E,0x00,0x00,0xFE,0x00,0x00,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0x3E,0x00,0x00,0x3E,0x00,0x00,0x3E, // 116 + 0x80,0x07,0x00,0xFC,0x3F,0x00,0xFC,0x7F,0x00,0xFC,0xFF,0x00,0xFC,0xFF,0x00,0x7C,0xF8,0x01,0x04,0xF0,0x00,0x00,0xF8,0x00,0x80,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x00,0x1E, // 117 + 0x1C,0x00,0x00,0xFC,0x00,0x00,0xFC,0x03,0x00,0xFC,0x1F,0x00,0xFC,0xFF,0x00,0xF0,0xFF,0x01,0x00,0xFF,0x01,0x00,0xFF,0x01,0xF0,0xFF,0x01,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0x0F,0x00,0xFE,0x00,0x00,0x0E, // 118 + 0x0C,0x00,0x00,0xFC,0x03,0x00,0xFC,0x7F,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x00,0xFE,0xFF,0x00,0x00,0xFF,0x00,0xC0,0xFF,0x00,0xFC,0xFF,0x00,0xFC,0x3F,0x00,0xFC,0x01,0x00,0xFC,0x7F,0x00,0xFC,0xFF,0x01,0xC0,0xFF,0x01,0x00,0xFE,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0xFF,0x01,0xFE,0x7F,0x00,0xFE,0x01,0x00,0x06, // 119 + 0x04,0xC0,0x00,0x1C,0xF0,0x00,0x7C,0xF8,0x00,0xFE,0xFE,0x01,0xFE,0xFF,0x01,0xFC,0x7F,0x00,0xF0,0x1F,0x00,0xF0,0x3F,0x00,0xFC,0xFF,0x00,0xFE,0xFF,0x01,0xFE,0xFC,0x00,0x3E,0xF0,0x00,0x0C,0xE0,0x00,0x04,0x80, // 120 + 0x0C,0x00,0x00,0x3C,0x00,0x00,0xFC,0x00,0x00,0xFC,0x03,0x00,0xFE,0xFF,0x01,0xFC,0xFF,0x01,0xE0,0xFF,0x01,0xE0,0xFF,0x01,0xF8,0xFF,0x01,0xFE,0x03,0x00,0xFC,0x00,0x00,0x7C,0x00,0x00,0x1C,0x00,0x00,0x04, // 121 + 0x3E,0x10,0x00,0x3E,0xF8,0x01,0x1E,0xFC,0x01,0x1E,0xFE,0x01,0x9E,0xFF,0x01,0xDE,0xFF,0x01,0xFE,0xF7,0x01,0xFE,0xF3,0x01,0xFE,0xF0,0x00,0x7E,0xF0,0x00,0x3E,0xF0, // 122 + 0x80,0x07,0x00,0x80,0x07,0x00,0x9E,0xC7,0x01,0xFF,0xFF,0x03,0xFF,0xFF,0x03,0xFF,0xFE,0x07,0xE7,0x9C,0x07,0x07,0x00,0x03,0x07,0x00,0x01, // 123 + 0x00,0x00,0x00,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x07, // 124 + 0x00,0x80,0x07,0x06,0x80,0x07,0xC7,0x88,0x07,0xFF,0xFD,0x07,0xFF,0xFF,0x07,0xFF,0xFF,0x03,0x9E,0xFF,0x03,0x80,0x07,0x00,0x00,0x07, // 125 +}; + + const uint8_t font_Chewy_24[] = { 0x14, // Width: 20 0x20, // Height: 32 diff --git a/nametag8_CH592/user/render/font_table.c b/nametag8_CH592/user/render/font_table.c index 4beea89..66eafb1 100644 --- a/nametag8_CH592/user/render/font_table.c +++ b/nametag8_CH592/user/render/font_table.c @@ -6,11 +6,13 @@ #include "font.h" -const FontTable font_table[8] = { +const FontTable font_table[10] = { {0, "Dialog 8", font_Dialog_plain_8}, - {0, "DJVmonoB11", font_DejaVu_Sans_Mono_Bold_11}, + {0, "DJVmono 11", font_DejaVu_Sans_Mono_Bold_11}, + {0, "DSEG14 18", font_DSEG14_Classic_18}, {1, "Nimbmono20", font_Nimbus_Mono_L_Bold_20}, - {1, "DJVmonoB24", font_DialogInput_Bold_24}, + {1, "DlgBold 24", font_DialogInput_Bold_24}, + {1, "LuckestG23", font_Luckiest_Guy_23}, {1, "Chewy 24", font_Chewy_24}, {1, "Crushed 25", font_Crushed_25}, {1, "NimbSL 25", font_Nimbus_Sans_L_25}, diff --git a/nametag8_CH592/user/ui/menu_base.c b/nametag8_CH592/user/ui/menu_base.c index ab94f71..058f60f 100644 --- a/nametag8_CH592/user/ui/menu_base.c +++ b/nametag8_CH592/user/ui/menu_base.c @@ -26,7 +26,7 @@ void menu_tick() menu->dispfn(menu_idx); // // do we flip the display? - if ((menu == &menu_6) && (menu_idx == 4)) { // accelerometer + if ((menu == &menu_6) && (menu_idx == 5)) { // about > accelerometer // accelerometer page never flips ssd1306_set_flipmirror(0); } else if (menu != &menu_none) { // nametag diff --git a/nametag8_CH592/user/ui/menu_def.c b/nametag8_CH592/user/ui/menu_def.c index 268df32..1825a67 100644 --- a/nametag8_CH592/user/ui/menu_def.c +++ b/nametag8_CH592/user/ui/menu_def.c @@ -41,5 +41,5 @@ const MenuItem menu_5 = {7, MENU_FLAG_SCROLL | MENU_FLAG_SAVE_ON_EXIT, // about menu // credits, leds, leds, leds, accel, cpu usage/uptime, light/temp, errors, font test -const MenuItem menu_6 = {9, MENU_FLAG_SCROLL, +const MenuItem menu_6 = {10, MENU_FLAG_SCROLL, (MenuItem *)&menu_0, 6, &menu_6_disp, 0}; diff --git a/nametag8_CH592/user/ui/menu_entry_0.c b/nametag8_CH592/user/ui/menu_entry_0.c index 4948497..a6d8509 100644 --- a/nametag8_CH592/user/ui/menu_entry_0.c +++ b/nametag8_CH592/user/ui/menu_entry_0.c @@ -251,7 +251,7 @@ MENU_0_DISP_CHAR_ROTATE: __HIGH_CODE void menu_0_disp(uint8_t idx) { - char txt[12]; + char txt[14]; uint8_t w; ssd1306fb_set_color(SSD1306_STATE_SET_PIXEL); @@ -262,13 +262,13 @@ void menu_0_disp(uint8_t idx) // which item selected? ssd1306fb_set_cursor(32, 9); switch (idx) { - case 0: strcpy(txt, "Nametag!"); break; - case 1: strcpy(txt, "Name Setup"); break; - case 2: strcpy(txt, "LED Setup"); break; - case 3: strcpy(txt, "Snek"); break; - case 4: strcpy(txt, "Morble"); break; - case 5: strcpy(txt, "Options"); break; - case 6: strcpy(txt, "About"); break; + case 0: strcpy(txt, "Nametag!"); break; + case 1: strcpy(txt, "Name Setup"); break; + case 2: strcpy(txt, "RGB Setup"); break; + case 3: strcpy(txt, "Snek"); break; + case 4: strcpy(txt, "Morble"); break; + case 5: strcpy(txt, "Options"); break; + case 6: strcpy(txt, "About & Dbg"); break; } ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, txt, 1); diff --git a/nametag8_CH592/user/ui/menu_entry_6.c b/nametag8_CH592/user/ui/menu_entry_6.c index 59c0378..2fb9f49 100644 --- a/nametag8_CH592/user/ui/menu_entry_6.c +++ b/nametag8_CH592/user/ui/menu_entry_6.c @@ -30,8 +30,6 @@ uint8_t font_index = 0; uint8_t font_glyph = 0; -uint8_t sn_byte = 0; - void menu_6_font_index(int8_t dir) @@ -83,7 +81,7 @@ void menu_6_font_prev(uint8_t idx) void menu_6_accel_reset(uint8_t idx) { // todo: figure out what this does - // movement_worst = 0; + movement_worst = 0; } void menu_6_btn_use() @@ -116,32 +114,39 @@ void menu_6_disp(uint8_t idx) // which item selected? switch (idx) { - case 0: { + case 0: { // about ssd1306fb_set_cursor(11, 0); - ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "GAT", 1); - ssd1306fb_set_cursor(13, 11); + ssd1306fb_draw_str(font_DSEG14_Classic_18, "GAT", 1); + ssd1306fb_set_cursor(11, 22); ssd1306fb_draw_str(font_Dialog_plain_8, "Nametag", 1); - ssd1306fb_set_cursor(80, 0); - ssd1306fb_draw_str(font_Dialog_plain_8, "by true", 1); - - if (sn_byte) { - sprintf(txt, "#%d", sn_byte); - i = ssd1306fb_get_str_width(font_DejaVu_Sans_Mono_Bold_11, txt, strlen(txt), 0); - ssd1306fb_set_cursor(97 - (i >> 1), 10); - ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, txt, 1); - } + ssd1306fb_set_cursor(64, 0); + ssd1306fb_draw_str(font_Dialog_plain_8, "by true for", 1); + + ssd1306fb_set_cursor(64, 11); + ssd1306fb_draw_str(font_Dialog_plain_8, "Supercon 8", 1); + sprintf(txt, "%s", vers); - ssd1306fb_set_cursor(11, 24); - ssd1306fb_draw_str(font_Dialog_plain_8, "v", 0); - ssd1306fb_set_cursor(15, 24); - ssd1306fb_draw_str(font_Dialog_plain_8, txt, 0); - ssd1306fb_set_cursor(54, 24); - ssd1306fb_draw_str(font_Dialog_plain_8, "@WhiskeyHackers", 0); + ssd1306fb_set_cursor(62, 22); + ssd1306fb_draw_str(font_Dialog_plain_8, "ver.", 0); + ssd1306fb_set_cursor(78, 22); + ssd1306fb_draw_str(font_Dialog_plain_8, txt, 1); + + break; } - case 1: { + case 1: { // manual + ssd1306fb_set_cursor(11, 0); + ssd1306fb_draw_str(font_Dialog_plain_8, "Manual and code at", 1); + ssd1306fb_set_cursor(11, 11); + ssd1306fb_draw_str(font_Dialog_plain_8, "basic.truecontrol.org", 1); + ssd1306fb_set_cursor(11, 22); + ssd1306fb_draw_str(font_Dialog_plain_8, "or hackaday.io / true", 0); + + break; + } + case 2: { // led 1-4 ssd1306fb_set_cursor(54, 4); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "LED", 1); ssd1306fb_set_cursor(54, 15); @@ -158,7 +163,7 @@ void menu_6_disp(uint8_t idx) } break; } - case 2: { + case 3: { // led 5-8 ssd1306fb_set_cursor(54, 4); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "LED", 1); ssd1306fb_set_cursor(54, 15); @@ -175,7 +180,7 @@ void menu_6_disp(uint8_t idx) } break; } - case 3: { + case 4: { // led 9-12 ssd1306fb_set_cursor(54, 4); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "LED", 1); ssd1306fb_set_cursor(53, 15); @@ -196,7 +201,7 @@ void menu_6_disp(uint8_t idx) } break; } - case 4: { + case 5: { // accelerometer ssd1306fb_set_cursor(10, -1); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "Accelerometer", 1); @@ -224,7 +229,7 @@ void menu_6_disp(uint8_t idx) break; } - case 5: { + case 6: { // cpu stats sprintf(txt, "CPU Load: %3u%%", cpu_pct); ssd1306fb_set_cursor(10, -1); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, txt, 1); @@ -238,7 +243,7 @@ void menu_6_disp(uint8_t idx) ssd1306fb_draw_str(font_Dialog_plain_8, txt, 0); break; } - case 6: { + case 7: { // misc stats ssd1306fb_set_cursor(10, -1); ssd1306fb_draw_str(font_Dialog_plain_8, "Light: ", 1); oled.cursor_x = 39; @@ -271,7 +276,7 @@ void menu_6_disp(uint8_t idx) break; } - case 7: { + case 8: { // error counters ssd1306fb_set_cursor(10, -1); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "Error Counters", 1); @@ -295,7 +300,7 @@ void menu_6_disp(uint8_t idx) break; } - case 8: { + case 9: { ssd1306fb_set_cursor(10, -1); ssd1306fb_draw_str(font_DejaVu_Sans_Mono_Bold_11, "Font Test", 1); @@ -323,16 +328,17 @@ void menu_6_disp(uint8_t idx) case 0: case 1: case 2: - case 3: { + case 3: + case 4: { menu_btn_use_std(); break; } - case 4: { + case 5: { menu_btn_use_std(); btn[2].cb_push = menu_6_accel_reset; break; } - case 8: { + case 9: { menu_6_btn_use(); menu_draw_buttons(MENU_BTNSTYLE_ABOUT, 0x0c); break;