bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

String interpolation for 2-digit numbers (#18998)

Browse Source
This commit is contained in:
Scott Lahteine
2020-08-12 16:46:51 -05:00
committed by GitHub
parent ca4eaf92b4
commit ee28a10795
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/src/lcd/tft/tft_string.cpp
View File

@@ -86,33 +86,32 @@ void TFT_String::set() {
uint8_t read_byte(uint8_t *byte) { return *byte; }
void TFT_String::add(uint8_t *string, uint8_t index, uint8_t *itemString) {
uint8_t character;
void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
wchar_t wchar;
while (*string) {
string = get_utf8_value_cb(string, read_byte, &wchar);
if (wchar > 255)
wchar |= 0x0080;
character = (uint8_t) (wchar & 0x00FF);
if (wchar > 255) wchar |= 0x0080;
uint8_t ch = uint8_t(wchar & 0x00FF);
if (character == '=' || character == '~' || character == '*') {
if (ch == '=' || ch == '~' || ch == '*') {
if (index >= 0) {
if (character == '*')
add_character('E');
add_character(index + ((character == '=') ? '0' : LCD_FIRST_TOOL));
int8_t inum = index + ((ch == '=') ? 0 : LCD_FIRST_TOOL);
if (ch == '*') add_character('E');
if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
add_character('0' + inum);
}
else {
add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
}
continue;
}
else if (character == '$' && itemString) {
else if (ch == '$' && itemString) {
add(itemString);
continue;
}
add_character(character);
add_character(ch);
}
eol();
}