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

🎨 Axis name string interpolation, with examples (#22879)

Browse Source
This commit is contained in:
Scott Lahteine
2021-10-04 00:24:41 -05:00
parent 854ce63358
commit 1de265ea5d
26 changed files with 100 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,11 +89,13 @@ uint8_t read_byte(uint8_t *byte) { return *byte; }
/**
* Add a string, applying substitutions for the following characters:
*
* $ displays an inserted C-string given by the itemString parameter
* = displays '0'....'10' for indexes 0 - 10
* ~ displays '1'....'11' for indexes 0 - 10
* * displays 'E1'...'E11' for indexes 0 - 10 (By default. Uses LCD_FIRST_TOOL)
* @ displays an axis name such as XYZUVW, or E for an extruder
*/
void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString/*=nullptr*/) {
wchar_t wchar;
while (*string) {
@ -108,17 +110,15 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
if (inum >= 10) { add_character('0' + (inum / 10)); inum %= 10; }
add_character('0' + inum);
}
else {
else
add(index == -2 ? GET_TEXT(MSG_CHAMBER) : GET_TEXT(MSG_BED));
}
continue;
}
else if (ch == '$' && itemString) {
else if (ch == '$' && itemString)
add(itemString);
continue;
}
add_character(ch);
else if (ch == '@')
add_character(axis_codes[index]);
else
add_character(ch);
}
eol();
}
@ -150,9 +150,8 @@ void TFT_String::rtrim(uint8_t character) {
span -= glyph(data[length])->DWidth;
eol();
}
else {
else
break;
}
}
}