diff options
-rw-r--r-- | include/lib/pixelfont/pixeloperator.h | 199 | ||||
-rw-r--r-- | include/lib/pixelfont/pixeloperator_mirrored.h | 199 | ||||
-rw-r--r-- | src/os/object/framebuffer.cc | 13 |
3 files changed, 219 insertions, 192 deletions
diff --git a/include/lib/pixelfont/pixeloperator.h b/include/lib/pixelfont/pixeloperator.h index 8ca3030..30f5154 100644 --- a/include/lib/pixelfont/pixeloperator.h +++ b/include/lib/pixelfont/pixeloperator.h @@ -9,106 +9,113 @@ * SPDX-License-Identifier: CC0-1.0 */ +#ifdef MULTIPASS_ARCH_arduino_nano +#include <avr/pgmspace.h> +#define GLYPH_ATTR PROGMEM +#else +#define GLYPH_ATTR +#endif + typedef const unsigned char glyph_line_t; typedef const unsigned char* glyph_t; -glyph_line_t chr_032[] = {0x03,0x00,0x00,0x00}; // <space> -glyph_line_t chr_033[] = {0x01,0x7D}; // ! -glyph_line_t chr_034[] = {0x04,0x30,0x40,0x30,0x40}; // " -glyph_line_t chr_035[] = {0x06,0x12,0x3F,0x12,0x12,0x3F,0x12}; // # -glyph_line_t chr_036[] = {0x05,0x12,0x2A,0x7F,0x2A,0x24}; // $ -glyph_line_t chr_037[] = {0x07,0x30,0x4A,0x34,0x08,0x16,0x29,0x06}; // % -glyph_line_t chr_038[] = {0x05,0x36,0x49,0x49,0x49,0x27}; // & -glyph_line_t chr_039[] = {0x01,0x70}; // ' -glyph_line_t chr_040[] = {0x03,0x1C,0x22,0x41}; // ( -glyph_line_t chr_041[] = {0x03,0x41,0x22,0x1C}; // ) -glyph_line_t chr_042[] = {0x05,0x28,0x10,0x7C,0x10,0x28}; // * -glyph_line_t chr_043[] = {0x05,0x08,0x08,0x3E,0x08,0x08}; // + -glyph_line_t chr_044[] = {0x02,0x01,0x02}; // , -glyph_line_t chr_045[] = {0x05,0x08,0x08,0x08,0x08,0x08}; // - -glyph_line_t chr_046[] = {0x01,0x01}; // . -glyph_line_t chr_047[] = {0x03,0x03,0x1C,0x60}; // / -glyph_line_t chr_048[] = {0x05,0x3E,0x45,0x49,0x51,0x3E}; // 0 -glyph_line_t chr_049[] = {0x03,0x10,0x20,0x7F}; // 1 -glyph_line_t chr_050[] = {0x05,0x21,0x43,0x45,0x49,0x31}; // 2 -glyph_line_t chr_051[] = {0x05,0x22,0x41,0x49,0x49,0x36}; // 3 -glyph_line_t chr_052[] = {0x05,0x0C,0x14,0x24,0x44,0x7F}; // 4 -glyph_line_t chr_053[] = {0x05,0x72,0x51,0x51,0x51,0x4E}; // 5 -glyph_line_t chr_054[] = {0x05,0x3E,0x49,0x49,0x49,0x26}; // 6 -glyph_line_t chr_055[] = {0x05,0x43,0x44,0x48,0x50,0x60}; // 7 -glyph_line_t chr_056[] = {0x05,0x36,0x49,0x49,0x49,0x36}; // 8 -glyph_line_t chr_057[] = {0x05,0x32,0x49,0x49,0x49,0x3E}; // 9 -glyph_line_t chr_058[] = {0x01,0x12}; // : -glyph_line_t chr_059[] = {0x02,0x01,0x12}; // ; -glyph_line_t chr_060[] = {0x03,0x08,0x14,0x22}; // < -glyph_line_t chr_061[] = {0x05,0x14,0x14,0x14,0x14,0x14}; // = -glyph_line_t chr_062[] = {0x03,0x22,0x14,0x08}; // > -glyph_line_t chr_063[] = {0x05,0x20,0x40,0x45,0x48,0x30}; // ? -glyph_line_t chr_064[] = {0x07,0x3E,0x41,0x49,0x55,0x5D,0x45,0x38}; // @ -glyph_line_t chr_065[] = {0x05,0x3F,0x48,0x48,0x48,0x3F}; // A -glyph_line_t chr_066[] = {0x05,0x7F,0x49,0x49,0x49,0x36}; // B -glyph_line_t chr_067[] = {0x05,0x3E,0x41,0x41,0x41,0x22}; // C -glyph_line_t chr_068[] = {0x05,0x7F,0x41,0x41,0x41,0x3E}; // D -glyph_line_t chr_069[] = {0x05,0x7F,0x49,0x49,0x41,0x41}; // E -glyph_line_t chr_070[] = {0x05,0x7F,0x48,0x48,0x40,0x40}; // F -glyph_line_t chr_071[] = {0x05,0x3E,0x41,0x41,0x49,0x2F}; // G -glyph_line_t chr_072[] = {0x05,0x7F,0x08,0x08,0x08,0x7F}; // H -glyph_line_t chr_073[] = {0x01,0x7F}; // I -glyph_line_t chr_074[] = {0x05,0x02,0x01,0x01,0x01,0x7E}; // J -glyph_line_t chr_075[] = {0x05,0x7F,0x08,0x14,0x22,0x41}; // K -glyph_line_t chr_076[] = {0x05,0x7F,0x01,0x01,0x01,0x01}; // L -glyph_line_t chr_077[] = {0x07,0x7F,0x10,0x08,0x04,0x08,0x10,0x7F}; // M -glyph_line_t chr_078[] = {0x05,0x7F,0x10,0x08,0x04,0x7F}; // N -glyph_line_t chr_079[] = {0x05,0x3E,0x41,0x41,0x41,0x3E}; // O -glyph_line_t chr_080[] = {0x05,0x7F,0x48,0x48,0x48,0x30}; // P -glyph_line_t chr_081[] = {0x05,0x3E,0x41,0x45,0x42,0x3D}; // Q -glyph_line_t chr_082[] = {0x05,0x7F,0x44,0x44,0x46,0x39}; // R -glyph_line_t chr_083[] = {0x05,0x32,0x49,0x49,0x49,0x26}; // S -glyph_line_t chr_084[] = {0x05,0x40,0x40,0x7F,0x40,0x40}; // T -glyph_line_t chr_085[] = {0x05,0x7E,0x01,0x01,0x01,0x7E}; // U -glyph_line_t chr_086[] = {0x05,0x7C,0x02,0x01,0x02,0x7C}; // V -glyph_line_t chr_087[] = {0x07,0x7E,0x01,0x01,0x1E,0x01,0x01,0x7E}; // W -glyph_line_t chr_088[] = {0x05,0x63,0x14,0x08,0x14,0x63}; // X -glyph_line_t chr_089[] = {0x05,0x60,0x10,0x0F,0x10,0x60}; // Y -glyph_line_t chr_090[] = {0x05,0x43,0x45,0x49,0x51,0x61}; // Z -glyph_line_t chr_091[] = {0x03,0x7F,0x41,0x41}; // [ -glyph_line_t chr_092[] = {0x03,0x60,0x1C,0x03}; // backslash -glyph_line_t chr_093[] = {0x03,0x41,0x41,0x7F}; // ] -glyph_line_t chr_094[] = {0x05,0x10,0x20,0x40,0x20,0x10}; // ^ -glyph_line_t chr_095[] = {0x05,0x01,0x01,0x01,0x01,0x01}; // _ -glyph_line_t chr_096[] = {0x02,0x40,0x20}; // ` -glyph_line_t chr_097[] = {0x05,0x02,0x15,0x15,0x15,0x0F}; // a -glyph_line_t chr_098[] = {0x05,0x7F,0x11,0x11,0x11,0x0E}; // b -glyph_line_t chr_099[] = {0x05,0x0E,0x11,0x11,0x11,0x0A}; // c -glyph_line_t chr_100[] = {0x05,0x0E,0x11,0x11,0x11,0x7F}; // d -glyph_line_t chr_101[] = {0x05,0x0E,0x15,0x15,0x15,0x0C}; // e -glyph_line_t chr_102[] = {0x05,0x10,0x3F,0x50,0x50,0x40}; // f -glyph_line_t chr_103[] = {0x05,0x08,0x15,0x15,0x15,0x1E}; // g -glyph_line_t chr_104[] = {0x05,0x7F,0x10,0x10,0x10,0x0F}; // h -glyph_line_t chr_105[] = {0x01,0x5F}; // i -glyph_line_t chr_106[] = {0x05,0x02,0x01,0x01,0x01,0x5E}; // j -glyph_line_t chr_107[] = {0x05,0x7F,0x04,0x0C,0x12,0x01}; // k -glyph_line_t chr_108[] = {0x01,0x7F}; // l -glyph_line_t chr_109[] = {0x07,0x1F,0x10,0x10,0x0C,0x10,0x10,0x0F}; // m -glyph_line_t chr_110[] = {0x05,0x1F,0x10,0x10,0x10,0x0F}; // n -glyph_line_t chr_111[] = {0x05,0x0E,0x11,0x11,0x11,0x0E}; // o -glyph_line_t chr_112[] = {0x05,0x0F,0x14,0x14,0x14,0x08}; // p -glyph_line_t chr_113[] = {0x05,0x08,0x14,0x14,0x14,0x0F}; // q -glyph_line_t chr_114[] = {0x05,0x1F,0x04,0x08,0x10,0x10}; // r -glyph_line_t chr_115[] = {0x05,0x09,0x15,0x15,0x15,0x02}; // s -glyph_line_t chr_116[] = {0x05,0x10,0x3E,0x11,0x11,0x01}; // t -glyph_line_t chr_117[] = {0x05,0x1E,0x01,0x01,0x01,0x1E}; // u -glyph_line_t chr_118[] = {0x05,0x1C,0x02,0x01,0x02,0x1C}; // v -glyph_line_t chr_119[] = {0x07,0x1E,0x01,0x01,0x02,0x01,0x01,0x1E}; // w -glyph_line_t chr_120[] = {0x05,0x11,0x0A,0x04,0x0A,0x11}; // x -glyph_line_t chr_121[] = {0x05,0x19,0x05,0x05,0x05,0x1E}; // y -glyph_line_t chr_122[] = {0x05,0x11,0x13,0x15,0x19,0x11}; // z -glyph_line_t chr_123[] = {0x04,0x08,0x36,0x41,0x41}; // { -glyph_line_t chr_124[] = {0x01,0x7F}; // | -glyph_line_t chr_125[] = {0x04,0x41,0x41,0x36,0x08}; // } -glyph_line_t chr_126[] = {0x06,0x20,0x40,0x40,0x20,0x20,0x40}; // ~ +glyph_line_t GLYPH_ATTR chr_032[] = {0x03,0x00,0x00,0x00}; // <space> +glyph_line_t GLYPH_ATTR chr_033[] = {0x01,0x7D}; // ! +glyph_line_t GLYPH_ATTR chr_034[] = {0x04,0x30,0x40,0x30,0x40}; // " +glyph_line_t GLYPH_ATTR chr_035[] = {0x06,0x12,0x3F,0x12,0x12,0x3F,0x12}; // # +glyph_line_t GLYPH_ATTR chr_036[] = {0x05,0x12,0x2A,0x7F,0x2A,0x24}; // $ +glyph_line_t GLYPH_ATTR chr_037[] = {0x07,0x30,0x4A,0x34,0x08,0x16,0x29,0x06}; // % +glyph_line_t GLYPH_ATTR chr_038[] = {0x05,0x36,0x49,0x49,0x49,0x27}; // & +glyph_line_t GLYPH_ATTR chr_039[] = {0x01,0x70}; // ' +glyph_line_t GLYPH_ATTR chr_040[] = {0x03,0x1C,0x22,0x41}; // ( +glyph_line_t GLYPH_ATTR chr_041[] = {0x03,0x41,0x22,0x1C}; // ) +glyph_line_t GLYPH_ATTR chr_042[] = {0x05,0x28,0x10,0x7C,0x10,0x28}; // * +glyph_line_t GLYPH_ATTR chr_043[] = {0x05,0x08,0x08,0x3E,0x08,0x08}; // + +glyph_line_t GLYPH_ATTR chr_044[] = {0x02,0x01,0x02}; // , +glyph_line_t GLYPH_ATTR chr_045[] = {0x05,0x08,0x08,0x08,0x08,0x08}; // - +glyph_line_t GLYPH_ATTR chr_046[] = {0x01,0x01}; // . +glyph_line_t GLYPH_ATTR chr_047[] = {0x03,0x03,0x1C,0x60}; // / +glyph_line_t GLYPH_ATTR chr_048[] = {0x05,0x3E,0x45,0x49,0x51,0x3E}; // 0 +glyph_line_t GLYPH_ATTR chr_049[] = {0x03,0x10,0x20,0x7F}; // 1 +glyph_line_t GLYPH_ATTR chr_050[] = {0x05,0x21,0x43,0x45,0x49,0x31}; // 2 +glyph_line_t GLYPH_ATTR chr_051[] = {0x05,0x22,0x41,0x49,0x49,0x36}; // 3 +glyph_line_t GLYPH_ATTR chr_052[] = {0x05,0x0C,0x14,0x24,0x44,0x7F}; // 4 +glyph_line_t GLYPH_ATTR chr_053[] = {0x05,0x72,0x51,0x51,0x51,0x4E}; // 5 +glyph_line_t GLYPH_ATTR chr_054[] = {0x05,0x3E,0x49,0x49,0x49,0x26}; // 6 +glyph_line_t GLYPH_ATTR chr_055[] = {0x05,0x43,0x44,0x48,0x50,0x60}; // 7 +glyph_line_t GLYPH_ATTR chr_056[] = {0x05,0x36,0x49,0x49,0x49,0x36}; // 8 +glyph_line_t GLYPH_ATTR chr_057[] = {0x05,0x32,0x49,0x49,0x49,0x3E}; // 9 +glyph_line_t GLYPH_ATTR chr_058[] = {0x01,0x12}; // : +glyph_line_t GLYPH_ATTR chr_059[] = {0x02,0x01,0x12}; // ; +glyph_line_t GLYPH_ATTR chr_060[] = {0x03,0x08,0x14,0x22}; // < +glyph_line_t GLYPH_ATTR chr_061[] = {0x05,0x14,0x14,0x14,0x14,0x14}; // = +glyph_line_t GLYPH_ATTR chr_062[] = {0x03,0x22,0x14,0x08}; // > +glyph_line_t GLYPH_ATTR chr_063[] = {0x05,0x20,0x40,0x45,0x48,0x30}; // ? +glyph_line_t GLYPH_ATTR chr_064[] = {0x07,0x3E,0x41,0x49,0x55,0x5D,0x45,0x38}; // @ +glyph_line_t GLYPH_ATTR chr_065[] = {0x05,0x3F,0x48,0x48,0x48,0x3F}; // A +glyph_line_t GLYPH_ATTR chr_066[] = {0x05,0x7F,0x49,0x49,0x49,0x36}; // B +glyph_line_t GLYPH_ATTR chr_067[] = {0x05,0x3E,0x41,0x41,0x41,0x22}; // C +glyph_line_t GLYPH_ATTR chr_068[] = {0x05,0x7F,0x41,0x41,0x41,0x3E}; // D +glyph_line_t GLYPH_ATTR chr_069[] = {0x05,0x7F,0x49,0x49,0x41,0x41}; // E +glyph_line_t GLYPH_ATTR chr_070[] = {0x05,0x7F,0x48,0x48,0x40,0x40}; // F +glyph_line_t GLYPH_ATTR chr_071[] = {0x05,0x3E,0x41,0x41,0x49,0x2F}; // G +glyph_line_t GLYPH_ATTR chr_072[] = {0x05,0x7F,0x08,0x08,0x08,0x7F}; // H +glyph_line_t GLYPH_ATTR chr_073[] = {0x01,0x7F}; // I +glyph_line_t GLYPH_ATTR chr_074[] = {0x05,0x02,0x01,0x01,0x01,0x7E}; // J +glyph_line_t GLYPH_ATTR chr_075[] = {0x05,0x7F,0x08,0x14,0x22,0x41}; // K +glyph_line_t GLYPH_ATTR chr_076[] = {0x05,0x7F,0x01,0x01,0x01,0x01}; // L +glyph_line_t GLYPH_ATTR chr_077[] = {0x07,0x7F,0x10,0x08,0x04,0x08,0x10,0x7F}; // M +glyph_line_t GLYPH_ATTR chr_078[] = {0x05,0x7F,0x10,0x08,0x04,0x7F}; // N +glyph_line_t GLYPH_ATTR chr_079[] = {0x05,0x3E,0x41,0x41,0x41,0x3E}; // O +glyph_line_t GLYPH_ATTR chr_080[] = {0x05,0x7F,0x48,0x48,0x48,0x30}; // P +glyph_line_t GLYPH_ATTR chr_081[] = {0x05,0x3E,0x41,0x45,0x42,0x3D}; // Q +glyph_line_t GLYPH_ATTR chr_082[] = {0x05,0x7F,0x44,0x44,0x46,0x39}; // R +glyph_line_t GLYPH_ATTR chr_083[] = {0x05,0x32,0x49,0x49,0x49,0x26}; // S +glyph_line_t GLYPH_ATTR chr_084[] = {0x05,0x40,0x40,0x7F,0x40,0x40}; // T +glyph_line_t GLYPH_ATTR chr_085[] = {0x05,0x7E,0x01,0x01,0x01,0x7E}; // U +glyph_line_t GLYPH_ATTR chr_086[] = {0x05,0x7C,0x02,0x01,0x02,0x7C}; // V +glyph_line_t GLYPH_ATTR chr_087[] = {0x07,0x7E,0x01,0x01,0x1E,0x01,0x01,0x7E}; // W +glyph_line_t GLYPH_ATTR chr_088[] = {0x05,0x63,0x14,0x08,0x14,0x63}; // X +glyph_line_t GLYPH_ATTR chr_089[] = {0x05,0x60,0x10,0x0F,0x10,0x60}; // Y +glyph_line_t GLYPH_ATTR chr_090[] = {0x05,0x43,0x45,0x49,0x51,0x61}; // Z +glyph_line_t GLYPH_ATTR chr_091[] = {0x03,0x7F,0x41,0x41}; // [ +glyph_line_t GLYPH_ATTR chr_092[] = {0x03,0x60,0x1C,0x03}; // backslash +glyph_line_t GLYPH_ATTR chr_093[] = {0x03,0x41,0x41,0x7F}; // ] +glyph_line_t GLYPH_ATTR chr_094[] = {0x05,0x10,0x20,0x40,0x20,0x10}; // ^ +glyph_line_t GLYPH_ATTR chr_095[] = {0x05,0x01,0x01,0x01,0x01,0x01}; // _ +glyph_line_t GLYPH_ATTR chr_096[] = {0x02,0x40,0x20}; // ` +glyph_line_t GLYPH_ATTR chr_097[] = {0x05,0x02,0x15,0x15,0x15,0x0F}; // a +glyph_line_t GLYPH_ATTR chr_098[] = {0x05,0x7F,0x11,0x11,0x11,0x0E}; // b +glyph_line_t GLYPH_ATTR chr_099[] = {0x05,0x0E,0x11,0x11,0x11,0x0A}; // c +glyph_line_t GLYPH_ATTR chr_100[] = {0x05,0x0E,0x11,0x11,0x11,0x7F}; // d +glyph_line_t GLYPH_ATTR chr_101[] = {0x05,0x0E,0x15,0x15,0x15,0x0C}; // e +glyph_line_t GLYPH_ATTR chr_102[] = {0x05,0x10,0x3F,0x50,0x50,0x40}; // f +glyph_line_t GLYPH_ATTR chr_103[] = {0x05,0x08,0x15,0x15,0x15,0x1E}; // g +glyph_line_t GLYPH_ATTR chr_104[] = {0x05,0x7F,0x10,0x10,0x10,0x0F}; // h +glyph_line_t GLYPH_ATTR chr_105[] = {0x01,0x5F}; // i +glyph_line_t GLYPH_ATTR chr_106[] = {0x05,0x02,0x01,0x01,0x01,0x5E}; // j +glyph_line_t GLYPH_ATTR chr_107[] = {0x05,0x7F,0x04,0x0C,0x12,0x01}; // k +glyph_line_t GLYPH_ATTR chr_108[] = {0x01,0x7F}; // l +glyph_line_t GLYPH_ATTR chr_109[] = {0x07,0x1F,0x10,0x10,0x0C,0x10,0x10,0x0F}; // m +glyph_line_t GLYPH_ATTR chr_110[] = {0x05,0x1F,0x10,0x10,0x10,0x0F}; // n +glyph_line_t GLYPH_ATTR chr_111[] = {0x05,0x0E,0x11,0x11,0x11,0x0E}; // o +glyph_line_t GLYPH_ATTR chr_112[] = {0x05,0x0F,0x14,0x14,0x14,0x08}; // p +glyph_line_t GLYPH_ATTR chr_113[] = {0x05,0x08,0x14,0x14,0x14,0x0F}; // q +glyph_line_t GLYPH_ATTR chr_114[] = {0x05,0x1F,0x04,0x08,0x10,0x10}; // r +glyph_line_t GLYPH_ATTR chr_115[] = {0x05,0x09,0x15,0x15,0x15,0x02}; // s +glyph_line_t GLYPH_ATTR chr_116[] = {0x05,0x10,0x3E,0x11,0x11,0x01}; // t +glyph_line_t GLYPH_ATTR chr_117[] = {0x05,0x1E,0x01,0x01,0x01,0x1E}; // u +glyph_line_t GLYPH_ATTR chr_118[] = {0x05,0x1C,0x02,0x01,0x02,0x1C}; // v +glyph_line_t GLYPH_ATTR chr_119[] = {0x07,0x1E,0x01,0x01,0x02,0x01,0x01,0x1E}; // w +glyph_line_t GLYPH_ATTR chr_120[] = {0x05,0x11,0x0A,0x04,0x0A,0x11}; // x +glyph_line_t GLYPH_ATTR chr_121[] = {0x05,0x19,0x05,0x05,0x05,0x1E}; // y +glyph_line_t GLYPH_ATTR chr_122[] = {0x05,0x11,0x13,0x15,0x19,0x11}; // z +glyph_line_t GLYPH_ATTR chr_123[] = {0x04,0x08,0x36,0x41,0x41}; // { +glyph_line_t GLYPH_ATTR chr_124[] = {0x01,0x7F}; // | +glyph_line_t GLYPH_ATTR chr_125[] = {0x04,0x41,0x41,0x36,0x08}; // } +glyph_line_t GLYPH_ATTR chr_126[] = {0x06,0x20,0x40,0x40,0x20,0x20,0x40}; // ~ -const glyph_t pixeloperator[] = { +const glyph_t pixeloperator[] GLYPH_ATTR = { chr_032, chr_033, chr_034, diff --git a/include/lib/pixelfont/pixeloperator_mirrored.h b/include/lib/pixelfont/pixeloperator_mirrored.h index 71a1cc0..149015c 100644 --- a/include/lib/pixelfont/pixeloperator_mirrored.h +++ b/include/lib/pixelfont/pixeloperator_mirrored.h @@ -9,106 +9,113 @@ * SPDX-License-Identifier: CC0-1.0 */ +#ifdef MULTIPASS_ARCH_arduino_nano +#include <avr/pgmspace.h> +#define GLYPH_ATTR PROGMEM +#else +#define GLYPH_ATTR +#endif + typedef const unsigned char glyph_line_t; typedef const unsigned char* glyph_t; -glyph_line_t chr_032[] = {0x03,0x00,0x00,0x00}; // <space> -glyph_line_t chr_033[] = {0x01,0xbe}; // ! -glyph_line_t chr_034[] = {0x04,0x0c,0x02,0x0c,0x02}; // " -glyph_line_t chr_035[] = {0x06,0x48,0xfc,0x48,0x48,0xfc,0x48}; // # -glyph_line_t chr_036[] = {0x05,0x48,0x54,0xfe,0x54,0x24}; // $ -glyph_line_t chr_037[] = {0x07,0x0c,0x52,0x2c,0x10,0x68,0x94,0x60}; // % -glyph_line_t chr_038[] = {0x05,0x6c,0x92,0x92,0x92,0xe4}; // & -glyph_line_t chr_039[] = {0x01,0x0e}; // ' -glyph_line_t chr_040[] = {0x03,0x38,0x44,0x82}; // ( -glyph_line_t chr_041[] = {0x03,0x82,0x44,0x38}; // ) -glyph_line_t chr_042[] = {0x05,0x14,0x08,0x3e,0x08,0x14}; // * -glyph_line_t chr_043[] = {0x05,0x10,0x10,0x7c,0x10,0x10}; // + -glyph_line_t chr_044[] = {0x02,0x80,0x40}; // , -glyph_line_t chr_045[] = {0x05,0x10,0x10,0x10,0x10,0x10}; // - -glyph_line_t chr_046[] = {0x01,0x80}; // . -glyph_line_t chr_047[] = {0x03,0xc0,0x38,0x06}; // / -glyph_line_t chr_048[] = {0x05,0x7c,0xa2,0x92,0x8a,0x7c}; // 0 -glyph_line_t chr_049[] = {0x03,0x08,0x04,0xfe}; // 1 -glyph_line_t chr_050[] = {0x05,0x84,0xc2,0xa2,0x92,0x8c}; // 2 -glyph_line_t chr_051[] = {0x05,0x44,0x82,0x92,0x92,0x6c}; // 3 -glyph_line_t chr_052[] = {0x05,0x30,0x28,0x24,0x22,0xfe}; // 4 -glyph_line_t chr_053[] = {0x05,0x4e,0x8a,0x8a,0x8a,0x72}; // 5 -glyph_line_t chr_054[] = {0x05,0x7c,0x92,0x92,0x92,0x64}; // 6 -glyph_line_t chr_055[] = {0x05,0xc2,0x22,0x12,0x0a,0x06}; // 7 -glyph_line_t chr_056[] = {0x05,0x6c,0x92,0x92,0x92,0x6c}; // 8 -glyph_line_t chr_057[] = {0x05,0x4c,0x92,0x92,0x92,0x7c}; // 9 -glyph_line_t chr_058[] = {0x01,0x48}; // : -glyph_line_t chr_059[] = {0x02,0x80,0x48}; // ; -glyph_line_t chr_060[] = {0x03,0x10,0x28,0x44}; // < -glyph_line_t chr_061[] = {0x05,0x28,0x28,0x28,0x28,0x28}; // = -glyph_line_t chr_062[] = {0x03,0x44,0x28,0x10}; // > -glyph_line_t chr_063[] = {0x05,0x04,0x02,0xa2,0x12,0x0c}; // ? -glyph_line_t chr_064[] = {0x07,0x7c,0x82,0x92,0xaa,0xba,0xa2,0x1c}; // @ -glyph_line_t chr_065[] = {0x05,0xfc,0x12,0x12,0x12,0xfc}; // A -glyph_line_t chr_066[] = {0x05,0xfe,0x92,0x92,0x92,0x6c}; // B -glyph_line_t chr_067[] = {0x05,0x7c,0x82,0x82,0x82,0x44}; // C -glyph_line_t chr_068[] = {0x05,0xfe,0x82,0x82,0x82,0x7c}; // D -glyph_line_t chr_069[] = {0x05,0xfe,0x92,0x92,0x82,0x82}; // E -glyph_line_t chr_070[] = {0x05,0xfe,0x12,0x12,0x02,0x02}; // F -glyph_line_t chr_071[] = {0x05,0x7c,0x82,0x82,0x92,0xf4}; // G -glyph_line_t chr_072[] = {0x05,0xfe,0x10,0x10,0x10,0xfe}; // H -glyph_line_t chr_073[] = {0x01,0xfe}; // I -glyph_line_t chr_074[] = {0x05,0x40,0x80,0x80,0x80,0x7e}; // J -glyph_line_t chr_075[] = {0x05,0xfe,0x10,0x28,0x44,0x82}; // K -glyph_line_t chr_076[] = {0x05,0xfe,0x80,0x80,0x80,0x80}; // L -glyph_line_t chr_077[] = {0x07,0xfe,0x08,0x10,0x20,0x10,0x08,0xfe}; // M -glyph_line_t chr_078[] = {0x05,0xfe,0x08,0x10,0x20,0xfe}; // N -glyph_line_t chr_079[] = {0x05,0x7c,0x82,0x82,0x82,0x7c}; // O -glyph_line_t chr_080[] = {0x05,0xfe,0x12,0x12,0x12,0x0c}; // P -glyph_line_t chr_081[] = {0x05,0x7c,0x82,0xa2,0x42,0xbc}; // Q -glyph_line_t chr_082[] = {0x05,0xfe,0x22,0x22,0x62,0x9c}; // R -glyph_line_t chr_083[] = {0x05,0x4c,0x92,0x92,0x92,0x64}; // S -glyph_line_t chr_084[] = {0x05,0x02,0x02,0xfe,0x02,0x02}; // T -glyph_line_t chr_085[] = {0x05,0x7e,0x80,0x80,0x80,0x7e}; // U -glyph_line_t chr_086[] = {0x05,0x3e,0x40,0x80,0x40,0x3e}; // V -glyph_line_t chr_087[] = {0x07,0x7e,0x80,0x80,0x78,0x80,0x80,0x7e}; // W -glyph_line_t chr_088[] = {0x05,0xc6,0x28,0x10,0x28,0xc6}; // X -glyph_line_t chr_089[] = {0x05,0x06,0x08,0xf0,0x08,0x06}; // Y -glyph_line_t chr_090[] = {0x05,0xc2,0xa2,0x92,0x8a,0x86}; // Z -glyph_line_t chr_091[] = {0x03,0xfe,0x82,0x82}; // [ -glyph_line_t chr_092[] = {0x03,0x06,0x38,0xc0}; // backslash -glyph_line_t chr_093[] = {0x03,0x82,0x82,0xfe}; // ] -glyph_line_t chr_094[] = {0x05,0x08,0x04,0x02,0x04,0x08}; // ^ -glyph_line_t chr_095[] = {0x05,0x80,0x80,0x80,0x80,0x80}; // _ -glyph_line_t chr_096[] = {0x02,0x02,0x04}; // ` -glyph_line_t chr_097[] = {0x05,0x40,0xa8,0xa8,0xa8,0xf0}; // a -glyph_line_t chr_098[] = {0x05,0xfe,0x88,0x88,0x88,0x70}; // b -glyph_line_t chr_099[] = {0x05,0x70,0x88,0x88,0x88,0x50}; // c -glyph_line_t chr_100[] = {0x05,0x70,0x88,0x88,0x88,0xfe}; // d -glyph_line_t chr_101[] = {0x05,0x70,0xa8,0xa8,0xa8,0x30}; // e -glyph_line_t chr_102[] = {0x05,0x08,0xfc,0x0a,0x0a,0x02}; // f -glyph_line_t chr_103[] = {0x05,0x10,0xa8,0xa8,0xa8,0x78}; // g -glyph_line_t chr_104[] = {0x05,0xfe,0x08,0x08,0x08,0xf0}; // h -glyph_line_t chr_105[] = {0x01,0xfa}; // i -glyph_line_t chr_106[] = {0x05,0x40,0x80,0x80,0x80,0x7a}; // j -glyph_line_t chr_107[] = {0x05,0xfe,0x20,0x30,0x48,0x80}; // k -glyph_line_t chr_108[] = {0x01,0xfe}; // l -glyph_line_t chr_109[] = {0x07,0xf8,0x08,0x08,0x30,0x08,0x08,0xf0}; // m -glyph_line_t chr_110[] = {0x05,0xf8,0x08,0x08,0x08,0xf0}; // n -glyph_line_t chr_111[] = {0x05,0x70,0x88,0x88,0x88,0x70}; // o -glyph_line_t chr_112[] = {0x05,0xf0,0x28,0x28,0x28,0x10}; // p -glyph_line_t chr_113[] = {0x05,0x10,0x28,0x28,0x28,0xf0}; // q -glyph_line_t chr_114[] = {0x05,0xf8,0x20,0x10,0x08,0x08}; // r -glyph_line_t chr_115[] = {0x05,0x90,0xa8,0xa8,0xa8,0x40}; // s -glyph_line_t chr_116[] = {0x05,0x08,0x7c,0x88,0x88,0x80}; // t -glyph_line_t chr_117[] = {0x05,0x78,0x80,0x80,0x80,0x78}; // u -glyph_line_t chr_118[] = {0x05,0x38,0x40,0x80,0x40,0x38}; // v -glyph_line_t chr_119[] = {0x07,0x78,0x80,0x80,0x40,0x80,0x80,0x78}; // w -glyph_line_t chr_120[] = {0x05,0x88,0x50,0x20,0x50,0x88}; // x -glyph_line_t chr_121[] = {0x05,0x98,0xa0,0xa0,0xa0,0x78}; // y -glyph_line_t chr_122[] = {0x05,0x88,0xc8,0xa8,0x98,0x88}; // z -glyph_line_t chr_123[] = {0x04,0x10,0x6c,0x82,0x82}; // { -glyph_line_t chr_124[] = {0x01,0xfe}; // | -glyph_line_t chr_125[] = {0x04,0x82,0x82,0x6c,0x10}; // } -glyph_line_t chr_126[] = {0x06,0x04,0x02,0x02,0x04,0x04,0x02}; // ~ +glyph_line_t GLYPH_ATTR chr_032[] = {0x03,0x00,0x00,0x00}; // <space> +glyph_line_t GLYPH_ATTR chr_033[] = {0x01,0xbe}; // ! +glyph_line_t GLYPH_ATTR chr_034[] = {0x04,0x0c,0x02,0x0c,0x02}; // " +glyph_line_t GLYPH_ATTR chr_035[] = {0x06,0x48,0xfc,0x48,0x48,0xfc,0x48}; // # +glyph_line_t GLYPH_ATTR chr_036[] = {0x05,0x48,0x54,0xfe,0x54,0x24}; // $ +glyph_line_t GLYPH_ATTR chr_037[] = {0x07,0x0c,0x52,0x2c,0x10,0x68,0x94,0x60}; // % +glyph_line_t GLYPH_ATTR chr_038[] = {0x05,0x6c,0x92,0x92,0x92,0xe4}; // & +glyph_line_t GLYPH_ATTR chr_039[] = {0x01,0x0e}; // ' +glyph_line_t GLYPH_ATTR chr_040[] = {0x03,0x38,0x44,0x82}; // ( +glyph_line_t GLYPH_ATTR chr_041[] = {0x03,0x82,0x44,0x38}; // ) +glyph_line_t GLYPH_ATTR chr_042[] = {0x05,0x14,0x08,0x3e,0x08,0x14}; // * +glyph_line_t GLYPH_ATTR chr_043[] = {0x05,0x10,0x10,0x7c,0x10,0x10}; // + +glyph_line_t GLYPH_ATTR chr_044[] = {0x02,0x80,0x40}; // , +glyph_line_t GLYPH_ATTR chr_045[] = {0x05,0x10,0x10,0x10,0x10,0x10}; // - +glyph_line_t GLYPH_ATTR chr_046[] = {0x01,0x80}; // . +glyph_line_t GLYPH_ATTR chr_047[] = {0x03,0xc0,0x38,0x06}; // / +glyph_line_t GLYPH_ATTR chr_048[] = {0x05,0x7c,0xa2,0x92,0x8a,0x7c}; // 0 +glyph_line_t GLYPH_ATTR chr_049[] = {0x03,0x08,0x04,0xfe}; // 1 +glyph_line_t GLYPH_ATTR chr_050[] = {0x05,0x84,0xc2,0xa2,0x92,0x8c}; // 2 +glyph_line_t GLYPH_ATTR chr_051[] = {0x05,0x44,0x82,0x92,0x92,0x6c}; // 3 +glyph_line_t GLYPH_ATTR chr_052[] = {0x05,0x30,0x28,0x24,0x22,0xfe}; // 4 +glyph_line_t GLYPH_ATTR chr_053[] = {0x05,0x4e,0x8a,0x8a,0x8a,0x72}; // 5 +glyph_line_t GLYPH_ATTR chr_054[] = {0x05,0x7c,0x92,0x92,0x92,0x64}; // 6 +glyph_line_t GLYPH_ATTR chr_055[] = {0x05,0xc2,0x22,0x12,0x0a,0x06}; // 7 +glyph_line_t GLYPH_ATTR chr_056[] = {0x05,0x6c,0x92,0x92,0x92,0x6c}; // 8 +glyph_line_t GLYPH_ATTR chr_057[] = {0x05,0x4c,0x92,0x92,0x92,0x7c}; // 9 +glyph_line_t GLYPH_ATTR chr_058[] = {0x01,0x48}; // : +glyph_line_t GLYPH_ATTR chr_059[] = {0x02,0x80,0x48}; // ; +glyph_line_t GLYPH_ATTR chr_060[] = {0x03,0x10,0x28,0x44}; // < +glyph_line_t GLYPH_ATTR chr_061[] = {0x05,0x28,0x28,0x28,0x28,0x28}; // = +glyph_line_t GLYPH_ATTR chr_062[] = {0x03,0x44,0x28,0x10}; // > +glyph_line_t GLYPH_ATTR chr_063[] = {0x05,0x04,0x02,0xa2,0x12,0x0c}; // ? +glyph_line_t GLYPH_ATTR chr_064[] = {0x07,0x7c,0x82,0x92,0xaa,0xba,0xa2,0x1c}; // @ +glyph_line_t GLYPH_ATTR chr_065[] = {0x05,0xfc,0x12,0x12,0x12,0xfc}; // A +glyph_line_t GLYPH_ATTR chr_066[] = {0x05,0xfe,0x92,0x92,0x92,0x6c}; // B +glyph_line_t GLYPH_ATTR chr_067[] = {0x05,0x7c,0x82,0x82,0x82,0x44}; // C +glyph_line_t GLYPH_ATTR chr_068[] = {0x05,0xfe,0x82,0x82,0x82,0x7c}; // D +glyph_line_t GLYPH_ATTR chr_069[] = {0x05,0xfe,0x92,0x92,0x82,0x82}; // E +glyph_line_t GLYPH_ATTR chr_070[] = {0x05,0xfe,0x12,0x12,0x02,0x02}; // F +glyph_line_t GLYPH_ATTR chr_071[] = {0x05,0x7c,0x82,0x82,0x92,0xf4}; // G +glyph_line_t GLYPH_ATTR chr_072[] = {0x05,0xfe,0x10,0x10,0x10,0xfe}; // H +glyph_line_t GLYPH_ATTR chr_073[] = {0x01,0xfe}; // I +glyph_line_t GLYPH_ATTR chr_074[] = {0x05,0x40,0x80,0x80,0x80,0x7e}; // J +glyph_line_t GLYPH_ATTR chr_075[] = {0x05,0xfe,0x10,0x28,0x44,0x82}; // K +glyph_line_t GLYPH_ATTR chr_076[] = {0x05,0xfe,0x80,0x80,0x80,0x80}; // L +glyph_line_t GLYPH_ATTR chr_077[] = {0x07,0xfe,0x08,0x10,0x20,0x10,0x08,0xfe}; // M +glyph_line_t GLYPH_ATTR chr_078[] = {0x05,0xfe,0x08,0x10,0x20,0xfe}; // N +glyph_line_t GLYPH_ATTR chr_079[] = {0x05,0x7c,0x82,0x82,0x82,0x7c}; // O +glyph_line_t GLYPH_ATTR chr_080[] = {0x05,0xfe,0x12,0x12,0x12,0x0c}; // P +glyph_line_t GLYPH_ATTR chr_081[] = {0x05,0x7c,0x82,0xa2,0x42,0xbc}; // Q +glyph_line_t GLYPH_ATTR chr_082[] = {0x05,0xfe,0x22,0x22,0x62,0x9c}; // R +glyph_line_t GLYPH_ATTR chr_083[] = {0x05,0x4c,0x92,0x92,0x92,0x64}; // S +glyph_line_t GLYPH_ATTR chr_084[] = {0x05,0x02,0x02,0xfe,0x02,0x02}; // T +glyph_line_t GLYPH_ATTR chr_085[] = {0x05,0x7e,0x80,0x80,0x80,0x7e}; // U +glyph_line_t GLYPH_ATTR chr_086[] = {0x05,0x3e,0x40,0x80,0x40,0x3e}; // V +glyph_line_t GLYPH_ATTR chr_087[] = {0x07,0x7e,0x80,0x80,0x78,0x80,0x80,0x7e}; // W +glyph_line_t GLYPH_ATTR chr_088[] = {0x05,0xc6,0x28,0x10,0x28,0xc6}; // X +glyph_line_t GLYPH_ATTR chr_089[] = {0x05,0x06,0x08,0xf0,0x08,0x06}; // Y +glyph_line_t GLYPH_ATTR chr_090[] = {0x05,0xc2,0xa2,0x92,0x8a,0x86}; // Z +glyph_line_t GLYPH_ATTR chr_091[] = {0x03,0xfe,0x82,0x82}; // [ +glyph_line_t GLYPH_ATTR chr_092[] = {0x03,0x06,0x38,0xc0}; // backslash +glyph_line_t GLYPH_ATTR chr_093[] = {0x03,0x82,0x82,0xfe}; // ] +glyph_line_t GLYPH_ATTR chr_094[] = {0x05,0x08,0x04,0x02,0x04,0x08}; // ^ +glyph_line_t GLYPH_ATTR chr_095[] = {0x05,0x80,0x80,0x80,0x80,0x80}; // _ +glyph_line_t GLYPH_ATTR chr_096[] = {0x02,0x02,0x04}; // ` +glyph_line_t GLYPH_ATTR chr_097[] = {0x05,0x40,0xa8,0xa8,0xa8,0xf0}; // a +glyph_line_t GLYPH_ATTR chr_098[] = {0x05,0xfe,0x88,0x88,0x88,0x70}; // b +glyph_line_t GLYPH_ATTR chr_099[] = {0x05,0x70,0x88,0x88,0x88,0x50}; // c +glyph_line_t GLYPH_ATTR chr_100[] = {0x05,0x70,0x88,0x88,0x88,0xfe}; // d +glyph_line_t GLYPH_ATTR chr_101[] = {0x05,0x70,0xa8,0xa8,0xa8,0x30}; // e +glyph_line_t GLYPH_ATTR chr_102[] = {0x05,0x08,0xfc,0x0a,0x0a,0x02}; // f +glyph_line_t GLYPH_ATTR chr_103[] = {0x05,0x10,0xa8,0xa8,0xa8,0x78}; // g +glyph_line_t GLYPH_ATTR chr_104[] = {0x05,0xfe,0x08,0x08,0x08,0xf0}; // h +glyph_line_t GLYPH_ATTR chr_105[] = {0x01,0xfa}; // i +glyph_line_t GLYPH_ATTR chr_106[] = {0x05,0x40,0x80,0x80,0x80,0x7a}; // j +glyph_line_t GLYPH_ATTR chr_107[] = {0x05,0xfe,0x20,0x30,0x48,0x80}; // k +glyph_line_t GLYPH_ATTR chr_108[] = {0x01,0xfe}; // l +glyph_line_t GLYPH_ATTR chr_109[] = {0x07,0xf8,0x08,0x08,0x30,0x08,0x08,0xf0}; // m +glyph_line_t GLYPH_ATTR chr_110[] = {0x05,0xf8,0x08,0x08,0x08,0xf0}; // n +glyph_line_t GLYPH_ATTR chr_111[] = {0x05,0x70,0x88,0x88,0x88,0x70}; // o +glyph_line_t GLYPH_ATTR chr_112[] = {0x05,0xf0,0x28,0x28,0x28,0x10}; // p +glyph_line_t GLYPH_ATTR chr_113[] = {0x05,0x10,0x28,0x28,0x28,0xf0}; // q +glyph_line_t GLYPH_ATTR chr_114[] = {0x05,0xf8,0x20,0x10,0x08,0x08}; // r +glyph_line_t GLYPH_ATTR chr_115[] = {0x05,0x90,0xa8,0xa8,0xa8,0x40}; // s +glyph_line_t GLYPH_ATTR chr_116[] = {0x05,0x08,0x7c,0x88,0x88,0x80}; // t +glyph_line_t GLYPH_ATTR chr_117[] = {0x05,0x78,0x80,0x80,0x80,0x78}; // u +glyph_line_t GLYPH_ATTR chr_118[] = {0x05,0x38,0x40,0x80,0x40,0x38}; // v +glyph_line_t GLYPH_ATTR chr_119[] = {0x07,0x78,0x80,0x80,0x40,0x80,0x80,0x78}; // w +glyph_line_t GLYPH_ATTR chr_120[] = {0x05,0x88,0x50,0x20,0x50,0x88}; // x +glyph_line_t GLYPH_ATTR chr_121[] = {0x05,0x98,0xa0,0xa0,0xa0,0x78}; // y +glyph_line_t GLYPH_ATTR chr_122[] = {0x05,0x88,0xc8,0xa8,0x98,0x88}; // z +glyph_line_t GLYPH_ATTR chr_123[] = {0x04,0x10,0x6c,0x82,0x82}; // { +glyph_line_t GLYPH_ATTR chr_124[] = {0x01,0xfe}; // | +glyph_line_t GLYPH_ATTR chr_125[] = {0x04,0x82,0x82,0x6c,0x10}; // } +glyph_line_t GLYPH_ATTR chr_126[] = {0x06,0x04,0x02,0x02,0x04,0x04,0x02}; // ~ -const glyph_t pixeloperator_mirrored[] = { +const glyph_t pixeloperator_mirrored[] GLYPH_ATTR = { chr_032, chr_033, chr_034, diff --git a/src/os/object/framebuffer.cc b/src/os/object/framebuffer.cc index 7b3fe0d..f23cd84 100644 --- a/src/os/object/framebuffer.cc +++ b/src/os/object/framebuffer.cc @@ -1,5 +1,9 @@ #include "object/framebuffer.h" +#ifdef MULTIPASS_ARCH_arduino_nano +#include <avr/pgmspace.h> +#endif + #ifdef CONFIG_framebuffer_in_text_segment __attribute__ ((section(".text"))) #endif @@ -80,8 +84,13 @@ void Framebuffer::put(char c) if ((c < 32) || (c > 126)) { c = '?'; } +#ifdef MULTIPASS_ARCH_arduino_nano + uint8_t *glyph_addr = (uint8_t *)pgm_read_ptr(&font[c - 32]); + const unsigned char glyph_w = pgm_read_byte(&glyph_addr[0]); +#else glyph_t glyph = font[c - 32]; const unsigned char glyph_w = glyph[0]; +#endif if (fontX + glyph_w + 1 >= width) { put('\n'); @@ -90,7 +99,11 @@ void Framebuffer::put(char c) return; } for (unsigned char i = 0; i < glyph_w; i++) { +#ifdef MULTIPASS_ARCH_arduino_nano + data[(height/8) * (fontX + i) + fontY/8] = pgm_read_byte(&glyph_addr[i+1]); +#else data[(height/8) * (fontX + i) + fontY/8] = glyph[i+1]; +#endif } data[(height/8) * (fontX + glyph_w + 1) + fontY/8] = 0; fontX += glyph_w + 2; |