Browse Source

General cleanup of spacing, comments

Scott Lahteine 7 years ago
parent
commit
50ab9c2e04
2 changed files with 11 additions and 11 deletions
  1. 2
    2
      Marlin/Marlin.h
  2. 9
    9
      Marlin/Marlin_main.cpp

+ 2
- 2
Marlin/Marlin.h View File

217
 extern int flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
217
 extern int flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
218
 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.
218
 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.
219
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
219
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
220
-extern bool axis_known_position[XYZ]; // axis[n].is_known
221
-extern bool axis_homed[XYZ]; // axis[n].is_homed
220
+extern bool axis_known_position[XYZ];
221
+extern bool axis_homed[XYZ];
222
 extern volatile bool wait_for_heatup;
222
 extern volatile bool wait_for_heatup;
223
 
223
 
224
 #if HAS_RESUME_CONTINUE
224
 #if HAS_RESUME_CONTINUE

+ 9
- 9
Marlin/Marlin_main.cpp View File

1743
 #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)
1743
 #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)
1744
 
1744
 
1745
   bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
1745
   bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) {
1746
-#if ENABLED(HOME_AFTER_DEACTIVATE)
1747
-    const bool xx = x && !axis_known_position[X_AXIS],
1748
-               yy = y && !axis_known_position[Y_AXIS],
1749
-               zz = z && !axis_known_position[Z_AXIS];
1750
-#else
1751
-    const bool xx = x && !axis_homed[X_AXIS],
1752
-               yy = y && !axis_homed[Y_AXIS],
1753
-               zz = z && !axis_homed[Z_AXIS];
1754
-#endif
1746
+    #if ENABLED(HOME_AFTER_DEACTIVATE)
1747
+      const bool xx = x && !axis_known_position[X_AXIS],
1748
+                 yy = y && !axis_known_position[Y_AXIS],
1749
+                 zz = z && !axis_known_position[Z_AXIS];
1750
+    #else
1751
+      const bool xx = x && !axis_homed[X_AXIS],
1752
+                 yy = y && !axis_homed[Y_AXIS],
1753
+                 zz = z && !axis_homed[Z_AXIS];
1754
+    #endif
1755
     if (xx || yy || zz) {
1755
     if (xx || yy || zz) {
1756
       SERIAL_ECHO_START;
1756
       SERIAL_ECHO_START;
1757
       SERIAL_ECHOPGM(MSG_HOME " ");
1757
       SERIAL_ECHOPGM(MSG_HOME " ");

Loading…
Cancel
Save