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

bed_level => bed_level_grid

Browse Source
This commit is contained in:
Scott Lahteine 2016-09-11 21:46:27 -05:00
parent 82be65065c
commit a9ed23225f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/Marlin_main.cpp
View File

@ -495,7 +495,7 @@ static uint8_t target_extruder;
#if ENABLED(AUTO_BED_LEVELING_NONLINEAR) #if ENABLED(AUTO_BED_LEVELING_NONLINEAR)
int nonlinear_grid_spacing[2] = { 0 }; int nonlinear_grid_spacing[2] = { 0 };
float bed_level[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS]; float bed_level_grid[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
#endif #endif
#if IS_SCARA #if IS_SCARA
@ -2104,12 +2104,12 @@ static void clean_up_after_endstop_or_probe_move() {
* All DELTA leveling in the Marlin uses NONLINEAR_BED_LEVELING * All DELTA leveling in the Marlin uses NONLINEAR_BED_LEVELING
*/ */
static void extrapolate_one_point(int x, int y, int xdir, int ydir) { static void extrapolate_one_point(int x, int y, int xdir, int ydir) {
if (bed_level[x][y] != 0.0) { if (bed_level_grid[x][y] != 0.0) {
return; // Don't overwrite good values. return; // Don't overwrite good values.
} }
float a = 2 * bed_level[x + xdir][y] - bed_level[x + xdir * 2][y]; // Left to right. float a = 2 * bed_level_grid[x + xdir][y] - bed_level_grid[x + xdir * 2][y]; // Left to right.
float b = 2 * bed_level[x][y + ydir] - bed_level[x][y + ydir * 2]; // Front to back. float b = 2 * bed_level_grid[x][y + ydir] - bed_level_grid[x][y + ydir * 2]; // Front to back.
float c = 2 * bed_level[x + xdir][y + ydir] - bed_level[x + xdir * 2][y + ydir * 2]; // Diagonal. float c = 2 * bed_level_grid[x + xdir][y + ydir] - bed_level_grid[x + xdir * 2][y + ydir * 2]; // Diagonal.
float median = c; // Median is robust (ignores outliers). float median = c; // Median is robust (ignores outliers).
if (a < b) { if (a < b) {
if (b < c) median = b; if (b < c) median = b;
@ -2119,7 +2119,7 @@ static void clean_up_after_endstop_or_probe_move() {
if (c < b) median = b; if (c < b) median = b;
if (a < c) median = a; if (a < c) median = a;
} }
bed_level[x][y] = median; bed_level_grid[x][y] = median;
} }
/** /**
@ -2145,7 +2145,7 @@ static void clean_up_after_endstop_or_probe_move() {
static void print_bed_level() { static void print_bed_level() {
for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) { for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) { for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
SERIAL_PROTOCOL_F(bed_level[x][y], 2); SERIAL_PROTOCOL_F(bed_level_grid[x][y], 2);
SERIAL_PROTOCOLCHAR(' '); SERIAL_PROTOCOLCHAR(' ');
} }
SERIAL_EOL; SERIAL_EOL;
@ -2161,7 +2161,7 @@ static void clean_up_after_endstop_or_probe_move() {
#endif #endif
for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) { for (int y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) { for (int x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
bed_level[x][y] = 0.0; bed_level_grid[x][y] = 0.0;
} }
} }
} }
@ -3513,7 +3513,7 @@ inline void gcode_G28() {
#elif ENABLED(AUTO_BED_LEVELING_NONLINEAR) #elif ENABLED(AUTO_BED_LEVELING_NONLINEAR)
bed_level[xCount][yCount] = measured_z + zoffset; bed_level_grid[xCount][yCount] = measured_z + zoffset;
#endif #endif
@ -7807,10 +7807,10 @@ void ok_to_send() {
grid_y = max(h1, min(h2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS])); grid_y = max(h1, min(h2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS]));
int floor_x = floor(grid_x), floor_y = floor(grid_y); int floor_x = floor(grid_x), floor_y = floor(grid_y);
float ratio_x = grid_x - floor_x, ratio_y = grid_y - floor_y, float ratio_x = grid_x - floor_x, ratio_y = grid_y - floor_y,
z1 = bed_level[floor_x + half][floor_y + half], z1 = bed_level_grid[floor_x + half][floor_y + half],
z2 = bed_level[floor_x + half][floor_y + half + 1], z2 = bed_level_grid[floor_x + half][floor_y + half + 1],
z3 = bed_level[floor_x + half + 1][floor_y + half], z3 = bed_level_grid[floor_x + half + 1][floor_y + half],
z4 = bed_level[floor_x + half + 1][floor_y + half + 1], z4 = bed_level_grid[floor_x + half + 1][floor_y + half + 1],
left = (1 - ratio_y) * z1 + ratio_y * z2, left = (1 - ratio_y) * z1 + ratio_y * z2,
right = (1 - ratio_y) * z3 + ratio_y * z4, right = (1 - ratio_y) * z3 + ratio_y * z4,
offset = (1 - ratio_x) * left + ratio_x * right; offset = (1 - ratio_x) * left + ratio_x * right;