WebSVN – libOLED – Diff – /trunk/src/fontclass.cpp

  *  Created on: 31 Oct 2020
  *      Author: mike
  */
 #include "libOLED/fontclass.H"
-char
-font5x7_t::getPixel (char c, int x, int y)
+char font5x7_t::getPixel(char c, int x, int y)
+{
   if (x < 0 || x >= m_width)
     return 0;
   if (y < 0 || y >= m_height)
     return 0;
   uint8_t pixels = 0;
   if (c < ' ')
     c = ' ';
   if (c >= ' ' && c <= 0x7f)
     pixels = m_data[(c - ' ') * m_width + x];
-  if (c == '°')
+  if (c == '�')
-    pixels = m_data[(0x80-' ')* m_width + x];
+    pixels = m_data[(0x80 - ' ') * m_width + x];
+  // handle extended char set
+  if (c >= 0x81 && c <= 0x81)
+    pixels = m_data[(0x81 - ' ') * m_width + x];
   char v = (pixels >> y) & 1;
   return v;
+}
-char
-font10x18_t::getPixel (char c, int x, int y)
+char font10x18_t::getPixel(char c, int x, int y)
+{
   if (x < 0 || x >= m_width)
     return 0;
   if (y < 0 || y >= m_height)
     return 0;
   c = c & 0x7F;
   if (c < ' ')
     c = ' ';
-  if (c >= m_chars+' ')
+  if (c >= m_chars + ' ')
     c = ' ';
   int xm = x + (c - ' ') * m_width;
   int index = (y * m_width * m_chars + xm) / 8;
   return ((m_data[index]) >> (xm & 7)) & 1;
+}
 static const char font5x7_data[] =
+    {
-  { 0x00, 0x00, 0x00, 0x00, 0x00,   //   0x20 32
+x00, 0x00, 0x00, 0x00, 0x00, //   0x20 32
-x00, 0x00, 0x6f, 0x00, 0x00,   // ! 0x21 33
+x00, 0x00, 0x6f, 0x00, 0x00, // ! 0x21 33
-x00, 0x07, 0x00, 0x07, 0x00,   // " 0x22 34
+x00, 0x07, 0x00, 0x07, 0x00, // " 0x22 34
-x14, 0x7f, 0x14, 0x7f, 0x14,   // # 0x23 35
+x14, 0x7f, 0x14, 0x7f, 0x14, // # 0x23 35
-x2e, 0x2a, 0xff, 0x2a, 0x3a,   // $ 0x24 36
+x2e, 0x2a, 0xff, 0x2a, 0x3a, // $ 0x24 36
-x23, 0x13, 0x08, 0x64, 0x62,   // % 0x25 37
+x23, 0x13, 0x08, 0x64, 0x62, // % 0x25 37
-x36, 0x49, 0x56, 0x20, 0x50,   // & 0x26 38
+x36, 0x49, 0x56, 0x20, 0x50, // & 0x26 38
-x00, 0x00, 0x07, 0x00, 0x00,   // ' 0x27 39
+x00, 0x00, 0x07, 0x00, 0x00, // ' 0x27 39
-x00, 0x1c, 0x22, 0x41, 0x00,   // ( 0x28 40
+x00, 0x1c, 0x22, 0x41, 0x00, // ( 0x28 40
-x00, 0x41, 0x22, 0x1c, 0x00,   // ) 0x29 41
+x00, 0x41, 0x22, 0x1c, 0x00, // ) 0x29 41
-x14, 0x08, 0x3e, 0x08, 0x14,   // * 0x2a 42
+x14, 0x08, 0x3e, 0x08, 0x14, // * 0x2a 42
-x08, 0x08, 0x3e, 0x08, 0x08,   // + 0x2b 43
+x08, 0x08, 0x3e, 0x08, 0x08, // + 0x2b 43
-x00, 0x50, 0x30, 0x00, 0x00,   // , 0x2c 44
+x00, 0x50, 0x30, 0x00, 0x00, // , 0x2c 44
-x08, 0x08, 0x08, 0x08, 0x08,   // - 0x2d 45
+x08, 0x08, 0x08, 0x08, 0x08, // - 0x2d 45
-x00, 0x60, 0x60, 0x00, 0x00,   // . 0x2e 46
+x00, 0x60, 0x60, 0x00, 0x00, // . 0x2e 46
-x20, 0x10, 0x08, 0x04, 0x02,   // / 0x2f 47
+x20, 0x10, 0x08, 0x04, 0x02, // / 0x2f 47
-x3e, 0x51, 0x49, 0x45, 0x3e,   // 0 0x30 48
+x3e, 0x51, 0x49, 0x45, 0x3e, // 0 0x30 48
-x00, 0x42, 0x7f, 0x40, 0x00,   // 1 0x31 49
+x00, 0x42, 0x7f, 0x40, 0x00, // 1 0x31 49
-x42, 0x61, 0x51, 0x49, 0x46,   // 2 0x32 50
+x42, 0x61, 0x51, 0x49, 0x46, // 2 0x32 50
-x21, 0x41, 0x45, 0x4b, 0x31,   // 3 0x33 51
+x21, 0x41, 0x45, 0x4b, 0x31, // 3 0x33 51
-x18, 0x14, 0x12, 0x7f, 0x10,   // 4 0x34 52
+x18, 0x14, 0x12, 0x7f, 0x10, // 4 0x34 52
-x27, 0x45, 0x45, 0x45, 0x39,   // 5 0x35 53
+x27, 0x45, 0x45, 0x45, 0x39, // 5 0x35 53
-x3c, 0x4a, 0x49, 0x49, 0x30,   // 6 0x36 54
+x3c, 0x4a, 0x49, 0x49, 0x30, // 6 0x36 54
-x01, 0x71, 0x09, 0x05, 0x03,   // 7 0x37 55
+x01, 0x71, 0x09, 0x05, 0x03, // 7 0x37 55
-x36, 0x49, 0x49, 0x49, 0x36,   // 8 0x38 56
+x36, 0x49, 0x49, 0x49, 0x36, // 8 0x38 56
-x06, 0x49, 0x49, 0x29, 0x1e,   // 9 0x39 57
+x06, 0x49, 0x49, 0x29, 0x1e, // 9 0x39 57
-x00, 0x36, 0x36, 0x00, 0x00,   // : 0x3a 58
+x00, 0x36, 0x36, 0x00, 0x00, // : 0x3a 58
-x00, 0x56, 0x36, 0x00, 0x00,   // ; 0x3b 59
+x00, 0x56, 0x36, 0x00, 0x00, // ; 0x3b 59
-x08, 0x14, 0x22, 0x41, 0x00,   // < 0x3c 60
+x08, 0x14, 0x22, 0x41, 0x00, // < 0x3c 60
-x14, 0x14, 0x14, 0x14, 0x14,   // = 0x3d 61
+x14, 0x14, 0x14, 0x14, 0x14, // = 0x3d 61
-x00, 0x41, 0x22, 0x14, 0x08,   // > 0x3e 62
+x00, 0x41, 0x22, 0x14, 0x08, // > 0x3e 62
-x02, 0x01, 0x51, 0x09, 0x06,   // ? 0x3f 63
+x02, 0x01, 0x51, 0x09, 0x06, // ? 0x3f 63
-x3e, 0x41, 0x5d, 0x49, 0x4e,   // @ 0x40 64
+x3e, 0x41, 0x5d, 0x49, 0x4e, // @ 0x40 64
-x7e, 0x09, 0x09, 0x09, 0x7e,   // A 0x41 65
+x7e, 0x09, 0x09, 0x09, 0x7e, // A 0x41 65
-x7f, 0x49, 0x49, 0x49, 0x36,   // B 0x42 66
+x7f, 0x49, 0x49, 0x49, 0x36, // B 0x42 66
-x3e, 0x41, 0x41, 0x41, 0x22,   // C 0x43 67
+x3e, 0x41, 0x41, 0x41, 0x22, // C 0x43 67
-x7f, 0x41, 0x41, 0x41, 0x3e,   // D 0x44 68
+x7f, 0x41, 0x41, 0x41, 0x3e, // D 0x44 68
-x7f, 0x49, 0x49, 0x49, 0x41,   // E 0x45 69
+x7f, 0x49, 0x49, 0x49, 0x41, // E 0x45 69
-x7f, 0x09, 0x09, 0x09, 0x01,   // F 0x46 70
+x7f, 0x09, 0x09, 0x09, 0x01, // F 0x46 70
-x3e, 0x41, 0x49, 0x49, 0x7a,   // G 0x47 71
+x3e, 0x41, 0x49, 0x49, 0x7a, // G 0x47 71
-x7f, 0x08, 0x08, 0x08, 0x7f,   // H 0x48 72
+x7f, 0x08, 0x08, 0x08, 0x7f, // H 0x48 72
-x00, 0x41, 0x7f, 0x41, 0x00,   // I 0x49 73
+x00, 0x41, 0x7f, 0x41, 0x00, // I 0x49 73
-x20, 0x40, 0x41, 0x3f, 0x01,   // J 0x4a 74
+x20, 0x40, 0x41, 0x3f, 0x01, // J 0x4a 74
-x7f, 0x08, 0x14, 0x22, 0x41,   // K 0x4b 75
+x7f, 0x08, 0x14, 0x22, 0x41, // K 0x4b 75
-x7f, 0x40, 0x40, 0x40, 0x40,   // L 0x4c 76
+x7f, 0x40, 0x40, 0x40, 0x40, // L 0x4c 76
-x7f, 0x02, 0x0c, 0x02, 0x7f,   // M 0x4d 77
+x7f, 0x02, 0x0c, 0x02, 0x7f, // M 0x4d 77
-x7f, 0x04, 0x08, 0x10, 0x7f,   // N 0x4e 78
+x7f, 0x04, 0x08, 0x10, 0x7f, // N 0x4e 78
-x3e, 0x41, 0x41, 0x41, 0x3e,   // O 0x4f 79
+x3e, 0x41, 0x41, 0x41, 0x3e, // O 0x4f 79
-x7f, 0x09, 0x09, 0x09, 0x06,   // P 0x50 80
+x7f, 0x09, 0x09, 0x09, 0x06, // P 0x50 80
-x3e, 0x41, 0x51, 0x21, 0x5e,   // Q 0x51 81
+x3e, 0x41, 0x51, 0x21, 0x5e, // Q 0x51 81
-x7f, 0x09, 0x19, 0x29, 0x46,   // R 0x52 82
+x7f, 0x09, 0x19, 0x29, 0x46, // R 0x52 82
-x46, 0x49, 0x49, 0x49, 0x31,   // S 0x53 83
+x46, 0x49, 0x49, 0x49, 0x31, // S 0x53 83
-x01, 0x01, 0x7f, 0x01, 0x01,   // T 0x54 84
+x01, 0x01, 0x7f, 0x01, 0x01, // T 0x54 84
-x3f, 0x40, 0x40, 0x40, 0x3f,   // U 0x55 85
+x3f, 0x40, 0x40, 0x40, 0x3f, // U 0x55 85
-x0f, 0x30, 0x40, 0x30, 0x0f,   // V 0x56 86
+x0f, 0x30, 0x40, 0x30, 0x0f, // V 0x56 86
-x3f, 0x40, 0x30, 0x40, 0x3f,   // W 0x57 87
+x3f, 0x40, 0x30, 0x40, 0x3f, // W 0x57 87
-x63, 0x14, 0x08, 0x14, 0x63,   // X 0x58 88
+x63, 0x14, 0x08, 0x14, 0x63, // X 0x58 88
-x07, 0x08, 0x70, 0x08, 0x07,   // Y 0x59 89
+x07, 0x08, 0x70, 0x08, 0x07, // Y 0x59 89
-x61, 0x51, 0x49, 0x45, 0x43,   // Z 0x5a 90
+x61, 0x51, 0x49, 0x45, 0x43, // Z 0x5a 90
-x00, 0x00, 0x7f, 0x41, 0x00,   // [ 0x5b 91
+x00, 0x00, 0x7f, 0x41, 0x00, // [ 0x5b 91
-x02, 0x04, 0x08, 0x10, 0x20,   // \ 0x5c 92
+x02, 0x04, 0x08, 0x10, 0x20, // \ 0x5c 92
-x00, 0x41, 0x7f, 0x00, 0x00,   // ] 0x5d 93
+x00, 0x41, 0x7f, 0x00, 0x00, // ] 0x5d 93
-x04, 0x02, 0x01, 0x02, 0x04,   // ^ 0x5e 94
+x04, 0x02, 0x01, 0x02, 0x04, // ^ 0x5e 94
-x40, 0x40, 0x40, 0x40, 0x40,   // _ 0x5f 95
+x40, 0x40, 0x40, 0x40, 0x40, // _ 0x5f 95
-x00, 0x00, 0x03, 0x04, 0x00,   // ` 0x60 96
+x00, 0x00, 0x03, 0x04, 0x00, // ` 0x60 96
-x20, 0x54, 0x54, 0x54, 0x78,   // a 0x61 97
+x20, 0x54, 0x54, 0x54, 0x78, // a 0x61 97
-x7f, 0x48, 0x44, 0x44, 0x38,   // b 0x62 98
+x7f, 0x48, 0x44, 0x44, 0x38, // b 0x62 98
-x38, 0x44, 0x44, 0x44, 0x44,   // c 0x63 99
+x38, 0x44, 0x44, 0x44, 0x44, // c 0x63 99
-x38, 0x44, 0x44, 0x48, 0x7f,   // d 0x64 100
+x38, 0x44, 0x44, 0x48, 0x7f, // d 0x64 100
-x38, 0x54, 0x54, 0x54, 0x18,   // e 0x65 101
+x38, 0x54, 0x54, 0x54, 0x18, // e 0x65 101
-x08, 0x7e, 0x09, 0x01, 0x02,   // f 0x66 102
+x08, 0x7e, 0x09, 0x01, 0x02, // f 0x66 102
-x0c, 0x52, 0x52, 0x52, 0x3e,   // g 0x67 103
+x0c, 0x52, 0x52, 0x52, 0x3e, // g 0x67 103
-x7f, 0x08, 0x04, 0x04, 0x78,   // h 0x68 104
+x7f, 0x08, 0x04, 0x04, 0x78, // h 0x68 104
-x00, 0x44, 0x7d, 0x40, 0x00,   // i 0x69 105
+x00, 0x44, 0x7d, 0x40, 0x00, // i 0x69 105
-x20, 0x40, 0x44, 0x3d, 0x00,   // j 0x6a 106
+x20, 0x40, 0x44, 0x3d, 0x00, // j 0x6a 106
-x00, 0x7f, 0x10, 0x28, 0x44,   // k 0x6b 107
+x00, 0x7f, 0x10, 0x28, 0x44, // k 0x6b 107
-x00, 0x41, 0x7f, 0x40, 0x00,   // l 0x6c 108
+x00, 0x41, 0x7f, 0x40, 0x00, // l 0x6c 108
-x7c, 0x04, 0x18, 0x04, 0x78,   // m 0x6d 109
+x7c, 0x04, 0x18, 0x04, 0x78, // m 0x6d 109
-x7c, 0x08, 0x04, 0x04, 0x78,   // n 0x6e 110
+x7c, 0x08, 0x04, 0x04, 0x78, // n 0x6e 110
-x38, 0x44, 0x44, 0x44, 0x38,   // o 0x6f 111
+x38, 0x44, 0x44, 0x44, 0x38, // o 0x6f 111
-x7c, 0x14, 0x14, 0x14, 0x08,   // p 0x70 112
+x7c, 0x14, 0x14, 0x14, 0x08, // p 0x70 112
-x08, 0x14, 0x14, 0x14, 0x7c,   // q 0x71 113
+x08, 0x14, 0x14, 0x14, 0x7c, // q 0x71 113
-x7c, 0x08, 0x04, 0x04, 0x08,   // r 0x72 114
+x7c, 0x08, 0x04, 0x04, 0x08, // r 0x72 114
-x48, 0x54, 0x54, 0x54, 0x20,   // s 0x73 115
+x48, 0x54, 0x54, 0x54, 0x20, // s 0x73 115
-x04, 0x3f, 0x44, 0x40, 0x20,   // t 0x74 116
+x04, 0x3f, 0x44, 0x40, 0x20, // t 0x74 116
-x3c, 0x40, 0x40, 0x20, 0x7c,   // u 0x75 117
+x3c, 0x40, 0x40, 0x20, 0x7c, // u 0x75 117
-x1c, 0x20, 0x40, 0x20, 0x1c,   // v 0x76 118
+x1c, 0x20, 0x40, 0x20, 0x1c, // v 0x76 118
-x3c, 0x40, 0x30, 0x40, 0x3c,   // w 0x77 119
+x3c, 0x40, 0x30, 0x40, 0x3c, // w 0x77 119
-x44, 0x28, 0x10, 0x28, 0x44,   // x 0x78 120
+x44, 0x28, 0x10, 0x28, 0x44, // x 0x78 120
-x0c, 0x50, 0x50, 0x50, 0x3c,   // y 0x79 121
+x0c, 0x50, 0x50, 0x50, 0x3c, // y 0x79 121
-x44, 0x64, 0x54, 0x4c, 0x44,   // z 0x7a 122
+x44, 0x64, 0x54, 0x4c, 0x44, // z 0x7a 122
-x00, 0x08, 0x36, 0x41, 0x41,   //  0x7b 123
+x00, 0x08, 0x36, 0x41, 0x41, //  0x7b 123
-x00, 0x00, 0x7f, 0x00, 0x00,   // | 0x7c 124
+x00, 0x00, 0x7f, 0x00, 0x00, // | 0x7c 124
-x41, 0x41, 0x36, 0x08, 0x00,   //  0x7d 125
+x41, 0x41, 0x36, 0x08, 0x00, //  0x7d 125
-x08, 0x0c, 0x08, 0x18, 0x08,   // ~ 0x7e 126
+x08, 0x0c, 0x08, 0x18, 0x08, // ~ 0x7e 126
-x55, 0x2A, 0x55, 0x2A, 0x55,   //  0x7F 127
+x55, 0x2A, 0x55, 0x2A, 0x55, //  0x7F 127
-x00, 0x06, 0x09, 0x06, 0x00, // 0x80 (remapped in code) a ° sign
+x00, 0x06, 0x09, 0x06, 0x00, // 0x80 (remapped in code) a degrees sign
+x49, 0x7f, 0x49, 0x49, 0x36, //  0x81 (remapped in code) a sort of Bluetooth symbol
-    };
+};
 #if defined(USE_OLD_FONT)#else#endif
+font5x7_t small_font(font5x7_data);
-font5x7_t small_font (font5x7_data);
+font10x18_t large_font(font10x18_data);
-font10x18_t large_font (font10x18_data);

Subversion Repositories libOLED

(root)/trunk/src/fontclass.cpp – Rev 8 → 10