zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5951 from thinkyhead/rc_print_2d_array

Browse source 
Reduce code size (40b, or 166b with bilinear subdivision)
This commit is contained in:
Scott Lahteine 2017-03-03 21:27:44 -06:00 committed by GitHub
parent b9b203bfb2 369bfc8a1e
commit 1ef6ccd919
1 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Marlin/Marlin_main.cpp
View file

@ -2432,33 +2432,41 @@ static void clean_up_after_endstop_or_probe_move() {
/** /**
* Print calibration results for plotting or manual frame adjustment. * Print calibration results for plotting or manual frame adjustment.
*/ */
static void print_bilinear_leveling_grid() { static void print_2d_array(const uint8_t sx, const uint8_t sy, const uint8_t precision, float (*fn)(const uint8_t, const uint8_t)) {
SERIAL_ECHOPGM("Bilinear Leveling Grid:\n "); for (uint8_t x = 0; x < sx; x++) {
for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++) { for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++)
SERIAL_PROTOCOLPGM(" "); SERIAL_PROTOCOLCHAR(' ');
if (x < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)x); SERIAL_PROTOCOL((int)x);
} }
SERIAL_EOL; SERIAL_EOL;
for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++) { for (uint8_t y = 0; y < sy; y++) {
if (y < 10) SERIAL_PROTOCOLCHAR(' '); if (y < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)y); SERIAL_PROTOCOL((int)y);
for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++) { for (uint8_t x = 0; x < sx; x++) {
SERIAL_PROTOCOLCHAR(' '); SERIAL_PROTOCOLCHAR(' ');
float offset = bed_level_grid[x][y]; float offset = fn(x, y);
if (offset != UNPROBED) { if (offset != UNPROBED) {
if (offset > 0) SERIAL_CHAR('+'); if (offset >= 0) SERIAL_CHAR('+');
SERIAL_PROTOCOL_F(offset, 2); SERIAL_PROTOCOL_F(offset, precision);
} }
else else
SERIAL_PROTOCOLPGM(" ===="); for (uint8_t i = 0; i < precision + 3; i++)
SERIAL_PROTOCOLCHAR(i ? '=' : ' ');
} }
SERIAL_EOL; SERIAL_EOL;
} }
SERIAL_EOL; SERIAL_EOL;
} }
static void print_bilinear_leveling_grid() {
SERIAL_ECHOLNPGM("Bilinear Leveling Grid:");
print_2d_array(ABL_GRID_MAX_POINTS_X, ABL_GRID_MAX_POINTS_Y, 2,
[](const uint8_t x, const uint8_t y) { return bed_level_grid[x][y]; }
);
}
#if ENABLED(ABL_BILINEAR_SUBDIVISION) #if ENABLED(ABL_BILINEAR_SUBDIVISION)
#define ABL_GRID_POINTS_VIRT_X (ABL_GRID_MAX_POINTS_X - 1) * (BILINEAR_SUBDIVISIONS) + 1 #define ABL_GRID_POINTS_VIRT_X (ABL_GRID_MAX_POINTS_X - 1) * (BILINEAR_SUBDIVISIONS) + 1
#define ABL_GRID_POINTS_VIRT_Y (ABL_GRID_MAX_POINTS_Y - 1) * (BILINEAR_SUBDIVISIONS) + 1 #define ABL_GRID_POINTS_VIRT_Y (ABL_GRID_MAX_POINTS_Y - 1) * (BILINEAR_SUBDIVISIONS) + 1
#define ABL_TEMP_POINTS_X (ABL_GRID_MAX_POINTS_X + 2) #define ABL_TEMP_POINTS_X (ABL_GRID_MAX_POINTS_X + 2)
@ -2468,29 +2476,11 @@ static void clean_up_after_endstop_or_probe_move() {
static void bed_level_virt_print() { static void bed_level_virt_print() {
SERIAL_ECHOLNPGM("Subdivided with CATMULL ROM Leveling Grid:"); SERIAL_ECHOLNPGM("Subdivided with CATMULL ROM Leveling Grid:");
for (uint8_t x = 0; x < ABL_GRID_POINTS_VIRT_X; x++) { print_2d_array(ABL_GRID_POINTS_VIRT_X, ABL_GRID_POINTS_VIRT_Y, 5,
SERIAL_PROTOCOLPGM(" "); [](const uint8_t x, const uint8_t y) { return bed_level_grid_virt[x][y]; }
if (x < 10) SERIAL_PROTOCOLCHAR(' '); );
SERIAL_PROTOCOL((int)x);
}
SERIAL_EOL;
for (uint8_t y = 0; y < ABL_GRID_POINTS_VIRT_Y; y++) {
if (y < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)y);
for (uint8_t x = 0; x < ABL_GRID_POINTS_VIRT_X; x++) {
SERIAL_PROTOCOLCHAR(' ');
float offset = bed_level_grid_virt[x][y];
if (offset != UNPROBED) {
if (offset >= 0) SERIAL_CHAR('+');
SERIAL_PROTOCOL_F(offset, 5);
}
else
SERIAL_PROTOCOLPGM(" ====");
}
SERIAL_EOL;
}
SERIAL_EOL;
} }
#define LINEAR_EXTRAPOLATION(E, I) ((E) * 2 - (I)) #define LINEAR_EXTRAPOLATION(E, I) ((E) * 2 - (I))
float bed_level_virt_coord(const uint8_t x, const uint8_t y) { float bed_level_virt_coord(const uint8_t x, const uint8_t y) {
uint8_t ep = 0, ip = 1; uint8_t ep = 0, ip = 1;
@ -2528,6 +2518,7 @@ static void clean_up_after_endstop_or_probe_move() {
} }
return bed_level_grid[x - 1][y - 1]; return bed_level_grid[x - 1][y - 1];
} }
static float bed_level_virt_cmr(const float p[4], const uint8_t i, const float t) { static float bed_level_virt_cmr(const float p[4], const uint8_t i, const float t) {
return ( return (
p[i-1] * -t * sq(1 - t) p[i-1] * -t * sq(1 - t)
@ -2536,6 +2527,7 @@ static void clean_up_after_endstop_or_probe_move() {
- p[i+2] * sq(t) * (1 - t) - p[i+2] * sq(t) * (1 - t)
) * 0.5; ) * 0.5;
} }
static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const float &tx, const float &ty) { static float bed_level_virt_2cmr(const uint8_t x, const uint8_t y, const float &tx, const float &ty) {
float row[4], column[4]; float row[4], column[4];
for (uint8_t i = 0; i < 4; i++) { for (uint8_t i = 0; i < 4; i++) {
@ -2546,6 +2538,7 @@ static void clean_up_after_endstop_or_probe_move() {
} }
return bed_level_virt_cmr(row, 1, tx); return bed_level_virt_cmr(row, 1, tx);
} }
void bed_level_virt_interpolate() { void bed_level_virt_interpolate() {
for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++) for (uint8_t y = 0; y < ABL_GRID_MAX_POINTS_Y; y++)
for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++) for (uint8_t x = 0; x < ABL_GRID_MAX_POINTS_X; x++)
@ -2565,7 +2558,6 @@ static void clean_up_after_endstop_or_probe_move() {
#endif // ABL_BILINEAR_SUBDIVISION #endif // ABL_BILINEAR_SUBDIVISION
#endif // AUTO_BED_LEVELING_BILINEAR #endif // AUTO_BED_LEVELING_BILINEAR
/** /**
* Home an individual linear axis * Home an individual linear axis
*/ */