General cleanup of spacing, comments
This commit is contained in:
parent
f1e33afda4
commit
50ab9c2e04
@ -217,8 +217,8 @@ extern bool volumetric_enabled;
|
|||||||
extern int flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
|
extern int flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
|
||||||
extern float filament_size[EXTRUDERS]; // cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder.
|
extern float filament_size[EXTRUDERS]; // cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder.
|
||||||
extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
|
extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
|
||||||
extern bool axis_known_position[XYZ]; // axis[n].is_known
|
extern bool axis_known_position[XYZ];
|
||||||
extern bool axis_homed[XYZ]; // axis[n].is_homed
|
extern bool axis_homed[XYZ];
|
||||||
extern volatile bool wait_for_heatup;
|
extern volatile bool wait_for_heatup;
|
||||||
|
|
||||||
#if HAS_RESUME_CONTINUE
|
#if HAS_RESUME_CONTINUE
|
||||||
|
@ -1743,15 +1743,15 @@ static void clean_up_after_endstop_or_probe_move() {
|
|||||||
#if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
|
#if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
|
||||||
|
|
||||||
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
|
bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
|
||||||
#if ENABLED(HOME_AFTER_DEACTIVATE)
|
#if ENABLED(HOME_AFTER_DEACTIVATE)
|
||||||
const bool xx = x && !axis_known_position[X_AXIS],
|
const bool xx = x && !axis_known_position[X_AXIS],
|
||||||
yy = y && !axis_known_position[Y_AXIS],
|
yy = y && !axis_known_position[Y_AXIS],
|
||||||
zz = z && !axis_known_position[Z_AXIS];
|
zz = z && !axis_known_position[Z_AXIS];
|
||||||
#else
|
#else
|
||||||
const bool xx = x && !axis_homed[X_AXIS],
|
const bool xx = x && !axis_homed[X_AXIS],
|
||||||
yy = y && !axis_homed[Y_AXIS],
|
yy = y && !axis_homed[Y_AXIS],
|
||||||
zz = z && !axis_homed[Z_AXIS];
|
zz = z && !axis_homed[Z_AXIS];
|
||||||
#endif
|
#endif
|
||||||
if (xx || yy || zz) {
|
if (xx || yy || zz) {
|
||||||
SERIAL_ECHO_START;
|
SERIAL_ECHO_START;
|
||||||
SERIAL_ECHOPGM(MSG_HOME " ");
|
SERIAL_ECHOPGM(MSG_HOME " ");
|
||||||
|
Loading…
Reference in New Issue
Block a user