CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/config/examples/MakerParts/Configuration.h
View File

@ -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

4
Marlin/src/lcd/ultralcd.cpp
View File

@ -2559,11 +2559,9 @@ 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)
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])

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; 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