ソースを参照

Clean up trailing whitespace and tabs

Scott Lahteine 7年前
コミット
6b6630e11b

+ 1
- 1
Marlin/Conditionals_post.h ファイルの表示

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

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration.h ファイルの表示

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h ファイルの表示

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h ファイルの表示

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

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h ファイルの表示

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

+ 8
- 18
Marlin/ubl_G29.cpp ファイルの表示

@@ -322,17 +322,15 @@
322 322
 
323 323
     // Check for commands that require the printer to be homed.
324 324
     if (axis_unhomed_error()) {
325
-      if (code_seen('J')) 
325
+      if (code_seen('J'))
326 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 336
     if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
@@ -1341,15 +1339,7 @@
1341 1339
           // Also for round beds, there are grid points outside the bed that nozzle can't reach.
1342 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 1343
             continue;
1354 1344
 
1355 1345
           // Reachable. Check if it's the closest location to the nozzle.

+ 2
- 2
Marlin/ubl_motion.cpp ファイルの表示

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

読み込み中…
キャンセル
保存