More parity with 1.1.x, plus whitespace
This commit is contained in:
parent
a891d8d738
commit
de5ca96654
8 changed files with 13 additions and 15 deletions
|
@ -548,14 +548,14 @@
|
||||||
* Override with M92
|
* Override with M92
|
||||||
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,4000,97} //motor bajos con varilla3200 y altos 1600 default steps per unit for Ultimaker
|
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 97 }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Max Feed Rate (mm/s)
|
* Default Max Feed Rate (mm/s)
|
||||||
* Override with M203
|
* Override with M203
|
||||||
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
* X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_MAX_FEEDRATE { 300, 300, 2, 30 } /* For 300mm/s printing */
|
#define DEFAULT_MAX_FEEDRATE { 300, 300, 2, 30 } // For 300mm/s printing
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default Max Acceleration (change/s) change = mm/s
|
* Default Max Acceleration (change/s) change = mm/s
|
||||||
|
|
|
@ -2559,10 +2559,8 @@ void kill_screen(const char* lcd_msg) {
|
||||||
lcd_bed_leveling
|
lcd_bed_leveling
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
#else
|
#elif PLANNER_LEVELING && DISABLED(PROBE_MANUALLY)
|
||||||
#if PLANNER_LEVELING
|
MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
||||||
MENU_ITEM(gcode, MSG_BED_LEVELING, PSTR("G28\nG29"));
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
|
#if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
|
||||||
|
|
|
@ -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
|
float max_stepper_speed = 0, min_axis_accel_ratio = 1; // ratio < 1 means acceleration ramp needed
|
||||||
LOOP_XYZE(i) {
|
LOOP_XYZE(i) {
|
||||||
const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_secs));
|
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);
|
NOMORE(min_axis_accel_ratio, max_jerk[i] / cs);
|
||||||
NOLESS(max_stepper_speed, cs);
|
NOLESS(max_stepper_speed, cs);
|
||||||
#if ENABLED(DISTINCT_E_FACTORS)
|
#if ENABLED(DISTINCT_E_FACTORS)
|
||||||
|
|
|
@ -803,7 +803,7 @@ void Temperature::manage_heater() {
|
||||||
meas_shift_index = filwidth_delay_index[0] - meas_delay_cm;
|
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
|
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);
|
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
|
#endif // FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue