Browse Source

Fewer includes of vector_3.h

Scott Lahteine 7 years ago
parent
commit
d7b699ec34

+ 0
- 6
Marlin/src/core/serial.cpp View File

75
     print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]);
75
     print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]);
76
   }
76
   }
77
 
77
 
78
-  #if HAS_ABL
79
-    void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz) {
80
-      print_xyz(prefix, suffix, xyz.x, xyz.y, xyz.z);
81
-    }
82
-  #endif
83
-
84
 #endif
78
 #endif

+ 0
- 7
Marlin/src/core/serial.h View File

25
 
25
 
26
 #include "../inc/MarlinConfig.h"
26
 #include "../inc/MarlinConfig.h"
27
 
27
 
28
-#if HAS_ABL && ENABLED(DEBUG_LEVELING_FEATURE)
29
-  #include "../libs/vector_3.h"
30
-#endif
31
-
32
 /**
28
 /**
33
  * Define debug bit-masks
29
  * Define debug bit-masks
34
  */
30
  */
243
 #if ENABLED(DEBUG_LEVELING_FEATURE)
239
 #if ENABLED(DEBUG_LEVELING_FEATURE)
244
   void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z);
240
   void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z);
245
   void print_xyz(const char* prefix, const char* suffix, const float xyz[]);
241
   void print_xyz(const char* prefix, const char* suffix, const float xyz[]);
246
-  #if HAS_ABL
247
-    void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz);
248
-  #endif
249
   #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
242
   #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
250
 #endif
243
 #endif
251
 
244
 

+ 3
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

41
   #include "../../../feature/bedlevel/bedlevel.h"
41
   #include "../../../feature/bedlevel/bedlevel.h"
42
   #include "../../../libs/least_squares_fit.h"
42
   #include "../../../libs/least_squares_fit.h"
43
 
43
 
44
-#include "../../../feature/Max7219_Debug_LEDs.h"
44
+  #include "../../../feature/Max7219_Debug_LEDs.h"
45
 
45
 
46
   #include <math.h>
46
   #include <math.h>
47
 
47
 
1496
 
1496
 
1497
   #if HAS_BED_PROBE
1497
   #if HAS_BED_PROBE
1498
 
1498
 
1499
+    #include "../../../libs/vector_3.h"
1500
+
1499
     void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
1501
     void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
1500
       constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X),
1502
       constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X),
1501
                         x_max = min(MAX_PROBE_X, MESH_MAX_X),
1503
                         x_max = min(MAX_PROBE_X, MESH_MAX_X),

+ 4
- 0
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

44
   #include "../../../libs/least_squares_fit.h"
44
   #include "../../../libs/least_squares_fit.h"
45
 #endif
45
 #endif
46
 
46
 
47
+#if ABL_PLANAR
48
+  #include "../../../libs/vector_3.h"
49
+#endif
50
+
47
 #if ABL_GRID
51
 #if ABL_GRID
48
   #if ENABLED(PROBE_Y_FIRST)
52
   #if ENABLED(PROBE_Y_FIRST)
49
     #define PR_OUTER_VAR xCount
53
     #define PR_OUTER_VAR xCount

+ 1
- 1
Marlin/src/libs/vector_3.cpp View File

41
 
41
 
42
 #include "../inc/MarlinConfig.h"
42
 #include "../inc/MarlinConfig.h"
43
 
43
 
44
-#if HAS_ABL
44
+#if ABL_PLANAR || ENABLED(AUTO_BED_LEVELING_UBL)
45
 
45
 
46
 #include "vector_3.h"
46
 #include "vector_3.h"
47
 
47
 

+ 1
- 1
Marlin/src/module/planner.h View File

40
   #include "delta.h"
40
   #include "delta.h"
41
 #endif
41
 #endif
42
 
42
 
43
-#if HAS_ABL
43
+#if ABL_PLANAR
44
   #include "../libs/vector_3.h"
44
   #include "../libs/vector_3.h"
45
 #endif
45
 #endif
46
 
46
 

Loading…
Cancel
Save