Added font5x7 and turned the letters around so they are now upside up. ;-)

This commit is contained in:
Fabian Schlenz 2019-09-25 06:34:26 +02:00
parent 1cd94ac4ae
commit 3018bc6375
2 changed files with 107 additions and 99 deletions

View File

@ -4,3 +4,4 @@
extern Font font_numbers3x5; extern Font font_numbers3x5;
extern Font font_numbers3x5_blocky; extern Font font_numbers3x5_blocky;
extern Font font_numbers4x7; extern Font font_numbers4x7;
extern Font font5x7;

View File

@ -50,105 +50,112 @@ uint16_t font_numbers4x7_get(const char c) { return c - '0'; }
Font font_numbers4x7 = {4, 7, &font_numbers4x7_data[0], font_numbers4x7_check, font_numbers4x7_get}; Font font_numbers4x7 = {4, 7, &font_numbers4x7_data[0], font_numbers4x7_check, font_numbers4x7_get};
/*
const unsigned char font5x7[] = {
0x00, 0x00, 0x00, 0x00, 0x00,// (space) const uint8_t font5x7_data[] PROGMEM = {
0x00, 0x00, 0x5F, 0x00, 0x00,// ! 0x00, 0x00, 0x00, 0x00, 0x00, // (space)
0x00, 0x07, 0x00, 0x07, 0x00,// " 0x00, 0x00, 0x7D, 0x00, 0x00, // !
0x14, 0x7F, 0x14, 0x7F, 0x14,// # 0x00, 0x70, 0x00, 0x70, 0x00, // "
0x24, 0x2A, 0x7F, 0x2A, 0x12,// $ 0x14, 0x7F, 0x14, 0x7F, 0x14, // #
0x23, 0x13, 0x08, 0x64, 0x62,// % 0x12, 0x2A, 0x7F, 0x2A, 0x24, // $
0x36, 0x49, 0x55, 0x22, 0x50,// & 0x62, 0x64, 0x08, 0x13, 0x23, // %
0x00, 0x05, 0x03, 0x00, 0x00,// ' 0x36, 0x49, 0x55, 0x22, 0x05, // &
0x00, 0x1C, 0x22, 0x41, 0x00,// ( 0x00, 0x50, 0x60, 0x00, 0x00, // '
0x00, 0x41, 0x22, 0x1C, 0x00,// ) 0x00, 0x1C, 0x22, 0x41, 0x00, // (
0x08, 0x2A, 0x1C, 0x2A, 0x08,// * 0x00, 0x41, 0x22, 0x1C, 0x00, // )
0x08, 0x08, 0x3E, 0x08, 0x08,// + 0x08, 0x2A, 0x1C, 0x2A, 0x08, // *
0x00, 0x50, 0x30, 0x00, 0x00,// , 0x08, 0x08, 0x3E, 0x08, 0x08, // +
0x08, 0x08, 0x08, 0x08, 0x08,// - 0x00, 0x05, 0x06, 0x00, 0x00, // ,
0x00, 0x60, 0x60, 0x00, 0x00,// . 0x08, 0x08, 0x08, 0x08, 0x08, // -
0x20, 0x10, 0x08, 0x04, 0x02,// / 0x00, 0x03, 0x03, 0x00, 0x00, // .
0x3E, 0x51, 0x49, 0x45, 0x3E,// 0 0x02, 0x04, 0x08, 0x10, 0x20, // /
0x00, 0x42, 0x7F, 0x40, 0x00,// 1 0x3E, 0x45, 0x49, 0x51, 0x3E, // 0
0x42, 0x61, 0x51, 0x49, 0x46,// 2 0x00, 0x21, 0x7F, 0x01, 0x00, // 1
0x21, 0x41, 0x45, 0x4B, 0x31,// 3 0x21, 0x43, 0x45, 0x49, 0x31, // 2
0x18, 0x14, 0x12, 0x7F, 0x10,// 4 0x42, 0x41, 0x51, 0x69, 0x46, // 3
0x27, 0x45, 0x45, 0x45, 0x39,// 5 0x0C, 0x14, 0x24, 0x7F, 0x04, // 4
0x3C, 0x4A, 0x49, 0x49, 0x30,// 6 0x72, 0x51, 0x51, 0x51, 0x4E, // 5
0x01, 0x71, 0x09, 0x05, 0x03,// 7 0x1E, 0x29, 0x49, 0x49, 0x06, // 6
0x36, 0x49, 0x49, 0x49, 0x36,// 8 0x40, 0x47, 0x48, 0x50, 0x60, // 7
0x06, 0x49, 0x49, 0x29, 0x1E,// 9 0x36, 0x49, 0x49, 0x49, 0x36, // 8
0x00, 0x36, 0x36, 0x00, 0x00,// : 0x30, 0x49, 0x49, 0x4A, 0x3C, // 9
0x00, 0x56, 0x36, 0x00, 0x00,// ; 0x00, 0x36, 0x36, 0x00, 0x00, // :
0x00, 0x08, 0x14, 0x22, 0x41,// < 0x00, 0x35, 0x36, 0x00, 0x00, // ;
0x14, 0x14, 0x14, 0x14, 0x14,// = 0x00, 0x08, 0x14, 0x22, 0x41, // <
0x41, 0x22, 0x14, 0x08, 0x00,// > 0x14, 0x14, 0x14, 0x14, 0x14, // =
0x02, 0x01, 0x51, 0x09, 0x06,// ? 0x41, 0x22, 0x14, 0x08, 0x00, // >
0x32, 0x49, 0x79, 0x41, 0x3E,// @ 0x20, 0x40, 0x45, 0x48, 0x30, // ?
0x7E, 0x11, 0x11, 0x11, 0x7E,// A 0x26, 0x49, 0x4F, 0x41, 0x3E, // @
0x7F, 0x49, 0x49, 0x49, 0x36,// B 0x3F, 0x44, 0x44, 0x44, 0x3F, // A
0x3E, 0x41, 0x41, 0x41, 0x22,// C 0x7F, 0x49, 0x49, 0x49, 0x36, // B
0x7F, 0x41, 0x41, 0x22, 0x1C,// D 0x3E, 0x41, 0x41, 0x41, 0x22, // C
0x7F, 0x49, 0x49, 0x49, 0x41,// E 0x7F, 0x41, 0x41, 0x22, 0x1C, // D
0x7F, 0x09, 0x09, 0x01, 0x01,// F 0x7F, 0x49, 0x49, 0x49, 0x41, // E
0x3E, 0x41, 0x41, 0x51, 0x32,// G 0x7F, 0x48, 0x48, 0x40, 0x40, // F
0x7F, 0x08, 0x08, 0x08, 0x7F,// H 0x3E, 0x41, 0x41, 0x45, 0x26, // G
0x00, 0x41, 0x7F, 0x41, 0x00,// I 0x7F, 0x08, 0x08, 0x08, 0x7F, // H
0x20, 0x40, 0x41, 0x3F, 0x01,// J 0x00, 0x41, 0x7F, 0x41, 0x00, // I
0x7F, 0x08, 0x14, 0x22, 0x41,// K 0x02, 0x01, 0x41, 0x7E, 0x40, // J
0x7F, 0x40, 0x40, 0x40, 0x40,// L 0x7F, 0x08, 0x14, 0x22, 0x41, // K
0x7F, 0x02, 0x04, 0x02, 0x7F,// M 0x7F, 0x01, 0x01, 0x01, 0x01, // L
0x7F, 0x04, 0x08, 0x10, 0x7F,// N 0x7F, 0x20, 0x10, 0x20, 0x7F, // M
0x3E, 0x41, 0x41, 0x41, 0x3E,// O 0x7F, 0x10, 0x08, 0x04, 0x7F, // N
0x7F, 0x09, 0x09, 0x09, 0x06,// P 0x3E, 0x41, 0x41, 0x41, 0x3E, // O
0x3E, 0x41, 0x51, 0x21, 0x5E,// Q 0x7F, 0x48, 0x48, 0x48, 0x30, // P
0x7F, 0x09, 0x19, 0x29, 0x46,// R 0x3E, 0x41, 0x45, 0x42, 0x3D, // Q
0x46, 0x49, 0x49, 0x49, 0x31,// S 0x7F, 0x48, 0x4C, 0x4A, 0x31, // R
0x01, 0x01, 0x7F, 0x01, 0x01,// T 0x31, 0x49, 0x49, 0x49, 0x46, // S
0x3F, 0x40, 0x40, 0x40, 0x3F,// U 0x40, 0x40, 0x7F, 0x40, 0x40, // T
0x1F, 0x20, 0x40, 0x20, 0x1F,// V 0x7E, 0x01, 0x01, 0x01, 0x7E, // U
0x7F, 0x20, 0x18, 0x20, 0x7F,// W 0x7C, 0x02, 0x01, 0x02, 0x7C, // V
0x63, 0x14, 0x08, 0x14, 0x63,// X 0x7F, 0x02, 0x0C, 0x02, 0x7F, // W
0x03, 0x04, 0x78, 0x04, 0x03,// Y 0x63, 0x14, 0x08, 0x14, 0x63, // X
0x61, 0x51, 0x49, 0x45, 0x43,// Z 0x60, 0x10, 0x0F, 0x10, 0x60, // Y
0x00, 0x00, 0x7F, 0x41, 0x41,// [ 0x43, 0x45, 0x49, 0x51, 0x61, // Z
0x02, 0x04, 0x08, 0x10, 0x20,// "\" 0x00, 0x00, 0x7F, 0x41, 0x41, // [
0x41, 0x41, 0x7F, 0x00, 0x00,// ] 0x20, 0x10, 0x08, 0x04, 0x02, // backslash
0x04, 0x02, 0x01, 0x02, 0x04,// ^ 0x41, 0x41, 0x7F, 0x00, 0x00, // ]
0x40, 0x40, 0x40, 0x40, 0x40,// _ 0x10, 0x20, 0x40, 0x20, 0x10, // ^
0x00, 0x01, 0x02, 0x04, 0x00,// ` 0x01, 0x01, 0x01, 0x01, 0x01, // _
0x20, 0x54, 0x54, 0x54, 0x78,// a 0x00, 0x40, 0x20, 0x10, 0x00, // `
0x7F, 0x48, 0x44, 0x44, 0x38,// b 0x02, 0x15, 0x15, 0x15, 0x0F, // a
0x38, 0x44, 0x44, 0x44, 0x20,// c 0x7F, 0x09, 0x11, 0x11, 0x0E, // b
0x38, 0x44, 0x44, 0x48, 0x7F,// d 0x0E, 0x11, 0x11, 0x11, 0x02, // c
0x38, 0x54, 0x54, 0x54, 0x18,// e 0x0E, 0x11, 0x11, 0x09, 0x7F, // d
0x08, 0x7E, 0x09, 0x01, 0x02,// f 0x0E, 0x15, 0x15, 0x15, 0x0C, // e
0x08, 0x14, 0x54, 0x54, 0x3C,// g 0x08, 0x3F, 0x48, 0x40, 0x20, // f
0x7F, 0x08, 0x04, 0x04, 0x78,// h 0x08, 0x14, 0x15, 0x15, 0x1E, // g
0x00, 0x44, 0x7D, 0x40, 0x00,// i 0x7F, 0x08, 0x10, 0x10, 0x0F, // h
0x20, 0x40, 0x44, 0x3D, 0x00,// j 0x00, 0x11, 0x5F, 0x01, 0x00, // i
0x00, 0x7F, 0x10, 0x28, 0x44,// k 0x02, 0x01, 0x11, 0x5E, 0x00, // j
0x00, 0x41, 0x7F, 0x40, 0x00,// l 0x00, 0x7F, 0x04, 0x0A, 0x11, // k
0x7C, 0x04, 0x18, 0x04, 0x78,// m 0x00, 0x41, 0x7F, 0x01, 0x00, // l
0x7C, 0x08, 0x04, 0x04, 0x78,// n 0x1F, 0x10, 0x0C, 0x10, 0x0F, // m
0x38, 0x44, 0x44, 0x44, 0x38,// o 0x1F, 0x08, 0x10, 0x10, 0x0F, // n
0x7C, 0x14, 0x14, 0x14, 0x08,// p 0x0E, 0x11, 0x11, 0x11, 0x0E, // o
0x08, 0x14, 0x14, 0x18, 0x7C,// q 0x1F, 0x14, 0x14, 0x14, 0x08, // p
0x7C, 0x08, 0x04, 0x04, 0x08,// r 0x08, 0x14, 0x14, 0x0C, 0x1F, // q
0x48, 0x54, 0x54, 0x54, 0x20,// s 0x1F, 0x08, 0x10, 0x10, 0x08, // r
0x04, 0x3F, 0x44, 0x40, 0x20,// t 0x09, 0x15, 0x15, 0x15, 0x02, // s
0x3C, 0x40, 0x40, 0x20, 0x7C,// u 0x10, 0x7E, 0x11, 0x01, 0x02, // t
0x1C, 0x20, 0x40, 0x20, 0x1C,// v 0x1E, 0x01, 0x01, 0x02, 0x1F, // u
0x3C, 0x40, 0x30, 0x40, 0x3C,// w 0x1C, 0x02, 0x01, 0x02, 0x1C, // v
0x44, 0x28, 0x10, 0x28, 0x44,// x 0x1E, 0x01, 0x06, 0x01, 0x1E, // w
0x0C, 0x50, 0x50, 0x50, 0x3C,// y 0x11, 0x0A, 0x04, 0x0A, 0x11, // x
0x44, 0x64, 0x54, 0x4C, 0x44,// z 0x18, 0x05, 0x05, 0x05, 0x1E, // y
0x00, 0x08, 0x36, 0x41, 0x00,// { 0x11, 0x13, 0x15, 0x19, 0x11, // z
0x00, 0x00, 0x7F, 0x00, 0x00,// | 0x00, 0x08, 0x36, 0x41, 0x00, // {
0x00, 0x41, 0x36, 0x08, 0x00,// } 0x00, 0x00, 0x7F, 0x00, 0x00, // |
0x08, 0x08, 0x2A, 0x1C, 0x08,// -> 0x00, 0x41, 0x36, 0x08, 0x00, // }
0x08, 0x1C, 0x2A, 0x08, 0x08 // <- 0x08, 0x08, 0x2A, 0x1C, 0x08, // ->
0x08, 0x1C, 0x2A, 0x08, 0x08, // <-
}; };
bool font5x7_check(const char c) { return c>=' ' && c<='}'; }
uint16_t font5x7_get(const char c) { return c - ' '; }
Font font5x7 = {5, 7, &font5x7_data[0], font5x7_check, font5x7_get};
*/