bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Cleanups for leveling-related code

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-03 02:13:10 -05:00
parent cc2bc67440
commit 44fa7fb18c
9 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/feature/bedlevel/abl/abl.cpp
View File

@ -25,6 +25,7 @@
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#include "abl.h"
#include "../bedlevel.h"
#include "../../../module/motion.h"

36
Marlin/src/feature/bedlevel/abl/abl.h
View File

@ -21,27 +21,23 @@
*/
#pragma once
#include "../../../inc/MarlinConfig.h"
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
extern int bilinear_grid_spacing[2], bilinear_start[2];
extern float bilinear_grid_factor[2],
z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
float bilinear_z_offset(const float raw[XYZ]);
#include "../bedlevel.h"
void extrapolate_unprobed_bed_level();
void print_bilinear_leveling_grid();
void refresh_bed_level();
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
void print_bilinear_leveling_grid_virt();
void bed_level_virt_interpolate();
#endif
extern int bilinear_grid_spacing[2], bilinear_start[2];
extern float bilinear_grid_factor[2],
z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y];
float bilinear_z_offset(const float raw[XYZ]);
#if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
void bilinear_line_to_destination(const float fr_mm_s, uint16_t x_splits=0xFFFF, uint16_t y_splits=0xFFFF);
#endif
void extrapolate_unprobed_bed_level();
void print_bilinear_leveling_grid();
void refresh_bed_level();
#if ENABLED(ABL_BILINEAR_SUBDIVISION)
void print_bilinear_leveling_grid_virt();
void bed_level_virt_interpolate();
#endif
#if IS_CARTESIAN && DISABLED(SEGMENT_LEVELED_MOVES)
void bilinear_line_to_destination(const float fr_mm_s, uint16_t x_splits=0xFFFF, uint16_t y_splits=0xFFFF);
#endif
#endif // AUTO_BED_LEVELING_BILINEAR
#define Z_VALUES(X,Y) z_values[X][Y]

2
Marlin/src/feature/bedlevel/bedlevel.h
View File

@ -80,6 +80,6 @@ void reset_bed_level();
#include "mbl/mesh_bed_leveling.h"
#elif ENABLED(AUTO_BED_LEVELING_UBL)
#include "ubl/ubl.h"
#elif HAS_ABL
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
#include "abl/abl.h"
#endif

2
Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h
View File

@ -118,3 +118,5 @@ public:
};
extern mesh_bed_leveling mbl;
#define Z_VALUES(X,Y) mbl.z_values[X][Y]

2
Marlin/src/feature/bedlevel/ubl/ubl.h
View File

@ -370,3 +370,5 @@ class unified_bed_leveling {
}; // class unified_bed_leveling
extern unified_bed_leveling ubl;
#define Z_VALUES(X,Y) ubl.z_values[X][Y]