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

More parity with 1.1.x, plus whitespace

Browse Source
This commit is contained in:
Scott Lahteine
2017-12-19 18:36:16 -06:00
parent a891d8d738
commit de5ca96654
8 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/planner.cpp
View File

@ -1100,7 +1100,7 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed
LOOP_XYZE(i) {
const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs));
if (cs > max_jerk[i])
if (cs > max_jerk[i])
NOMORE(min_axis_accel_ratio, max_jerk[i] / cs);
NOLESS(max_stepper_speed, cs);
#if ENABLED(DISTINCT_E_FACTORS)

2
Marlin/src/module/temperature.cpp
View File

@ -803,7 +803,7 @@ void Temperature::manage_heater() {
meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
if (meas_shift_index < 0) meas_shift_index += MAX_MEASUREMENT_DELAY + 1; //loop around buffer if needed
meas_shift_index = constrain(meas_shift_index, 0, MAX_MEASUREMENT_DELAY);
calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index])
planner.calculate_volumetric_for_width_sensor(measurement_delay[meas_shift_index]);
}
#endif // FILAMENT_WIDTH_SENSOR