浏览代码

Clean up whitespace

Scott Lahteine 8 年前
父节点
当前提交
c2ea22da49

+ 7
- 7
Marlin/Marlin_main.cpp 查看文件

5107
      *      P4-P7  Probe all positions at different locations and average them.
5107
      *      P4-P7  Probe all positions at different locations and average them.
5108
      *
5108
      *
5109
      *   T   Don't calibrate tower angle corrections
5109
      *   T   Don't calibrate tower angle corrections
5110
-     *   
5110
+     *
5111
      *   Cn.nn Calibration precision; when omitted calibrates to maximum precision
5111
      *   Cn.nn Calibration precision; when omitted calibrates to maximum precision
5112
-     *   
5112
+     *
5113
      *   Vn  Verbose level:
5113
      *   Vn  Verbose level:
5114
      *
5114
      *
5115
      *      V0  Dry-run mode. Report settings and probe results. No calibration.
5115
      *      V0  Dry-run mode. Report settings and probe results. No calibration.
5229
       #endif
5229
       #endif
5230
 
5230
 
5231
       int8_t iterations = 0;
5231
       int8_t iterations = 0;
5232
-      
5232
+
5233
       home_offset[Z_AXIS] -= probe_pt(0.0, 0.0 , true, 1); // 1st probe to set height
5233
       home_offset[Z_AXIS] -= probe_pt(0.0, 0.0 , true, 1); // 1st probe to set height
5234
       do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
5234
       do_probe_raise(Z_CLEARANCE_BETWEEN_PROBES);
5235
 
5235
 
5239
         int16_t N = 0;
5239
         int16_t N = 0;
5240
 
5240
 
5241
         test_precision = zero_std_dev_old != 999.0 ? (zero_std_dev + zero_std_dev_old) / 2 : zero_std_dev;
5241
         test_precision = zero_std_dev_old != 999.0 ? (zero_std_dev + zero_std_dev_old) / 2 : zero_std_dev;
5242
-        
5242
+
5243
         iterations++;
5243
         iterations++;
5244
 
5244
 
5245
         // Probe the points
5245
         // Probe the points
5286
           }
5286
           }
5287
         zero_std_dev_old = zero_std_dev;
5287
         zero_std_dev_old = zero_std_dev;
5288
         zero_std_dev = round(sqrt(S2 / N) * 1000.0) / 1000.0 + 0.00001;
5288
         zero_std_dev = round(sqrt(S2 / N) * 1000.0) / 1000.0 + 0.00001;
5289
-        
5289
+
5290
         if (iterations == 1) home_offset[Z_AXIS] = zh_old; // reset height after 1st probe change
5290
         if (iterations == 1) home_offset[Z_AXIS] = zh_old; // reset height after 1st probe change
5291
 
5291
 
5292
         // Solve matrices
5292
         // Solve matrices
5416
             else {
5416
             else {
5417
               SERIAL_PROTOCOLPGM("std dev:");
5417
               SERIAL_PROTOCOLPGM("std dev:");
5418
               SERIAL_PROTOCOL_F(zero_std_dev, 3);
5418
               SERIAL_PROTOCOL_F(zero_std_dev, 3);
5419
-            }            
5419
+            }
5420
             SERIAL_EOL;
5420
             SERIAL_EOL;
5421
             LCD_MESSAGEPGM("Calibration OK"); // TODO: Make translatable string
5421
             LCD_MESSAGEPGM("Calibration OK"); // TODO: Make translatable string
5422
           }
5422
           }
5481
         home_delta();
5481
         home_delta();
5482
         endstops.not_homing();
5482
         endstops.not_homing();
5483
 
5483
 
5484
-      } 
5484
+      }
5485
       while (zero_std_dev < test_precision && zero_std_dev > calibration_precision && iterations < 31);
5485
       while (zero_std_dev < test_precision && zero_std_dev > calibration_precision && iterations < 31);
5486
 
5486
 
5487
       #if ENABLED(DELTA_HOME_TO_SAFE_ZONE)
5487
       #if ENABLED(DELTA_HOME_TO_SAFE_ZONE)

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h 查看文件

903
   #define UBL_PROBE_PT_3_Y 20
903
   #define UBL_PROBE_PT_3_Y 20
904
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
904
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
905
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
905
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
906
- 
906
+
907
 #elif ENABLED(MESH_BED_LEVELING)
907
 #elif ENABLED(MESH_BED_LEVELING)
908
 
908
 
909
   //===========================================================================
909
   //===========================================================================

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration.h 查看文件

907
   #define UBL_PROBE_PT_3_Y 20
907
   #define UBL_PROBE_PT_3_Y 20
908
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
908
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
909
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
909
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
910
- 
910
+
911
 #elif ENABLED(MESH_BED_LEVELING)
911
 #elif ENABLED(MESH_BED_LEVELING)
912
 
912
 
913
   //===========================================================================
913
   //===========================================================================

+ 1
- 1
Marlin/example_configurations/TinyBoy2/Configuration.h 查看文件

943
   #define UBL_PROBE_PT_3_Y 20
943
   #define UBL_PROBE_PT_3_Y 20
944
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
944
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
945
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
945
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
946
- 
946
+
947
 #elif ENABLED(MESH_BED_LEVELING)
947
 #elif ENABLED(MESH_BED_LEVELING)
948
 
948
 
949
   //===========================================================================
949
   //===========================================================================

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

878
   #define UBL_PROBE_PT_3_Y 20
878
   #define UBL_PROBE_PT_3_Y 20
879
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
879
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
880
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
880
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
881
- 
881
+
882
 #elif ENABLED(MESH_BED_LEVELING)
882
 #elif ENABLED(MESH_BED_LEVELING)
883
 
883
 
884
   //===========================================================================
884
   //===========================================================================

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

883
   #define UBL_PROBE_PT_3_Y 20
883
   #define UBL_PROBE_PT_3_Y 20
884
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
884
   #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
885
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
885
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
886
- 
886
+
887
 #elif ENABLED(MESH_BED_LEVELING)
887
 #elif ENABLED(MESH_BED_LEVELING)
888
 
888
 
889
   //===========================================================================
889
   //===========================================================================

+ 6
- 8
Marlin/ubl_G29.cpp 查看文件

36
 
36
 
37
   #define UBL_G29_P31
37
   #define UBL_G29_P31
38
 
38
 
39
-  extern float destination[XYZE];
40
-  extern float current_position[XYZE];
39
+  extern float destination[XYZE], current_position[XYZE];
41
 
40
 
42
   void lcd_return_to_status();
41
   void lcd_return_to_status();
43
   bool lcd_clicked();
42
   bool lcd_clicked();
63
 
62
 
64
   #define SIZE_OF_LITTLE_RAISE 1
63
   #define SIZE_OF_LITTLE_RAISE 1
65
   #define BIG_RAISE_NOT_NEEDED 0
64
   #define BIG_RAISE_NOT_NEEDED 0
65
+
66
   extern void lcd_status_screen();
66
   extern void lcd_status_screen();
67
   typedef void (*screenFunc_t)();
67
   typedef void (*screenFunc_t)();
68
   extern void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0);
68
   extern void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0);
936
     return current_position[Z_AXIS];
936
     return current_position[Z_AXIS];
937
   }
937
   }
938
 
938
 
939
-  static void echo_and_take_a_measurement() {
940
-    SERIAL_PROTOCOLLNPGM(" and take a measurement.");
941
-  }
939
+  static void echo_and_take_a_measurement() { SERIAL_PROTOCOLLNPGM(" and take a measurement."); }
942
 
940
 
943
   float measure_business_card_thickness(float &in_height) {
941
   float measure_business_card_thickness(float &in_height) {
944
     ubl.has_control_of_lcd_panel = true;
942
     ubl.has_control_of_lcd_panel = true;
1392
             for (uint8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
1390
             for (uint8_t k = 0; k < GRID_MAX_POINTS_X; k++) {
1393
               for (uint8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
1391
               for (uint8_t l = 0; l < GRID_MAX_POINTS_Y; l++) {
1394
                 if (i != k && j != l && !isnan(ubl.z_values[k][l])) {
1392
                 if (i != k && j != l && !isnan(ubl.z_values[k][l])) {
1395
-//                distance += pow((float) abs(i - k) * (MESH_X_DIST), 2) + pow((float) abs(j - l) * (MESH_Y_DIST), 2);  // working here
1396
-                  distance += HYPOT((MESH_X_DIST),(MESH_Y_DIST)) / log(HYPOT((i - k) * (MESH_X_DIST)+.001, (j - l) * (MESH_Y_DIST))+.001);
1393
+                  //distance += pow((float) abs(i - k) * (MESH_X_DIST), 2) + pow((float) abs(j - l) * (MESH_Y_DIST), 2);  // working here
1394
+                  distance += HYPOT(MESH_X_DIST, MESH_Y_DIST) / log(HYPOT((i - k) * (MESH_X_DIST) + .001, (j - l) * (MESH_Y_DIST)) + .001);
1397
                 }
1395
                 }
1398
               }
1396
               }
1399
             }
1397
             }
1474
       do {
1472
       do {
1475
         new_z = lcd_mesh_edit();
1473
         new_z = lcd_mesh_edit();
1476
         #ifdef UBL_MESH_EDIT_MOVES_Z
1474
         #ifdef UBL_MESH_EDIT_MOVES_Z
1477
-          do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES+new_z);  // Move the nozzle as the point is edited
1475
+          do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES + new_z);  // Move the nozzle as the point is edited
1478
         #endif
1476
         #endif
1479
         idle();
1477
         idle();
1480
       } while (!ubl_lcd_clicked());
1478
       } while (!ubl_lcd_clicked());

正在加载...
取消
保存