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

UTF8 handling, Cyrillic font, bring over old translations

Browse Source
This commit is contained in:
Ben V. Brown
2017-09-27 21:14:18 +10:00
parent daa04d0c80
commit 43c5ca855c
5 changed files with 381 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
workspace/TS100/src/OLED.cpp
View File

@@ -71,7 +71,7 @@ void OLED::initialize() {
screenBuffer[4] = 0x80;
screenBuffer[5] = inLeftHandedMode ? 95 : 0x7F;
screenBuffer[6] = 0x80;//Set pages to rollover after 2
screenBuffer[6] = 0x80; //Set pages to rollover after 2
screenBuffer[7] = 0x22;
screenBuffer[8] = 0x80;
screenBuffer[9] = 0x00;
@@ -91,16 +91,42 @@ void OLED::refresh() {
}
void OLED::drawChar(char c) {
void OLED::drawChar(char c, char PrecursorCommand) {
//prints a char to the screen
if (c == '\n')
cursor_y += fontHeight;
if (c < ' ')
return;
//We are left with
uint8_t* charPointer;
c -= ' ';
//Fonts are offset to start at the space char.
charPointer = ((uint8_t*) currentFont) + ((fontWidth * (fontHeight / 8)) * c);
/*
* UTF font handling is done using the two input chars
* Precursor is the command char that is used to select the table
*
*/
uint16_t index = 0;
if (!PrecursorCommand)
index = (c - ' ');
else {
//This is for extended range
//We decode the precursor command to find the offset
//Latin stats at 96
c -= 0x80;
if (PrecursorCommand == 0xC3)
index = (96 + 32) + (c);
else if (PrecursorCommand == 0xC2)
index = (96) + (c);
else if (PrecursorCommand == 0xD0)
index = (208) + (c);
else if (PrecursorCommand == 0xD1)
index = (272) + (c);
else
return;
index -=0x10;//offset removal
}
charPointer = ((uint8_t*) currentFont) + ((fontWidth * (fontHeight / 8)) * index);
if (cursor_x >= 0)
drawArea(cursor_x, cursor_y, fontWidth, fontHeight, charPointer);
cursor_x += fontWidth;
@@ -137,7 +163,11 @@ void OLED::setRotation(bool leftHanded) {
//print a string to the current cursor location
void OLED::print(const char* str) {
while (str[0]) {
drawChar(str[0]);
if (str[0] >= 0x80) {
drawChar(str[1], str[0]);
str++; //skip this marker
} else
drawChar(str[0]);
str++;
}
}