MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fewer includes of vector_3.h

Browse Source
This commit is contained in:
Scott Lahteine 2018-05-01 07:05:18 -05:00
parent 9312636ee4
commit d7b699ec34
6 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/core/serial.cpp
View File

@ -75,10 +75,4 @@ void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (c
print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]);
} }
#if HAS_ABL
void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz) {
print_xyz(prefix, suffix, xyz.x, xyz.y, xyz.z);
}
#endif
#endif #endif

7
Marlin/src/core/serial.h
View File

@ -25,10 +25,6 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_ABL && ENABLED(DEBUG_LEVELING_FEATURE)
#include "../libs/vector_3.h"
#endif
/** /**
* Define debug bit-masks * Define debug bit-masks
*/ */
@ -243,9 +239,6 @@ void serialprintPGM(const char* str);
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z); void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z);
void print_xyz(const char* prefix, const char* suffix, const float xyz[]); void print_xyz(const char* prefix, const char* suffix, const float xyz[]);
#if HAS_ABL
void print_xyz(const char* prefix, const char* suffix, const vector_3 &xyz);
#endif
#define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0) #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
#endif #endif

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View File

@ -1496,6 +1496,8 @@
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "../../../libs/vector_3.h"
void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) { void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X), constexpr int16_t x_min = max(MIN_PROBE_X, MESH_MIN_X),
x_max = min(MAX_PROBE_X, MESH_MAX_X), x_max = min(MAX_PROBE_X, MESH_MAX_X),

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

@ -44,6 +44,10 @@
#include "../../../libs/least_squares_fit.h" #include "../../../libs/least_squares_fit.h"
#endif #endif
#if ABL_PLANAR
#include "../../../libs/vector_3.h"
#endif
#if ABL_GRID #if ABL_GRID
#if ENABLED(PROBE_Y_FIRST) #if ENABLED(PROBE_Y_FIRST)
#define PR_OUTER_VAR xCount #define PR_OUTER_VAR xCount

2
Marlin/src/libs/vector_3.cpp
View File

@ -41,7 +41,7 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_ABL #if ABL_PLANAR || ENABLED(AUTO_BED_LEVELING_UBL)
#include "vector_3.h" #include "vector_3.h"

2
Marlin/src/module/planner.h
View File

@ -40,7 +40,7 @@
#include "delta.h" #include "delta.h"
#endif #endif
#if HAS_ABL #if ABL_PLANAR
#include "../libs/vector_3.h" #include "../libs/vector_3.h"
#endif #endif