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

Move S_FMT to HAL, apply to mixer

Browse Source
This commit is contained in:
Scott Lahteine
2020-05-05 17:55:35 -05:00
parent 7a2cc782b4
commit 39f703310b
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/dogm/status_screen_DOGM.cpp
View File

@ -695,19 +695,19 @@ void MarlinUI::draw_status_screen() {
// Two-component mix / gradient instead of XY
char mixer_messages[12];
const char *mix_label;
PGM_P mix_label;
#if ENABLED(GRADIENT_MIX)
if (mixer.gradient.enabled) {
mixer.update_mix_from_gradient();
mix_label = "Gr";
mix_label = PSTR("Gr");
}
else
#endif
{
mixer.update_mix_from_vtool();
mix_label = "Mx";
mix_label = PSTR("Mx");
}
sprintf_P(mixer_messages, PSTR("%s %d;%d%% "), mix_label, int(mixer.mix[0]), int(mixer.mix[1]));
sprintf_P(mixer_messages, PSTR(S_FMT " %d;%d%% "), mix_label, int(mixer.mix[0]), int(mixer.mix[1]));
lcd_put_u8str(X_LABEL_POS, XYZ_BASELINE, mixer_messages);
#else