diff --git a/gen/fonts.c b/gen/fonts.c index b811732..d562c1d 100644 --- a/gen/fonts.c +++ b/gen/fonts.c @@ -9,8 +9,8 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = { (uint8_t *)"\x06\xc0\xc6\x1c\x70\xc6\x06", (uint8_t *)"\x06\x5c\xfe\xb2\xfe\x4c\x1e", (uint8_t *)"\x01\xc0", - (uint8_t *)"\x03\x3c\x7e\x81", - (uint8_t *)"\x03\x81\x7e\x3c", + (uint8_t *)"\x03\x38\x7c\x82", + (uint8_t *)"\x03\x82\x7c\x38", (uint8_t *)"\x05\x6c\x38\xfe\x38\x6c", (uint8_t *)"\x05\x10\x10\x7c\x10\x10", (uint8_t *)"\x02\x03\x06", @@ -60,9 +60,9 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = { (uint8_t *)"\x06\xc6\xee\x38\x38\xee\xc6", (uint8_t *)"\x06\xc0\xe0\x3e\x3e\xe0\xc0", (uint8_t *)"\x05\x8e\x9e\xba\xf2\xe2", - (uint8_t *)"\x03\xff\xff\x81", + (uint8_t *)"\x03\xfe\xfe\x82", (uint8_t *)"\x03\xe0\x38\x0e", - (uint8_t *)"\x03\x81\xff\xff", + (uint8_t *)"\x03\x82\xfe\xfe", (uint8_t *)"\x03\x60\xc0\x60", (uint8_t *)"\x06\x02\x02\x02\x02\x02\x02", (uint8_t *)"\x02\x80\x40", @@ -92,8 +92,12 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = { (uint8_t *)"\x05\x36\x3e\x08\x3e\x36", (uint8_t *)"\x05\x38\x3d\x05\x3f\x3e", (uint8_t *)"\x05\x26\x2e\x3a\x32\x22", - (uint8_t *)"\x07\x44\xee\x7c\x38\x7c\xee\x44", + (uint8_t *)"\x04\x10\x7c\xee\x82", (uint8_t *)"\x02\xff\xff", + (uint8_t *)"\x04\x82\xee\x7c\x10", + (uint8_t *)"\x04\x08\x10\x08\x10", + (uint8_t *)"\x02\x00\x00", + (uint8_t *)"\x07\x44\xee\x7c\x38\x7c\xee\x44", (uint8_t *)"\x07\x18\x1c\x0e\x18\x30\x40\x80", (uint8_t *)"\x06\x10\x38\x7c\x10\x10\x10", (uint8_t *)"\x06\x10\x10\x10\x7c\x38\x10", diff --git a/gen/fonts.h b/gen/fonts.h index 0cd6b62..b4465ea 100644 --- a/gen/fonts.h +++ b/gen/fonts.h @@ -4,7 +4,7 @@ #include #define FONT_START 32 -#define FONT_END 128 +#define FONT_END 132 #define FONT_HEIGHT 8 int fontCharWidth(char c); diff --git a/gen/fonts/font.png b/gen/fonts/font.png index efc8849..6aa04f5 100644 Binary files a/gen/fonts/font.png and b/gen/fonts/font.png differ diff --git a/layout.c b/layout.c index ae082ee..bef3a6c 100644 --- a/layout.c +++ b/layout.c @@ -67,14 +67,14 @@ void layoutDialog(LayoutDialogIcon icon, const char *btnNo, const char *btnYes, } } if (btnNo) { - oledDrawString(1, OLED_HEIGHT - 8, "{"); - oledDrawString(fontCharWidth('{') + 3, OLED_HEIGHT - 8, btnNo); - oledInvert(0, OLED_HEIGHT - 9, fontCharWidth('{') + fontStringWidth(btnNo) + 2, OLED_HEIGHT - 1); + oledDrawString(1, OLED_HEIGHT - 8, "\x80"); + oledDrawString(fontCharWidth('\x80') + 3, OLED_HEIGHT - 8, btnNo); + oledInvert(0, OLED_HEIGHT - 9, fontCharWidth('\x80') + fontStringWidth(btnNo) + 2, OLED_HEIGHT - 1); } if (btnYes) { - oledDrawString(OLED_WIDTH - fontCharWidth('}') - 1, OLED_HEIGHT - 8, "}"); - oledDrawString(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('}') - 3, OLED_HEIGHT - 8, btnYes); - oledInvert(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('}') - 4, OLED_HEIGHT - 9, OLED_WIDTH - 1, OLED_HEIGHT - 1); + oledDrawString(OLED_WIDTH - fontCharWidth('\x81') - 1, OLED_HEIGHT - 8, "\x81"); + oledDrawString(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('\x81') - 3, OLED_HEIGHT - 8, btnYes); + oledInvert(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('\x81') - 4, OLED_HEIGHT - 9, OLED_WIDTH - 1, OLED_HEIGHT - 1); } oledRefresh(); }