diff --git a/src/patrix/display/Display.h b/src/patrix/display/Display.h index 6d6f478..5404df9 100644 --- a/src/patrix/display/Display.h +++ b/src/patrix/display/Display.h @@ -196,13 +196,17 @@ public: return printERROR(x, y, color); } + if (character == ' ') { + *x += 3; + return; + } + if (character == '\n') { *y += 6; return; } switch (character) { - case ' ': return print(x, y, reinterpret_cast(FONT_CHAR_SPACE), countof(FONT_CHAR_SPACE[0]), countof(FONT_CHAR_SPACE), color); case '-': return print(x, y, reinterpret_cast(FONT_CHAR_MINUS), countof(FONT_CHAR_MINUS[0]), countof(FONT_CHAR_MINUS), color); case '+': return print(x, y, reinterpret_cast(FONT_CHAR_PLUS), countof(FONT_CHAR_PLUS[0]), countof(FONT_CHAR_PLUS), color); case '_': return print(x, y, reinterpret_cast(FONT_CHAR_UNDERLINE), countof(FONT_CHAR_UNDERLINE[0]), countof(FONT_CHAR_UNDERLINE), color); diff --git a/src/patrix/display/DisplayMatrix_FontSpecial.cpp b/src/patrix/display/DisplayMatrix_FontSpecial.cpp index 559960e..6d5b151 100644 --- a/src/patrix/display/DisplayMatrix_FontSpecial.cpp +++ b/src/patrix/display/DisplayMatrix_FontSpecial.cpp @@ -1,13 +1,5 @@ #include "DisplayMatrix_FontSpecial.h" -Symbol3 FONT_CHAR_SPACE = { - {_,_,_}, - {_,_,_}, - {_,_,_}, - {_,_,_}, - {_,_,_}, -}; - Symbol3 FONT_CHAR_MINUS = { {_,_,_}, {_,_,_}, diff --git a/src/patrix/display/DisplayMatrix_FontSpecial.h b/src/patrix/display/DisplayMatrix_FontSpecial.h index 0c7d7e3..897d751 100644 --- a/src/patrix/display/DisplayMatrix_FontSpecial.h +++ b/src/patrix/display/DisplayMatrix_FontSpecial.h @@ -3,7 +3,6 @@ #include "DisplayMatrix_FontCommon.h" -extern Symbol3 FONT_CHAR_SPACE; extern Symbol3 FONT_CHAR_MINUS; extern Symbol3 FONT_CHAR_PLUS; extern Symbol3 FONT_CHAR_UNDERLINE;