josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize `lcd_print_custom()`

This commit is contained in:
Alex Voinea 2023-09-30 12:11:03 +02:00
parent e4ad14a9fb
commit 6703640c56
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Firmware/lcd.cpp
View File

@ -864,9 +864,11 @@ const CustomCharacter Font[] PROGMEM = {
// #define DEBUG_CUSTOM_CHARACTERS // #define DEBUG_CUSTOM_CHARACTERS
static void lcd_print_custom(uint8_t c) { static void lcd_print_custom(uint8_t c) {
uint8_t charToSend; uint8_t charToSend = pgm_read_byte(&Font[c - 0x80].alternate); // in case no empty slot is found, use the alternate character.
// check if we already have the character in the lcd memory int8_t slotToUse = -1;
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
// first check if we already have the character in the lcd memory
if ((lcd_custom_characters[i] & 0x7F) == (c & 0x7F)) { if ((lcd_custom_characters[i] & 0x7F) == (c & 0x7F)) {
lcd_custom_characters[i] = c; // mark the custom character as used lcd_custom_characters[i] = c; // mark the custom character as used
charToSend = i; // send the found custom character id charToSend = i; // send the found custom character id
@ -874,25 +876,29 @@ static void lcd_print_custom(uint8_t c) {
printf_P(PSTR("found char %02x at slot %u\n"), c, i); printf_P(PSTR("found char %02x at slot %u\n"), c, i);
#endif // DEBUG_CUSTOM_CHARACTERS #endif // DEBUG_CUSTOM_CHARACTERS
goto sendChar; goto sendChar;
} } else if (lcd_custom_characters[i] == 0x7F) { //found an empty slot. create a new custom character and send it
}
// in case no empty slot is found, use the alternate character.
charToSend = pgm_read_byte(&Font[c - 0x80].alternate);
// try to find a slot where it could be placed
for (uint8_t i = 0; i < 8; i++) {
if (lcd_custom_characters[i] == 0x7F) { //found an empty slot. create a new custom character and send it
lcd_createChar_P(i, &Font[c - 0x80]);
lcd_custom_characters[i] = c; // mark the custom character as used lcd_custom_characters[i] = c; // mark the custom character as used
#ifdef DEBUG_CUSTOM_CHARACTERS slotToUse = i;
printf_P(PSTR("created char %02x at slot %u\n"), c, i);
#endif // DEBUG_CUSTOM_CHARACTERS
charToSend = i; charToSend = i;
break; goto createChar;
} else if (!(lcd_custom_characters[i] & 0x80)) { // found potentially unused slot. Remember it in case it's needed
slotToUse = i;
} }
} }
// If this point was reached, then there is no empty slot available.
// If there exists any potentially unused slot, then use that one instead.
// Otherwise, use the alternate form of the character.
if (slotToUse < 0) {
goto sendChar;
}
createChar:
lcd_createChar_P(slotToUse, &Font[c - 0x80]);
#ifdef DEBUG_CUSTOM_CHARACTERS
printf_P(PSTR("created char %02x at slot %u\n"), c, slotToUse);
#endif // DEBUG_CUSTOM_CHARACTERS
sendChar: sendChar:
lcd_send(charToSend, HIGH); lcd_send(charToSend, HIGH);
lcd_ddram_address++; // no need for preventing ddram overflow lcd_ddram_address++; // no need for preventing ddram overflow