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

🩹 Fix displayed mix percentages

Browse source
This commit is contained in:
Scott Lahteine 2021-08-16 13:44:00 -05:00
parent 49f1cc8efe
commit c91f3a7884
3 changed files with 2 additions and 5 deletions
Marlin/src
feature
mixing.cppmixing.h
lcd/menu
menu_mixer.cpp

2
Marlin/src/feature/mixing.cpp
View file

@ -24,8 +24,6 @@
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
//#define MIXER_NORMALIZER_DEBUG
#include "mixing.h" #include "mixing.h"
Mixer mixer; Mixer mixer;

3
Marlin/src/feature/mixing.h
View file

@ -148,8 +148,7 @@ class Mixer {
static void update_mix_from_vtool(const uint8_t j=selected_vtool) { static void update_mix_from_vtool(const uint8_t j=selected_vtool) {
float ctot = 0; float ctot = 0;
MIXER_STEPPER_LOOP(i) ctot += color[j][i]; MIXER_STEPPER_LOOP(i) ctot += color[j][i];
//MIXER_STEPPER_LOOP(i) mix[i] = 100.0f * color[j][i] / ctot; MIXER_STEPPER_LOOP(i) mix[i] = mixer_perc_t(100.0f * color[j][i] / ctot + 0.5f);
MIXER_STEPPER_LOOP(i) mix[i] = mixer_perc_t(100.0f * color[j][i] / ctot);
#ifdef MIXER_NORMALIZER_DEBUG #ifdef MIXER_NORMALIZER_DEBUG
SERIAL_ECHOPGM("V-tool ", j, " [ "); SERIAL_ECHOPGM("V-tool ", j, " [ ");

2
Marlin/src/lcd/menu/menu_mixer.cpp
View file

@ -112,7 +112,7 @@ static uint8_t v_index;
#if HAS_DUAL_MIXING #if HAS_DUAL_MIXING
void _lcd_draw_mix(const uint8_t y) { void _lcd_draw_mix(const uint8_t y) {
char tmp[20]; // "100%_100%" char tmp[20]; // "100%_100%"
sprintf_P(tmp, PSTR("%3d%% %3d%%"), int(mixer.mix[0]), int(mixer.mix[1])); sprintf_P(tmp, PSTR("%3d%% %3d%% "), int(mixer.mix[0]), int(mixer.mix[1]));
SETCURSOR(2, y); lcd_put_u8str(GET_TEXT_F(MSG_MIX)); SETCURSOR(2, y); lcd_put_u8str(GET_TEXT_F(MSG_MIX));
SETCURSOR_RJ(10, y); lcd_put_u8str(tmp); SETCURSOR_RJ(10, y); lcd_put_u8str(tmp);
} }