0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4851 from thinkyhead/rc_linear_grid

Browse source 
Patch G29 for 3-point leveling
This commit is contained in:
Scott Lahteine 2016-09-20 11:29:59 -05:00 committed by GitHub
parent ff38a3c3b1 e9ce42353e
commit e87ad155cc
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/Conditionals_post.h
View file

@ -676,6 +676,7 @@
#define AUTO_BED_LEVELING_NONLINEAR #define AUTO_BED_LEVELING_NONLINEAR
#else #else
#define AUTO_BED_LEVELING_LINEAR #define AUTO_BED_LEVELING_LINEAR
#define AUTO_BED_LEVELING_LINEAR_GRID
#endif #endif
#endif #endif

16
Marlin/Marlin_main.cpp
View file

@ -38,7 +38,7 @@
#include "vector_3.h" #include "vector_3.h"
#endif #endif
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR_GRID)
#include "qr_solve.h" #include "qr_solve.h"
#elif ENABLED(MESH_BED_LEVELING) #elif ENABLED(MESH_BED_LEVELING)
#include "mesh_bed_leveling.h" #include "mesh_bed_leveling.h"
@ -3453,7 +3453,7 @@ inline void gcode_G28() {
float zoffset = zprobe_zoffset; float zoffset = zprobe_zoffset;
if (code_seen('Z')) zoffset += code_value_axis_units(Z_AXIS); if (code_seen('Z')) zoffset += code_value_axis_units(Z_AXIS);
#elif ENABLED(AUTO_BED_LEVELING_LINEAR) #elif ENABLED(AUTO_BED_LEVELING_LINEAR_GRID)
/** /**
* solve the plane equation ax + by + d = z * solve the plane equation ax + by + d = z
@ -3471,7 +3471,7 @@ inline void gcode_G28() {
mean = 0.0; mean = 0.0;
int indexIntoAB[abl_grid_points_x][abl_grid_points_y]; int indexIntoAB[abl_grid_points_x][abl_grid_points_y];
#endif // AUTO_BED_LEVELING_LINEAR #endif // AUTO_BED_LEVELING_LINEAR_GRID
int probePointCounter = 0; int probePointCounter = 0;
bool zig = abl_grid_points_y & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION] bool zig = abl_grid_points_y & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
@ -3506,7 +3506,7 @@ inline void gcode_G28() {
measured_z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level); measured_z = probe_pt(xProbe, yProbe, stow_probe_after_each, verbose_level);
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR_GRID)
mean += measured_z; mean += measured_z;
eqnBVector[probePointCounter] = measured_z; eqnBVector[probePointCounter] = measured_z;
@ -3576,7 +3576,7 @@ inline void gcode_G28() {
if (!dryrun) extrapolate_unprobed_bed_level(); if (!dryrun) extrapolate_unprobed_bed_level();
print_bed_level(); print_bed_level();
#elif ENABLED(AUTO_BED_LEVELING_LINEAR) #elif ENABLED(AUTO_BED_LEVELING_LINEAR_GRID)
// For LINEAR leveling calculate matrix, print reports, correct the position // For LINEAR leveling calculate matrix, print reports, correct the position
@ -3673,6 +3673,10 @@ inline void gcode_G28() {
} }
} //do_topography_map } //do_topography_map
#endif // AUTO_BED_LEVELING_LINEAR_GRID
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
// For LINEAR and 3POINT leveling correct the current position // For LINEAR and 3POINT leveling correct the current position
if (verbose_level > 0) if (verbose_level > 0)
@ -6759,7 +6763,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
float xydiff[2] = { offset_vec.x, offset_vec.y }; float xydiff[2] = { offset_vec.x, offset_vec.y };
current_position[Z_AXIS] += offset_vec.z; current_position[Z_AXIS] += offset_vec.z;
#else // !AUTO_BED_LEVELING_FEATURE #else // !AUTO_BED_LEVELING_LINEAR
float xydiff[2] = { float xydiff[2] = {
hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder], hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder],

2
Marlin/qr_solve.cpp
View file

@ -22,7 +22,7 @@
#include "qr_solve.h" #include "qr_solve.h"
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR_GRID)
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>