sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move volumetric flag to GCodeParser

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-16 11:41:12 -05:00
parent bf7af95db3
commit 63228fc453
7 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/Marlin.cpp
View File

@@ -169,7 +169,6 @@ static float saved_feedrate_mm_s;
int16_t feedrate_percentage = 100, saved_feedrate_percentage;
// Initialized by settings.load()
bool volumetric_enabled;
float filament_size[EXTRUDERS], volumetric_multiplier[EXTRUDERS];
#if HAS_WORKSPACE_OFFSET
@@ -3295,7 +3294,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
#endif // FILAMENT_RUNOUT_SENSOR
float calculate_volumetric_multiplier(const float diameter) {
if (!volumetric_enabled || diameter == 0) return 1.0;
if (!parser.volumetric_enabled || diameter == 0) return 1.0;
return 1.0 / (M_PI * sq(diameter * 0.5));
}