3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-31 14:12:52 +00:00
Code Issues Releases Wiki Activity

⚡️ Mixer label in PROGMEM

Browse source
This commit is contained in:
Scott Lahteine 2023-06-05 23:49:09 -05:00
parent 17cc5fa872
commit 4b8e4ef38e
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View file

@ -973,20 +973,20 @@ void MarlinUI::draw_status_screen() {
// Two-component mix / gradient instead of XY // Two-component mix / gradient instead of XY
char mixer_messages[12]; char mixer_messages[15];
const char *mix_label; PGM_P mix_label;
#if ENABLED(GRADIENT_MIX) #if ENABLED(GRADIENT_MIX)
if (mixer.gradient.enabled) { if (mixer.gradient.enabled) {
mixer.update_mix_from_gradient(); mixer.update_mix_from_gradient();
mix_label = "Gr"; mix_label = PSTR("Gr");
} }
else else
#endif #endif
{ {
mixer.update_mix_from_vtool(); 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(mixer_messages); lcd_put_u8str(mixer_messages);
#else // !HAS_DUAL_MIXING #else // !HAS_DUAL_MIXING

12
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View file

@ -866,23 +866,23 @@ void MarlinUI::draw_status_screen() {
// //
#if HOTENDS <= 1 || (HOTENDS <= 2 && !HAS_HEATED_BED) #if HOTENDS <= 1 || (HOTENDS <= 2 && !HAS_HEATED_BED)
#if DUAL_MIXING_EXTRUDER #if HAS_DUAL_MIXING
lcd_moveto(0, 4); lcd_moveto(0, 4);
// Two-component mix / gradient instead of XY // Two-component mix / gradient instead of XY
char mixer_messages[12]; char mixer_messages[15];
const char *mix_label; PGM_P mix_label;
#if ENABLED(GRADIENT_MIX) #if ENABLED(GRADIENT_MIX)
if (mixer.gradient.enabled) { if (mixer.gradient.enabled) {
mixer.update_mix_from_gradient(); mixer.update_mix_from_gradient();
mix_label = "Gr"; mix_label = PSTR("Gr");
} }
else else
#endif #endif
{ {
mixer.update_mix_from_vtool(); 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(mixer_messages); lcd_put_u8str(mixer_messages);
#endif #endif
#endif #endif