sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Add readback for the current font

Browse Source
This commit is contained in:
Ben V. Brown
2019-12-29 16:35:29 +11:00
parent 3040bc5fa4
commit e82c75258a
2 changed files with 121 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workspace/TS100/Core/Inc/OLED.hpp
View File

@@ -69,6 +69,7 @@ public:
cursor_y = y * fontHeight; cursor_y = y * fontHeight;
} }
static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used
static uint8_t getFont();
static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) { static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) {
drawArea(x, 0, width, 16, buffer); drawArea(x, 0, width, 16, buffer);
} }

8
workspace/TS100/Core/Src/OLED.cpp
View File

@@ -155,6 +155,14 @@ void OLED::setFont(uint8_t fontNumber) {
fontWidth = 12; fontWidth = 12;
} }
} }
uint8_t OLED::getFont() {
if (currentFont == USER_FONT_6x8)
return 1;
else if (currentFont == ExtraFontChars)
return 2;
else
return 0;
}
inline void stripLeaderZeros(char *buffer) { inline void stripLeaderZeros(char *buffer) {
//Removing the leading zero's by swapping them to SymbolSpace //Removing the leading zero's by swapping them to SymbolSpace
// Stop 1 short so that we dont blank entire number if its zero // Stop 1 short so that we dont blank entire number if its zero