me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rough pass expanding print

Browse Source
This commit is contained in:
Ben V. Brown
2021-03-16 20:42:47 +11:00
parent e6eb3e34bc
commit 3858ac4a16
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/Core/Drivers/OLED.cpp
View File

@@ -122,11 +122,11 @@ void OLED::drawChar(const uint16_t charCode) {
cursor_x = 0; cursor_x = 0;
cursor_y = 8; cursor_y = 8;
return; return;
} else if (charCode <=0x01) { } else if (charCode <= 0x01) {
return; return;
} }
// First index is \x02 // First index is \x02
uint16_t index = charCode-2; uint16_t index = charCode - 2;
uint8_t *charPointer; uint8_t *charPointer;
charPointer = ((uint8_t *)currentFont) + ((fontWidth * (fontHeight / 8)) * index); charPointer = ((uint8_t *)currentFont) + ((fontWidth * (fontHeight / 8)) * index);
drawArea(cursor_x, cursor_y, fontWidth, fontHeight, charPointer); drawArea(cursor_x, cursor_y, fontWidth, fontHeight, charPointer);
@@ -236,8 +236,17 @@ void OLED::setRotation(bool leftHanded) {
// print a string to the current cursor location // print a string to the current cursor location
void OLED::print(const char *str) { void OLED::print(const char *str) {
uint16_t cache = 0;
while (str[0]) { while (str[0]) {
drawChar(str[0]); if (str[0] >= 0xF0) {
cache = static_cast<uint16_t>(str[0] & 0x0F) << 8;
} else if (cache != 0) {
cache |= str[0];
drawChar(cache);
cache = 0;
} else {
drawChar(str[0]);
}
str++; str++;
} }
} }

1
source/build.sh
View File

@@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -x
TRANSLATION_DIR="../Translations" TRANSLATION_DIR="../Translations"
TRANSLATION_SCRIPT="make_translation.py" TRANSLATION_SCRIPT="make_translation.py"