Skip to content

Fix issue #2: UTF-8 Text Not Displaying Correctly #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TsybulkaM wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix issue #2: UTF-8 Text Not Displaying Correctly #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions eve.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,31 +1331,38 @@ void Cmd_Button(uint16_t x,
// ***************************************************
void Cmd_Text(uint16_t x, uint16_t y, uint16_t font, uint16_t options, const char *str)
{
uint16_t DataPtr, LoopCount, StrPtr;

uint16_t length = (uint16_t)strlen(str);
if (!length)
return;

uint32_t *data = (uint32_t *)calloc(
(length / 4) + 1, sizeof(uint32_t)); // Allocate memory for the string expansion
uint32_t *data = (uint32_t *)calloc((length / 4) + 1, sizeof(uint32_t));

StrPtr = 0;
for (DataPtr = 0; DataPtr < (length / 4); ++DataPtr, StrPtr = StrPtr + 4)
data[DataPtr] = (uint32_t)str[StrPtr + 3] << 24 | (uint32_t)str[StrPtr + 2] << 16 |
(uint32_t)str[StrPtr + 1] << 8 | (uint32_t)str[StrPtr];
uint16_t StrPtr = 0;
uint16_t DataPtr;

for (LoopCount = 0; LoopCount < (length % 4); ++LoopCount, ++StrPtr)
data[DataPtr] |= (uint32_t)str[StrPtr] << (LoopCount * 8);
for (DataPtr = 0; DataPtr < (length / 4); ++DataPtr, StrPtr += 4)
{
data[DataPtr] = (uint32_t)(uint8_t)str[StrPtr + 3] << 24 |
(uint32_t)(uint8_t)str[StrPtr + 2] << 16 |
(uint32_t)(uint8_t)str[StrPtr + 1] << 8 | (uint32_t)(uint8_t)str[StrPtr];
}

// Handle remaining bytes
for (uint16_t LoopCount = 0; LoopCount < (length % 4); ++LoopCount, ++StrPtr)
{
data[DataPtr] |= (uint32_t)(uint8_t)str[StrPtr] << (LoopCount * 8);
}

// Set up the command
// Send command
Send_CMD(CMD_TEXT);
Send_CMD(((uint32_t)y << 16) | x);
Send_CMD(((uint32_t)options << 16) | font);

// Send out the text
for (LoopCount = 0; LoopCount <= length / 4; LoopCount++)
Send_CMD(data[LoopCount]); // These text bytes get sucked up 4 at a time and fired at the FIFO
// Send text data
for (uint16_t LoopCount = 0; LoopCount <= length / 4; LoopCount++)
{
Send_CMD(data[LoopCount]);
}

free(data);
}
Expand Down
Loading