From eb3bdb7550a77f2ae3f5892a35fbd2baae6d2a6d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 16 Nov 2017 17:46:08 -0600
Subject: [PATCH] Fix FILAMENT_LCD_DISPLAY, disabled state, optimize
---
Marlin/ultralcd_impl_DOGM.h | 16 +++++++++++-----
Marlin/ultralcd_impl_HD44780.h | 8 ++++++--
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index b742268aa24..d05fe9c68fc 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -648,9 +648,15 @@ static void lcd_implementation_status_screen() {
strcpy(xstring, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])));
strcpy(ystring, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])));
strcpy(zstring, ftostr52sp(FIXFLOAT(LOGICAL_Z_POSITION(current_position[Z_AXIS]))));
- #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
+ #if ENABLED(FILAMENT_LCD_DISPLAY)
strcpy(wstring, ftostr12ns(filament_width_meas));
- strcpy(mstring, itostr3(100.0 * planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
+ if (parser.volumetric_enabled)
+ strcpy(mstring, itostr3(100.0 * filament_width_meas / filament_width_nominal));
+ else
+ strcpy_P(mstring, PSTR("---"));
+ // Alternatively, show the ratio between cross-sectional areas:
+ //strcpy(mstring, itostr3(100.0 / CIRCLE_AREA(filament_width_nominal * 0.5)
+ // / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
#endif
}
@@ -706,7 +712,7 @@ static void lcd_implementation_status_screen() {
//
// Filament sensor display if SD is disabled
//
- #if DISABLED(SDSUPPORT) && ENABLED(FILAMENT_LCD_DISPLAY)
+ #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
u8g.setPrintPos(56, 50);
lcd_print(wstring);
u8g.setPrintPos(102, 50);
@@ -736,10 +742,10 @@ static void lcd_implementation_status_screen() {
else {
lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
u8g.print(':');
- lcd_print(ftostr12ns(filament_width_meas));
+ lcd_print(wstring);
lcd_printPGM(PSTR(" " LCD_STR_FILAM_MUL));
u8g.print(':');
- lcd_print(itostr3(100.0 * planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
+ lcd_print(mstring);
u8g.print('%');
}
#else
diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h
index 327d5997630..a4c6b18fbb2 100644
--- a/Marlin/ultralcd_impl_HD44780.h
+++ b/Marlin/ultralcd_impl_HD44780.h
@@ -857,8 +857,12 @@ static void lcd_implementation_status_screen() {
lcd_printPGM(PSTR("Dia "));
lcd.print(ftostr12ns(filament_width_meas));
lcd_printPGM(PSTR(" V"));
- lcd.print(itostr3(100.0 * planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
- lcd.write('%');
+ if (parser.volumetric_enabled) {
+ lcd.print(itostr3(100.0 * filament_width_meas / filament_width_nominal));
+ lcd.write('%');
+ }
+ else
+ lcd_printPGM(PSTR("--- "));
return;
}