Browse Source

Remove G33 trailing whitespace

Scott Lahteine 7 years ago
parent
commit
343dd1c0b8
1 changed files with 9 additions and 9 deletions
  1. 9
    9
      Marlin/Marlin_main.cpp

+ 9
- 9
Marlin/Marlin_main.cpp View File

5387
       __C      = _BC + _7P_STEP,
5387
       __C      = _BC + _7P_STEP,
5388
       _CA      = __C + _7P_STEP,
5388
       _CA      = __C + _7P_STEP,
5389
     };
5389
     };
5390
-    
5391
-    #define LOOP_CAL_PT(VAR, S, N) for (uint8_t VAR=S; VAR<=NPP; VAR+=N) 
5392
-    #define F_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR<NPP+0.9999; VAR+=N) 
5390
+
5391
+    #define LOOP_CAL_PT(VAR, S, N) for (uint8_t VAR=S; VAR<=NPP; VAR+=N)
5392
+    #define F_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR<NPP+0.9999; VAR+=N)
5393
     #define I_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR>CEN+0.9999; VAR-=N)
5393
     #define I_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR>CEN+0.9999; VAR-=N)
5394
     #define LOOP_CAL_ALL(VAR) LOOP_CAL_PT(VAR, CEN, 1)
5394
     #define LOOP_CAL_ALL(VAR) LOOP_CAL_PT(VAR, CEN, 1)
5395
     #define LOOP_CAL_RAD(VAR) LOOP_CAL_PT(VAR, __A, _7P_STEP)
5395
     #define LOOP_CAL_RAD(VAR) LOOP_CAL_PT(VAR, __A, _7P_STEP)
5494
       #endif
5494
       #endif
5495
 
5495
 
5496
           LOOP_CAL_ALL(axis) z_at_pt[axis] = 0.0;
5496
           LOOP_CAL_ALL(axis) z_at_pt[axis] = 0.0;
5497
-    
5497
+
5498
       if (!_0p_calibration) {
5498
       if (!_0p_calibration) {
5499
-    
5499
+
5500
         if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
5500
         if (!_7p_no_intermediates && !_7p_4_intermediates && !_7p_11_intermediates) { // probe the center
5501
           #if ENABLED(PROBE_MANUALLY)
5501
           #if ENABLED(PROBE_MANUALLY)
5502
             z_at_pt[CEN] += lcd_probe_pt(0, 0);
5502
             z_at_pt[CEN] += lcd_probe_pt(0, 0);
5527
                                  _7p_8_intermediates  ? _7P_STEP /  9.0 : //  9r * 6 + 10c = 64
5527
                                  _7p_8_intermediates  ? _7P_STEP /  9.0 : //  9r * 6 + 10c = 64
5528
                                  _7p_6_intermediates  ? _7P_STEP /  7.0 : //  7r * 6 +  7c = 49
5528
                                  _7p_6_intermediates  ? _7P_STEP /  7.0 : //  7r * 6 +  7c = 49
5529
                                  _7p_4_intermediates  ? _7P_STEP /  5.0 : //  5r * 6 +  6c = 36
5529
                                  _7p_4_intermediates  ? _7P_STEP /  5.0 : //  5r * 6 +  6c = 36
5530
-                                 _7p_2_intermediates  ? _7P_STEP /  3.0 : //  3r * 6 +  7c = 25 
5531
-                                 _7p_1_intermediates  ? _7P_STEP /  2.0 : //  2r * 6 +  4c = 16 
5530
+                                 _7p_2_intermediates  ? _7P_STEP /  3.0 : //  3r * 6 +  7c = 25
5531
+                                 _7p_1_intermediates  ? _7P_STEP /  2.0 : //  2r * 6 +  4c = 16
5532
                                  _7p_no_intermediates ? _7P_STEP :        //  1r * 6 +  3c = 9
5532
                                  _7p_no_intermediates ? _7P_STEP :        //  1r * 6 +  3c = 9
5533
                                  _4P_STEP;                                // .5r * 6 +  1c = 4
5533
                                  _4P_STEP;                                // .5r * 6 +  1c = 4
5534
           bool zig_zag = true;
5534
           bool zig_zag = true;
5576
           return round(SQRT(S2 / N) * 1000.0) / 1000.0 + 0.00001;
5576
           return round(SQRT(S2 / N) * 1000.0) / 1000.0 + 0.00001;
5577
         }
5577
         }
5578
       }
5578
       }
5579
-    
5579
+
5580
       return 0.00001;
5580
       return 0.00001;
5581
     }
5581
     }
5582
 
5582
 
5586
         float z_at_pt[NPP + 1]      = { 0.0 },
5586
         float z_at_pt[NPP + 1]      = { 0.0 },
5587
               z_at_pt_base[NPP + 1] = { 0.0 },
5587
               z_at_pt_base[NPP + 1] = { 0.0 },
5588
               z_temp, h_fac = 0.0, r_fac = 0.0, a_fac = 0.0, norm = 0.8;
5588
               z_temp, h_fac = 0.0, r_fac = 0.0, a_fac = 0.0, norm = 0.8;
5589
-    
5589
+
5590
         #define ZP(N,I) ((N) * z_at_pt[I])
5590
         #define ZP(N,I) ((N) * z_at_pt[I])
5591
         #define Z06(I)  ZP(6, I)
5591
         #define Z06(I)  ZP(6, I)
5592
         #define Z03(I)  ZP(3, I)
5592
         #define Z03(I)  ZP(3, I)

Loading…
Cancel
Save