From 7adba06333470596c2ff301f216ef64ec75021ad Mon Sep 17 00:00:00 2001 From: TT Date: Sun, 20 Oct 2019 22:50:29 +0900 Subject: [PATCH] chore: reduce foot-print of numfont20x24 --- Makefile | 2 +- ili9341.c | 35 +-- nanovna.h | 6 +- numfont20x22.c | 624 +++++++++++++++++++++++++++++++++++++++++++++ numfont20x24.c | 669 ------------------------------------------------- ui.c | 8 +- 6 files changed, 650 insertions(+), 694 deletions(-) create mode 100644 numfont20x22.c delete mode 100644 numfont20x24.c diff --git a/Makefile b/Makefile index e4b905b..73ebbd9 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,7 @@ CSRC = $(STARTUPSRC) \ $(STREAMSSRC) \ $(SHELLSRC) \ usbcfg.c \ - main.c si5351.c tlv320aic3204.c dsp.c plot.c ui.c ili9341.c numfont20x24.c Font5x7.c flash.c adc.c + main.c si5351.c tlv320aic3204.c dsp.c plot.c ui.c ili9341.c numfont20x22.c Font5x7.c flash.c adc.c # $(TESTSRC) \ diff --git a/ili9341.c b/ili9341.c index bbbd4bd..b551df8 100644 --- a/ili9341.c +++ b/ili9341.c @@ -426,27 +426,28 @@ ili9341_line(int x0, int y0, int x1, int y1, uint16_t fg) } -const font_t NF20x24 = { 20, 24, 1, 24, (const uint32_t *)numfont20x24 }; -//const font_t NF32x24 = { 32, 24, 1, 24, (const uint32_t *)numfont32x24 }; -//const font_t NF32x48 = { 32, 48, 2, 24, (const uint32_t *)numfont32x24 }; +const font_t NF20x22 = { 20, 22, 1, 3*22, (const uint8_t *)numfont20x22 }; void ili9341_drawfont(uint8_t ch, const font_t *font, int x, int y, uint16_t fg, uint16_t bg) { uint16_t *buf = spi_buffer; - uint32_t bits; - const uint32_t *bitmap = &font->bitmap[font->slide * ch]; - int c, r, j; - - for (c = 0; c < font->slide; c++) { - for (j = 0; j < font->scaley; j++) { - bits = bitmap[c]; - for (r = 0; r < font->width; r++) { - *buf++ = (0x80000000UL & bits) ? fg : bg; - bits <<= 1; - } - } - } + const uint8_t *bitmap = &font->bitmap[font->slide * ch]; + int c, r; + + for (c = 0; c < font->height; c++) { + uint8_t bits = *bitmap++; + uint8_t m = 0x80; + for (r = 0; r < font->width; r++) { + *buf++ = (bits & m) ? fg : bg; + m >>= 1; + + if (m == 0) { + bits = *bitmap++; + m = 0x80; + } + } + } ili9341_bulk(x, y, font->width, font->height); } @@ -485,7 +486,7 @@ ili9341_test(int mode) #if 1 case 3: for (i = 0; i < 10; i++) - ili9341_drawfont(i, &NF20x24, i*20, 120, colormap[i%6], 0x0000); + ili9341_drawfont(i, &NF20x22, i*20, 120, colormap[i%6], 0x0000); break; #endif #if 0 diff --git a/nanovna.h b/nanovna.h index e6b7a66..08d735e 100644 --- a/nanovna.h +++ b/nanovna.h @@ -153,7 +153,7 @@ extern int area_height; // font extern const uint8_t x5x7_bits []; -extern const uint32_t numfont20x24[][24]; +extern const uint8_t numfont20x22[][22 * 3]; #define S_PI "\034" #define S_MICRO "\035" @@ -269,10 +269,10 @@ typedef struct { uint16_t height; uint16_t scaley; uint16_t slide; - const uint32_t *bitmap; + const uint8_t *bitmap; } font_t; -extern const font_t NF20x24; +extern const font_t NF20x22; extern uint16_t spi_buffer[1024]; diff --git a/numfont20x22.c b/numfont20x22.c new file mode 100644 index 0000000..a84d4dd --- /dev/null +++ b/numfont20x22.c @@ -0,0 +1,624 @@ +/* + * Copyright (c) 2014-2019, TAKAHASHI Tomohiro (TTRFTECH) edy555@gmail.com + * All rights reserved. + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * The software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#include + +const uint8_t numfont20x22[][22 * 3] = { + { // 0 + 0b00000111, 0b11111100, 0b00001000, + 0b00011111, 0b11111111, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111100, 0b00000111, 0b11100000, + 0b01111110, 0b00001111, 0b11000000, + 0b01111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00011111, 0b11111111, 0b00000000, + 0b00000111, 0b11111100, 0b00001000, + }, + { // 1 + 0b00000000, 0b01111100, 0b00001000, + 0b00000000, 0b11111100, 0b00000000, + 0b00000000, 0b11111100, 0b00000000, + 0b00000001, 0b11111100, 0b00000000, + 0b00000111, 0b11111100, 0b00000000, + 0b00011111, 0b11111100, 0b00000000, + 0b00011111, 0b11111100, 0b00000000, + 0b00011111, 0b11111100, 0b00000000, + + 0b00011111, 0b01111100, 0b00000000, + 0b00011111, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + }, + { // 2 + 0b00000011, 0b11111000, 0b00001000, + 0b00001111, 0b11111110, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000111, 0b11100000, + + 0b00000000, 0b00001111, 0b11100000, + 0b00000000, 0b00111111, 0b11000000, + 0b00000000, 0b11111111, 0b10000000, + 0b00000011, 0b11111110, 0b00000000, + 0b00001111, 0b11111000, 0b00000000, + 0b00011111, 0b11100000, 0b00000000, + 0b00111111, 0b10000000, 0b00000000, + 0b01111111, 0b00000000, 0b00000000, + + 0b11111110, 0b00000000, 0b00000000, + 0b11111100, 0b00000000, 0b00000000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + }, + { // 3 + 0b00000011, 0b11111000, 0b00001000, + 0b00001111, 0b11111110, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000111, 0b11100000, + + 0b00000000, 0b00001111, 0b11000000, + 0b00000000, 0b11111111, 0b11000000, + 0b00000000, 0b11111111, 0b00000000, + 0b00000000, 0b11111111, 0b00000000, + 0b00000000, 0b11111111, 0b10000000, + 0b00000000, 0b00001111, 0b11000000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000011, 0b11100000, + 0b11111110, 0b00000111, 0b11100000, + 0b01111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00001111, 0b11111111, 0b00000000, + 0b00000001, 0b11111000, 0b00001000, + }, + { // 4 + 0b00000000, 0b00001111, 0b00001000, + 0b00000000, 0b00011111, 0b00000000, + 0b00000000, 0b00111111, 0b00000000, + 0b00000000, 0b01111111, 0b00000000, + 0b00000000, 0b11111111, 0b00000000, + 0b00000001, 0b11111111, 0b00000000, + 0b00000011, 0b11111111, 0b00000000, + 0b00000111, 0b11111111, 0b00000000, + + 0b00001111, 0b11011111, 0b00000000, + 0b00011111, 0b10011111, 0b00000000, + 0b00111111, 0b00011111, 0b00000000, + 0b01111110, 0b00011111, 0b00000000, + 0b11111100, 0b00011111, 0b00000000, + 0b11111000, 0b00011111, 0b00000000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b00000000, 0b00011111, 0b00000000, + 0b00000000, 0b00011111, 0b00000000, + 0b00000000, 0b00011111, 0b00000000, + 0b00000000, 0b00011111, 0b00000000, + }, + { // 5 + 0b11111111, 0b11111111, 0b11101000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11110000, 0b00000000, 0b00000000, + 0b11110000, 0b00000000, 0b00000000, + 0b11110000, 0b00000000, 0b00000000, + 0b11110011, 0b11111000, 0b00000000, + + 0b11111111, 0b11111111, 0b00000000, + 0b11111111, 0b11111111, 0b10000000, + 0b11111111, 0b11111111, 0b11000000, + 0b11111110, 0b00001111, 0b11000000, + 0b00000000, 0b00000111, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000111, 0b11100000, + 0b11111110, 0b00011111, 0b11100000, + 0b01111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00001111, 0b11111111, 0b00000000, + 0b00000001, 0b11111000, 0b00001000, + }, + { // 6 + 0b00000011, 0b11111110, 0b00001000, + 0b00011111, 0b11111111, 0b10000000, + 0b00111111, 0b11111111, 0b11000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00000111, 0b11000000, + 0b11111100, 0b00000000, 0b00000000, + 0b11111000, 0b00000000, 0b00000000, + 0b11111000, 0b00000000, 0b00000000, + + 0b11111011, 0b11111000, 0b00000000, + 0b11111111, 0b11111111, 0b00000000, + 0b11111111, 0b11111111, 0b10000000, + 0b11111111, 0b11111111, 0b11000000, + 0b11111110, 0b00011111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111100, 0b00000111, 0b11100000, + 0b11111110, 0b00001111, 0b11100000, + 0b01111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00001111, 0b11111111, 0b00000000, + 0b00000001, 0b11111000, 0b00001000, + }, + { // 7 + 0b11111111, 0b11111111, 0b11101000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b00000000, 0b00000111, 0b11100000, + 0b00000000, 0b00001111, 0b11000000, + 0b00000000, 0b00011111, 0b10000000, + 0b00000000, 0b00111111, 0b00000000, + + 0b00000000, 0b01111110, 0b00000000, + 0b00000000, 0b01111100, 0b00000000, + 0b00000000, 0b11111100, 0b00000000, + 0b00000000, 0b11111000, 0b00000000, + 0b00000001, 0b11111000, 0b00000000, + 0b00000001, 0b11110000, 0b00000000, + 0b00000001, 0b11110000, 0b00000000, + 0b00000011, 0b11110000, 0b00000000, + + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + }, + { // 8 + 0b00000011, 0b11111000, 0b00001000, + 0b00001111, 0b11111110, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b01111100, 0b00000111, 0b11000000, + + 0b01111110, 0b00001111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00011111, 0b11111111, 0b00000000, + 0b00011111, 0b11111111, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000011, 0b11100000, + 0b11111100, 0b00000111, 0b11100000, + 0b01111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + 0b00011111, 0b11111111, 0b00000000, + 0b00000111, 0b11111100, 0b00001000, + }, + { // 9 + 0b00000011, 0b11111000, 0b00001000, + 0b00001111, 0b11111110, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111100, 0b00000011, 0b11100000, + 0b11111110, 0b00000111, 0b11100000, + 0b01111111, 0b11111111, 0b11100000, + 0b00111111, 0b11111111, 0b11100000, + 0b00001111, 0b11111111, 0b11100000, + 0b00000011, 0b11111111, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000111, 0b11100000, + 0b11111100, 0b00001111, 0b11000000, + 0b11111111, 0b11111111, 0b11000000, + 0b01111111, 0b11111111, 0b10000000, + 0b00111111, 0b11111111, 0b00000000, + 0b00001111, 0b11111100, 0b00001000, + }, + { // . (period) = \001 + 0b00000000, 0b00000000, 0b00001000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b00000000, 0b00000000, 0b00000000, + 0b00000001, 0b11000000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000001, 0b11000000, 0b00000000, + 0b00000000, 0b00000000, 0b00001000, + }, + { // - (minus) = \002 + 0b00000000, 0b00000000, 0b00001000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00001000, + }, + { // x1 + 0b00000000, 0b00000000, 0b00001000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000001, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b00000000, 0b00000111, 0b11100000, + + 0b00000000, 0b00001111, 0b11100000, + 0b00000000, 0b00001111, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b00000000, 0b00000011, 0b11100000, + 0b00110000, 0b01100011, 0b11100000, + 0b11111000, 0b11110011, 0b11100000, + 0b01111101, 0b11100011, 0b11100000, + 0b00011111, 0b11000011, 0b11100000, + + 0b00001111, 0b10000011, 0b11100000, + 0b00001111, 0b10000011, 0b11100000, + 0b00011111, 0b11000011, 0b11100000, + 0b00111101, 0b11100011, 0b11100000, + 0b01111000, 0b11110011, 0b11100000, + 0b00110000, 0b01100011, 0b11101000, + }, + { // k + 0b01111100, 0b00000000, 0b00001000, + 0b01111100, 0b00000000, 0b00000000, + 0b01111100, 0b00000000, 0b00000000, + 0b01111100, 0b00000000, 0b00000000, + 0b01111100, 0b00000000, 0b00000000, + 0b01111100, 0b00000000, 0b00000000, + 0b01111100, 0b00011111, 0b10000000, + 0b01111100, 0b00111111, 0b00000000, + + 0b01111100, 0b01111110, 0b00000000, + 0b01111100, 0b11111100, 0b00000000, + 0b01111101, 0b11111000, 0b00000000, + 0b01111111, 0b11110000, 0b00000000, + 0b01111111, 0b11100000, 0b00000000, + 0b01111111, 0b11000000, 0b00000000, + 0b01111111, 0b11000000, 0b00000000, + 0b01111111, 0b11100000, 0b00000000, + + 0b01111111, 0b11110000, 0b00000000, + 0b01111101, 0b11111000, 0b00000000, + 0b01111100, 0b11111100, 0b00000000, + 0b01111100, 0b01111110, 0b00000000, + 0b01111100, 0b00111111, 0b00000000, + 0b01111100, 0b00011111, 0b10001000, + }, + { // M + 0b11111000, 0b00000011, 0b11101000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111110, 0b00001111, 0b11100000, + 0b11111110, 0b00001111, 0b11100000, + 0b11111111, 0b00011111, 0b11100000, + 0b11111111, 0b00011111, 0b11100000, + + 0b11111111, 0b10111111, 0b11100000, + 0b11111111, 0b10111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b11111011, 0b11111011, 0b11100000, + 0b11111011, 0b11111011, 0b11100000, + + 0b11111001, 0b11110011, 0b11100000, + 0b11111001, 0b11110011, 0b11100000, + 0b11111000, 0b11100011, 0b11100000, + 0b11111000, 0b11100011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11101000, + }, + { // G + 0b00000111, 0b11111100, 0b00001000, + 0b00011111, 0b11111111, 0b00000000, + 0b00111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b11000000, + 0b01111110, 0b00001111, 0b11000000, + 0b11111100, 0b00000111, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + 0b11111000, 0b00000011, 0b11100000, + + 0b11111000, 0b00000000, 0b00000000, + 0b11111000, 0b00000000, 0b00000000, + 0b11111000, 0b00000000, 0b00000000, + 0b11111000, 0b00000000, 0b00000000, + 0b11111000, 0b00011111, 0b11100000, + 0b11111000, 0b00011111, 0b11100000, + 0b11111000, 0b00011111, 0b11100000, + 0b11111000, 0b00011111, 0b11100000, + + 0b11111100, 0b00000111, 0b11100000, + 0b01111110, 0b00001111, 0b11100000, + 0b01111111, 0b11111111, 0b11100000, + 0b00111111, 0b11111111, 0b11100000, + 0b00011111, 0b11111111, 0b11100000, + 0b00000111, 0b11111011, 0b11101000, + + }, + { // BS + 0b00000000, 0b00000000, 0b00001000, + 0b00000000, 0b00100000, 0b00000000, + 0b00000000, 0b01100000, 0b00000000, + 0b00000000, 0b11100000, 0b00000000, + 0b00000001, 0b11100000, 0b00000000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000111, 0b11111111, 0b11100000, + 0b00001111, 0b11111111, 0b11100000, + + 0b00011111, 0b11111111, 0b11100000, + 0b00111111, 0b11111111, 0b11100000, + 0b01111111, 0b11111111, 0b11100000, + 0b11111111, 0b11111111, 0b11100000, + 0b01111111, 0b11111111, 0b11100000, + 0b00111111, 0b11111111, 0b11100000, + 0b00011111, 0b11111111, 0b11100000, + 0b00001111, 0b11111111, 0b11100000, + + 0b00000111, 0b11111111, 0b11100000, + 0b00000011, 0b11100000, 0b00000000, + 0b00000001, 0b11100000, 0b00000000, + 0b00000000, 0b11100000, 0b00000000, + 0b00000000, 0b01100000, 0b00000000, + 0b00000000, 0b00100000, 0b00001000, + }, + { // infinity = \003 + 0b00000000, 0b00000000, 0b00001000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000111, 0b10001111, 0b00000000, + 0b00001111, 0b11011111, 0b10000000, + 0b00011111, 0b11011111, 0b11000000, + + 0b00111000, 0b11110001, 0b11000000, + 0b01111000, 0b11100001, 0b11100000, + 0b01110000, 0b01100000, 0b11100000, + 0b01110000, 0b01100000, 0b11100000, + 0b01110000, 0b01100000, 0b11100000, + 0b01110000, 0b01100000, 0b11100000, + 0b01111000, 0b01110001, 0b11100000, + 0b00111000, 0b11110001, 0b11000000, + + 0b00111111, 0b10111111, 0b11000000, + 0b00011111, 0b10111111, 0b10000000, + 0b00001111, 0b00011110, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00001000, + }, + { // dB = \004 + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000011, 0b10111111, 0b00000000, + + 0b00000011, 0b10111111, 0b10000000, + 0b00000011, 0b10111111, 0b11000000, + 0b00000011, 0b10111001, 0b11100000, + 0b00000011, 0b10111000, 0b11100000, + 0b00111111, 0b10111001, 0b11100000, + 0b01111111, 0b10111111, 0b11100000, + 0b11111111, 0b10111111, 0b10000000, + 0b11110011, 0b10111111, 0b11000000, + + 0b11100011, 0b10111001, 0b11100000, + 0b11100011, 0b10111000, 0b11100000, + 0b11110011, 0b10111001, 0b11100000, + 0b01111111, 0b10111111, 0b11100000, + 0b01111111, 0b10111111, 0b11000000, + 0b00111101, 0b10111111, 0b00001000, + }, + { // plus/minus = \005 + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00011000, 0b00000000, + + 0b00011100, 0b00011000, 0b00000000, + 0b00011100, 0b00011000, 0b00000000, + 0b00011100, 0b00110000, 0b00000000, + 0b11111111, 0b10110111, 0b11110000, + 0b11111111, 0b10110111, 0b11110000, + 0b11111111, 0b10110111, 0b11110000, + 0b00011100, 0b00110000, 0b00000000, + 0b00011100, 0b01100000, 0b00000000, + + 0b00011100, 0b01100000, 0b00000000, + 0b00000000, 0b01100000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00001000, + }, + { // keypad = \007 + 0b00000000, 0b00000000, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00111101, 0b11101111, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00001000, + }, + { // nano + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + + 0b01111001, 0b11111100, 0b00000000, + 0b01111111, 0b11111111, 0b00000000, + 0b01111111, 0b11111111, 0b10000000, + 0b01111111, 0b11111111, 0b10000000, + 0b01111110, 0b00001111, 0b11000000, + 0b01111100, 0b00000111, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11000000, + 0b01111000, 0b00000011, 0b11001000, + }, + { // pico + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00000000, 0b00000000, 0b00000000, + 0b00111101, 0b11111100, 0b00000000, + 0b00111111, 0b11111111, 0b00000000, + + 0b00111111, 0b11111111, 0b10000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00111111, 0b00000111, 0b11000000, + 0b00111110, 0b00000011, 0b11000000, + 0b00111110, 0b00000011, 0b11000000, + 0b00111110, 0b00000011, 0b11000000, + 0b00111111, 0b00000111, 0b11000000, + 0b00111111, 0b11111111, 0b11000000, + 0b00111111, 0b11111111, 0b10000000, + + 0b00111111, 0b11111111, 0b00000000, + 0b00111101, 0b11111100, 0b00000000, + 0b00111100, 0b00000000, 0b00000000, + 0b00111100, 0b00000000, 0b00000000, + 0b00111100, 0b00000000, 0b00001000, + }, +}; + diff --git a/numfont20x24.c b/numfont20x24.c deleted file mode 100644 index f6b2525..0000000 --- a/numfont20x24.c +++ /dev/null @@ -1,669 +0,0 @@ -/* - * Copyright (c) 2014-2019, TAKAHASHI Tomohiro (TTRFTECH) edy555@gmail.com - * All rights reserved. - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#include - -const uint32_t numfont20x24[][24] = { - { // 0 - 0b00000111111111000000100000000000, - 0b00011111111111110000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111100000001111110000000000000, - 0b01111110000011111100000000000000, - 0b01111111111111111100000000000000, - 0b00111111111111111000000000000000, - 0b00011111111111110000000000000000, - 0b00000111111111000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 1 - 0b00000000011111000000100000000000, - 0b00000000111111000000000000000000, - 0b00000000111111000000000000000000, - 0b00000001111111000000000000000000, - 0b00000111111111000000000000000000, - 0b00011111111111000000000000000000, - 0b00011111111111000000000000000000, - 0b00011111111111000000000000000000, - - 0b00011111011111000000000000000000, - 0b00011111011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000011111000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 2 - 0b00000011111110000000100000000000, - 0b00001111111111100000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000001111110000000000000, - - 0b00000000000011111110000000000000, - 0b00000000001111111100000000000000, - 0b00000000111111111000000000000000, - 0b00000011111111100000000000000000, - 0b00001111111110000000000000000000, - 0b00011111111000000000000000000000, - 0b00111111100000000000000000000000, - 0b01111111000000000000000000000000, - - 0b11111110000000000000000000000000, - 0b11111100000000000000000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 3 - 0b00000011111110000000100000000000, - 0b00001111111111100000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000001111110000000000000, - - 0b00000000000011111100000000000000, - 0b00000000111111111100000000000000, - 0b00000000111111110000000000000000, - 0b00000000111111110000000000000000, - 0b00000000111111111000000000000000, - 0b00000000000011111100000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111000000000111110000000000000, - 0b11111110000001111110000000000000, - 0b01111111111111111100000000000000, - 0b00111111111111111000000000000000, - 0b00001111111111110000000000000000, - 0b00000001111110000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 4 - 0b00000000000011110000100000000000, - 0b00000000000111110000000000000000, - 0b00000000001111110000000000000000, - 0b00000000011111110000000000000000, - 0b00000000111111110000000000000000, - 0b00000001111111110000000000000000, - 0b00000011111111110000000000000000, - 0b00000111111111110000000000000000, - - 0b00001111110111110000000000000000, - 0b00011111100111110000000000000000, - 0b00111111000111110000000000000000, - 0b01111110000111110000000000000000, - 0b11111100000111110000000000000000, - 0b11111000000111110000000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b00000000000111110000000000000000, - 0b00000000000111110000000000000000, - 0b00000000000111110000000000000000, - 0b00000000000111110000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 5 - 0b11111111111111111110100000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11110000000000000000000000000000, - 0b11110000000000000000000000000000, - 0b11110000000000000000000000000000, - 0b11110011111110000000000000000000, - - 0b11111111111111110000000000000000, - 0b11111111111111111000000000000000, - 0b11111111111111111100000000000000, - 0b11111110000011111100000000000000, - 0b00000000000001111110000000000000, - 0b00000000000000111110000000000000, - 0b00000000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111000000001111110000000000000, - 0b11111110000111111110000000000000, - 0b01111111111111111100000000000000, - 0b00111111111111111000000000000000, - 0b00001111111111110000000000000000, - 0b00000001111110000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 6 - 0b00000011111111100000100000000000, - 0b00011111111111111000000000000000, - 0b00111111111111111100000000000000, - 0b01111111111111111100000000000000, - 0b01111110000001111100000000000000, - 0b11111100000000000000000000000000, - 0b11111000000000000000000000000000, - 0b11111000000000000000000000000000, - - 0b11111011111110000000000000000000, - 0b11111111111111110000000000000000, - 0b11111111111111111000000000000000, - 0b11111111111111111100000000000000, - 0b11111110000111111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111100000001111110000000000000, - 0b11111110000011111110000000000000, - 0b01111111111111111100000000000000, - 0b00111111111111111000000000000000, - 0b00001111111111110000000000000000, - 0b00000001111110000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 7 - 0b11111111111111111110100000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b00000000000001111110000000000000, - 0b00000000000011111100000000000000, - 0b00000000000111111000000000000000, - 0b00000000001111110000000000000000, - - 0b00000000011111100000000000000000, - 0b00000000011111000000000000000000, - 0b00000000111111000000000000000000, - 0b00000000111110000000000000000000, - 0b00000001111110000000000000000000, - 0b00000001111100000000000000000000, - 0b00000001111100000000000000000000, - 0b00000011111100000000000000000000, - - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 8 - 0b00000011111110000000100000000000, - 0b00001111111111100000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b01111100000001111100000000000000, - - 0b01111110000011111100000000000000, - 0b00111111111111111000000000000000, - 0b00011111111111110000000000000000, - 0b00011111111111110000000000000000, - 0b00111111111111111000000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111000000000111110000000000000, - 0b11111100000001111110000000000000, - 0b01111111111111111100000000000000, - 0b00111111111111111000000000000000, - 0b00011111111111110000000000000000, - 0b00000111111111000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // 9 - 0b00000011111110000000100000000000, - 0b00001111111111100000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111100000000111110000000000000, - 0b11111110000001111110000000000000, - 0b01111111111111111110000000000000, - 0b00111111111111111110000000000000, - 0b00001111111111111110000000000000, - 0b00000011111111111110000000000000, - 0b00000000000000111110000000000000, - 0b00000000000000111110000000000000, - - 0b11111000000001111110000000000000, - 0b11111100000011111100000000000000, - 0b11111111111111111100000000000000, - 0b01111111111111111000000000000000, - 0b00111111111111110000000000000000, - 0b00001111111111000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // . (period) = \001 - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - - 0b00000000000000000000000000000000, - 0b00000001110000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000001110000000000000000000000, - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // - (minus) = \002 - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00111111111111111100000000000000, - 0b00111111111111111100000000000000, - 0b00111111111111111100000000000000, - 0b00111111111111111100000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // x1 - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000011110000000000000, - 0b00000000000000111110000000000000, - 0b00000000000001111110000000000000, - - 0b00000000000011111110000000000000, - 0b00000000000011111110000000000000, - 0b00000000000000111110000000000000, - 0b00000000000000111110000000000000, - 0b00110000011000111110000000000000, - 0b11111000111100111110000000000000, - 0b01111101111000111110000000000000, - 0b00011111110000111110000000000000, - - 0b00001111100000111110000000000000, - 0b00001111100000111110000000000000, - 0b00011111110000111110000000000000, - 0b00111101111000111110000000000000, - 0b01111000111100111110000000000000, - 0b00110000011000111110100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // k - 0b01111100000000000000100000000000, - 0b01111100000000000000000000000000, - 0b01111100000000000000000000000000, - 0b01111100000000000000000000000000, - 0b01111100000000000000000000000000, - 0b01111100000000000000000000000000, - 0b01111100000111111000000000000000, - 0b01111100001111110000000000000000, - - 0b01111100011111100000000000000000, - 0b01111100111111000000000000000000, - 0b01111101111110000000000000000000, - 0b01111111111100000000000000000000, - 0b01111111111000000000000000000000, - 0b01111111110000000000000000000000, - 0b01111111110000000000000000000000, - 0b01111111111000000000000000000000, - - 0b01111111111100000000000000000000, - 0b01111101111110000000000000000000, - 0b01111100111111000000000000000000, - 0b01111100011111100000000000000000, - 0b01111100001111110000000000000000, - 0b01111100000111111000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // M - 0b11111000000000111110100000000000, - 0b11111000000000111110000000000000, - 0b11111100000001111110000000000000, - 0b11111100000001111110000000000000, - 0b11111110000011111110000000000000, - 0b11111110000011111110000000000000, - 0b11111111000111111110000000000000, - 0b11111111000111111110000000000000, - - 0b11111111101111111110000000000000, - 0b11111111101111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b11111011111110111110000000000000, - 0b11111011111110111110000000000000, - - 0b11111001111100111110000000000000, - 0b11111001111100111110000000000000, - 0b11111000111000111110000000000000, - 0b11111000111000111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // G - 0b00000111111111000000100000000000, - 0b00011111111111110000000000000000, - 0b00111111111111111000000000000000, - 0b01111111111111111100000000000000, - 0b01111110000011111100000000000000, - 0b11111100000001111110000000000000, - 0b11111000000000111110000000000000, - 0b11111000000000111110000000000000, - - 0b11111000000000000000000000000000, - 0b11111000000000000000000000000000, - 0b11111000000000000000000000000000, - 0b11111000000000000000000000000000, - 0b11111000000111111110000000000000, - 0b11111000000111111110000000000000, - 0b11111000000111111110000000000000, - 0b11111000000111111110000000000000, - - 0b11111100000001111110000000000000, - 0b01111110000011111110000000000000, - 0b01111111111111111110000000000000, - 0b00111111111111111110000000000000, - 0b00011111111111111110000000000000, - 0b00000111111110111110100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // BS - 0b00000000000000000000100000000000, - 0b00000000001000000000000000000000, - 0b00000000011000000000000000000000, - 0b00000000111000000000000000000000, - 0b00000001111000000000000000000000, - 0b00000011111000000000000000000000, - 0b00000111111111111110000000000000, - 0b00001111111111111110000000000000, - - 0b00011111111111111110000000000000, - 0b00111111111111111110000000000000, - 0b01111111111111111110000000000000, - 0b11111111111111111110000000000000, - 0b01111111111111111110000000000000, - 0b00111111111111111110000000000000, - 0b00011111111111111110000000000000, - 0b00001111111111111110000000000000, - - 0b00000111111111111110000000000000, - 0b00000011111000000000000000000000, - 0b00000001111000000000000000000000, - 0b00000000111000000000000000000000, - 0b00000000011000000000000000000000, - 0b00000000001000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - }, - { // infinity = \003 - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000111100011110000000000000000, - 0b00001111110111111000000000000000, - 0b00011111110111111100000000000000, - - 0b00111000111100011100000000000000, - 0b01111000111000011110000000000000, - 0b01110000011000001110000000000000, - 0b01110000011000001110000000000000, - 0b01110000011000001110000000000000, - 0b01110000011000001110000000000000, - 0b01111000011100011110000000000000, - 0b00111000111100011100000000000000, - - 0b00111111101111111100000000000000, - 0b00011111101111111000000000000000, - 0b00001111000111100000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // dB = \004 - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000011101111110000000000000000, - - 0b00000011101111111000000000000000, - 0b00000011101111111100000000000000, - 0b00000011101110011110000000000000, - 0b00000011101110001110000000000000, - 0b00111111101110011110000000000000, - 0b01111111101111111110000000000000, - 0b11111111101111111000000000000000, - 0b11110011101111111100000000000000, - - 0b11100011101110011110000000000000, - 0b11100011101110001110000000000000, - 0b11110011101110011110000000000000, - 0b01111111101111111110000000000000, - 0b01111111101111111100000000000000, - 0b00111101101111110000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // plus/minus = \005 - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000110000000000000000000, - - 0b00011100000110000000000000000000, - 0b00011100000110000000000000000000, - 0b00011100001100000000000000000000, - 0b11111111101101111111000000000000, - 0b11111111101101111111000000000000, - 0b11111111101101111111000000000000, - 0b00011100001100000000000000000000, - 0b00011100011000000000000000000000, - - 0b00011100011000000000000000000000, - 0b00000000011000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // keypad = \007 - 0b00000000000000000000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00000000000000000000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00000000000000000000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00000000000000000000000000000000, - - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00111101111011110000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // nano - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - - 0b01111001111111000000000000000000, - 0b01111111111111110000000000000000, - 0b01111111111111111000000000000000, - 0b01111111111111111000000000000000, - 0b01111110000011111100000000000000, - 0b01111100000001111100000000000000, - 0b01111000000000111100000000000000, - 0b01111000000000111100000000000000, - - 0b01111000000000111100000000000000, - 0b01111000000000111100000000000000, - 0b01111000000000111100000000000000, - 0b01111000000000111100000000000000, - 0b01111000000000111100000000000000, - 0b01111000000000111100100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, - { // pico - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000, - 0b00111101111111000000000000000000, - 0b00111111111111110000000000000000, - - 0b00111111111111111000000000000000, - 0b00111111111111111100000000000000, - 0b00111111000001111100000000000000, - 0b00111110000000111100000000000000, - 0b00111110000000111100000000000000, - 0b00111110000000111100000000000000, - 0b00111111000001111100000000000000, - 0b00111111111111111100000000000000, - 0b00111111111111111000000000000000, - - 0b00111111111111110000000000000000, - 0b00111101111111000000000000000000, - 0b00111100000000000000000000000000, - 0b00111100000000000000000000000000, - 0b00111100000000000000100000000000, - 0b00000000000000000000000000000000, - 0b00000000000000000000000000000000 - }, -}; - diff --git a/ui.c b/ui.c index 5b79af0..6333bdc 100644 --- a/ui.c +++ b/ui.c @@ -1243,7 +1243,7 @@ draw_keypad(void) if (i == selection) bg = config.menu_active_color; ili9341_fill(keypads[i].x, keypads[i].y, 44, 44, bg); - ili9341_drawfont(keypads[i].c, &NF20x24, keypads[i].x+12, keypads[i].y+10, 0x0000, bg); + ili9341_drawfont(keypads[i].c, &NF20x22, keypads[i].x+12, keypads[i].y+10, 0x0000, bg); i++; } } @@ -1253,7 +1253,7 @@ draw_numeric_area_frame(void) { ili9341_fill(0, 208, 320, 32, 0xffff); ili9341_drawstring_5x7(keypad_mode_label[keypad_mode], 10, 220, 0x0000, 0xffff); - ili9341_drawfont(KP_KEYPAD, &NF20x24, 300, 216, 0x0000, 0xffff); + ili9341_drawfont(KP_KEYPAD, &NF20x22, 300, 216, 0x0000, 0xffff); } void @@ -1284,9 +1284,9 @@ draw_numeric_input(const char *buf) } if (c >= 0) - ili9341_drawfont(c, &NF20x24, x, 208+4, fg, bg); + ili9341_drawfont(c, &NF20x22, x, 208+4, fg, bg); else if (focused) - ili9341_drawfont(0, &NF20x24, x, 208+4, fg, bg); + ili9341_drawfont(0, &NF20x22, x, 208+4, fg, bg); else ili9341_fill(x, 208+4, 20, 24, bg);