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

Comment, fix filament width sensor

Browse Source
This commit is contained in:
Scott Lahteine committed 2017-12-13 02:32:34 -06:00
1 parent a641992c1d
commit cf2193c07f
8 files changed
+69 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Marlin/src/lcd/ultralcd_impl_DOGM.h
+6 -4
View File
@@ -660,10 +660,12 @@ static void lcd_implementation_status_screen() {
strcpy(zstring, ftostr52sp(FIXFLOAT(LOGICAL_Z_POSITION(current_position[Z_AXIS]))));
#if ENABLED(FILAMENT_LCD_DISPLAY)
strcpy(wstring, ftostr12ns(filament_width_meas));
if (parser.volumetric_enabled)
strcpy(mstring, itostr3(100.0 * planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
else
strcpy_P(mstring, PSTR("---"));
strcpy(mstring, itostr3(100.0 * (
parser.volumetric_enabled
? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
: planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
)
));
#endif
}
Marlin/src/lcd/ultralcd_impl_HD44780.h
+7 -6
View File
@@ -884,12 +884,13 @@ static void lcd_implementation_status_screen() {
lcd_printPGM(PSTR("Dia "));
lcd.print(ftostr12ns(filament_width_meas));
lcd_printPGM(PSTR(" V"));
if (parser.volumetric_enabled) {
lcd.print(itostr3(100.0 * planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
lcd.write('%');
}
else
lcd_printPGM(PSTR("--- "));
lcd.print(itostr3(100.0 * (
parser.volumetric_enabled
? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
: planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
)
));
lcd.write('%');
return;
}