Browse Source

Clean up trailing whitespace and tabs

Scott Lahteine 7 years ago
parent
commit
6b6630e11b

+ 1
- 1
Marlin/Conditionals_post.h View File

834
       #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
834
       #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
835
     #endif
835
     #endif
836
   #endif
836
   #endif
837
-    
837
+
838
   // Shorthand
838
   // Shorthand
839
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
839
   #define GRID_MAX_POINTS ((GRID_MAX_POINTS_X) * (GRID_MAX_POINTS_Y))
840
 
840
 

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration.h View File

922
   // at which point movement will be level to the machine's XY plane.
922
   // at which point movement will be level to the machine's XY plane.
923
   // The height can be set with M420 Z<height>
923
   // The height can be set with M420 Z<height>
924
   //#define ENABLE_LEVELING_FADE_HEIGHT
924
   //#define ENABLE_LEVELING_FADE_HEIGHT
925
-  
925
+
926
   // Set the boundaries for probing (where the probe can reach).
926
   // Set the boundaries for probing (where the probe can reach).
927
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
927
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
928
-         
928
+
929
 #endif
929
 #endif
930
 
930
 
931
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
931
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

920
   // at which point movement will be level to the machine's XY plane.
920
   // at which point movement will be level to the machine's XY plane.
921
   // The height can be set with M420 Z<height>
921
   // The height can be set with M420 Z<height>
922
   //#define ENABLE_LEVELING_FADE_HEIGHT
922
   //#define ENABLE_LEVELING_FADE_HEIGHT
923
-  
923
+
924
   // Set the boundaries for probing (where the probe can reach).
924
   // Set the boundaries for probing (where the probe can reach).
925
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
925
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
926
-         
926
+
927
 #endif
927
 #endif
928
 
928
 
929
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
929
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

926
   // at which point movement will be level to the machine's XY plane.
926
   // at which point movement will be level to the machine's XY plane.
927
   // The height can be set with M420 Z<height>
927
   // The height can be set with M420 Z<height>
928
   //#define ENABLE_LEVELING_FADE_HEIGHT
928
   //#define ENABLE_LEVELING_FADE_HEIGHT
929
-  
929
+
930
   // Set the boundaries for probing (where the probe can reach).
930
   // Set the boundaries for probing (where the probe can reach).
931
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
931
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
932
-         
932
+
933
 #endif
933
 #endif
934
 
934
 
935
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
935
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

989
   // at which point movement will be level to the machine's XY plane.
989
   // at which point movement will be level to the machine's XY plane.
990
   // The height can be set with M420 Z<height>
990
   // The height can be set with M420 Z<height>
991
   //#define ENABLE_LEVELING_FADE_HEIGHT
991
   //#define ENABLE_LEVELING_FADE_HEIGHT
992
-  
992
+
993
   // Set the boundaries for probing (where the probe can reach).
993
   // Set the boundaries for probing (where the probe can reach).
994
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
994
   #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
995
-         
995
+
996
 #endif
996
 #endif
997
 
997
 
998
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
998
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)

+ 8
- 18
Marlin/ubl_G29.cpp View File

322
 
322
 
323
     // Check for commands that require the printer to be homed.
323
     // Check for commands that require the printer to be homed.
324
     if (axis_unhomed_error()) {
324
     if (axis_unhomed_error()) {
325
-      if (code_seen('J')) 
325
+      if (code_seen('J'))
326
         home_all_axes();
326
         home_all_axes();
327
-      else
328
-        if (code_seen('P')) {
329
-          int p_val;
330
-	  if (code_has_value()) {
331
-            p_val = code_value_int();
332
-	    if ( p_val==1 || p_val==2 || p_val==4 )
333
-              home_all_axes();
334
-	  }
327
+      else if (code_seen('P')) {
328
+        if (code_has_value()) {
329
+          const int p_val = code_value_int();
330
+          if (p_val == 1 || p_val == 2 || p_val == 4)
331
+            home_all_axes();
335
         }
332
         }
333
+      }
336
     }
334
     }
337
 
335
 
338
     if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
336
     if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
1341
           // Also for round beds, there are grid points outside the bed that nozzle can't reach.
1339
           // Also for round beds, there are grid points outside the bed that nozzle can't reach.
1342
           // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
1340
           // Prune them from the list and ignore them till the next Phase (manual nozzle probing).
1343
 
1341
 
1344
-//        if ((probe_as_reference && position_is_reachable_by_probe_raw_xy(mx, my)) || position_is_reachable_raw_xy(mx, my))
1345
-//          continue;
1346
-//
1347
-//        THE ABOVE CODE IS NOT A REPLACEMENT FOR THE CODE BELOW!!!!!!!
1348
-//
1349
-          bool reachable = probe_as_reference ?
1350
-                             position_is_reachable_by_probe_raw_xy( mx, my ) :
1351
-                             position_is_reachable_raw_xy( mx, my );
1352
-          if ( ! reachable )
1342
+          if ( ! (probe_as_reference ? position_is_reachable_by_probe_raw_xy(mx, my) : position_is_reachable_raw_xy(mx, my)) )
1353
             continue;
1343
             continue;
1354
 
1344
 
1355
           // Reachable. Check if it's the closest location to the nozzle.
1345
           // Reachable. Check if it's the closest location to the nozzle.

+ 2
- 2
Marlin/ubl_motion.cpp View File

632
                     z_cxyd = z_cxy1 - z_cxy0;                 // z height difference along cx from y0 to y1
632
                     z_cxyd = z_cxy1 - z_cxy0;                 // z height difference along cx from y0 to y1
633
 
633
 
634
               float z_cxym = z_cxyd * (1.0 / (MESH_Y_DIST));  // z slope per y along cx from y0 to y1
634
               float z_cxym = z_cxyd * (1.0 / (MESH_Y_DIST));  // z slope per y along cx from y0 to y1
635
-        
635
+
636
         //    float z_cxcy = z_cxy0 + z_cxym * cy;            // interpolated mesh z height along cx at cy (do inside the segment loop)
636
         //    float z_cxcy = z_cxy0 + z_cxym * cy;            // interpolated mesh z height along cx at cy (do inside the segment loop)
637
 
637
 
638
         // As subsequent segments step through this cell, the z_cxy0 intercept will change
638
         // As subsequent segments step through this cell, the z_cxy0 intercept will change
649
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
649
           #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
650
             z_cxcy *= fade_scaling_factor;          // apply fade factor to interpolated mesh height
650
             z_cxcy *= fade_scaling_factor;          // apply fade factor to interpolated mesh height
651
           #endif
651
           #endif
652
-        
652
+
653
           z_cxcy += ubl.state.z_offset;             // add fixed mesh offset from G29 Z
653
           z_cxcy += ubl.state.z_offset;             // add fixed mesh offset from G29 Z
654
 
654
 
655
           if (--segments == 0) {                    // if this is last segment, use ltarget for exact
655
           if (--segments == 0) {                    // if this is last segment, use ltarget for exact

Loading…
Cancel
Save