|
|
|
@ -37,10 +37,6 @@
|
|
|
|
void lcd_return_to_status();
|
|
|
|
void lcd_return_to_status();
|
|
|
|
bool lcd_clicked();
|
|
|
|
bool lcd_clicked();
|
|
|
|
void lcd_implementation_clear();
|
|
|
|
void lcd_implementation_clear();
|
|
|
|
void lcd_mesh_edit_setup(float inital);
|
|
|
|
|
|
|
|
float lcd_mesh_edit();
|
|
|
|
|
|
|
|
void lcd_z_offset_edit_setup(float);
|
|
|
|
|
|
|
|
float lcd_z_offset_edit();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern float meshedit_done;
|
|
|
|
extern float meshedit_done;
|
|
|
|
extern long babysteps_done;
|
|
|
|
extern long babysteps_done;
|
|
|
|
@ -66,22 +62,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* G29: Unified Bed Leveling by Roxy
|
|
|
|
* G29: Unified Bed Leveling by Roxy
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Transform required to compensate for bed level
|
|
|
|
|
|
|
|
//extern matrix_3x3 plan_bed_level_matrix;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Get the position applying the bed level matrix
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//vector_3 plan_get_position();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// static void set_bed_level_equation_lsq(double* plane_equation_coefficients);
|
|
|
|
|
|
|
|
// static void set_bed_level_equation_3pts(float z_at_pt_1, float z_at_pt_2, float z_at_pt_3);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* G29: Mesh Based Compensation System
|
|
|
|
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Parameters understood by this leveling system:
|
|
|
|
* Parameters understood by this leveling system:
|
|
|
|
*
|
|
|
|
*
|
|
|
|
@ -112,9 +92,9 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* E Stow_probe Stow the probe after each sampled point.
|
|
|
|
* E Stow_probe Stow the probe after each sampled point.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* F # Fade * Fade the amount of Mesh Based Compensation over a specified height. At the specified height,
|
|
|
|
* F # Fade * Fade the amount of Mesh Based Compensation over a specified height. At the
|
|
|
|
* no correction is applied and natural printer kenimatics take over. If no number is specified
|
|
|
|
* specified height, no correction is applied and natural printer kenimatics take over. If no
|
|
|
|
* for the command, 10mm is assummed to be reasonable.
|
|
|
|
* number is specified for the command, 10mm is assumed to be reasonable.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* G # Grid * Perform a Grid Based Leveling of the current Mesh using a grid with n points on
|
|
|
|
* G # Grid * Perform a Grid Based Leveling of the current Mesh using a grid with n points on
|
|
|
|
* a side.
|
|
|
|
* a side.
|
|
|
|
@ -133,7 +113,7 @@
|
|
|
|
* invalidate.
|
|
|
|
* invalidate.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* K # Kompare Kompare current Mesh with stored Mesh # replacing current Mesh with the result. This
|
|
|
|
* K # Kompare Kompare current Mesh with stored Mesh # replacing current Mesh with the result. This
|
|
|
|
* command litterly performs a difference between two Mesh.
|
|
|
|
* command literally performs a diff between two Meshes.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* L Load * Load Mesh from the previously activated location in the EEPROM.
|
|
|
|
* L Load * Load Mesh from the previously activated location in the EEPROM.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
@ -207,9 +187,9 @@
|
|
|
|
* Phase 2 allows the O (Map) parameter to be specified. This helps the user see the progression
|
|
|
|
* Phase 2 allows the O (Map) parameter to be specified. This helps the user see the progression
|
|
|
|
* of the Mesh being built.
|
|
|
|
* of the Mesh being built.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* P3 Phase 3 Fill the unpopulated regions of the Mesh with a fixed value. The C parameter is used to
|
|
|
|
* P3 Phase 3 Fill the unpopulated regions of the Mesh with a fixed value. The C parameter is
|
|
|
|
* specify the Constant value to fill all invalid areas of the Mesh. If no C parameter is
|
|
|
|
* used to specify the 'constant' value to fill all invalid areas of the Mesh. If no C parameter
|
|
|
|
* specified, a value of 0.0 is assumed. The R parameter can be given to specify the number
|
|
|
|
* is specified, a value of 0.0 is assumed. The R parameter can be given to specify the number
|
|
|
|
* of points to set. If the R parameter is specified the current nozzle position is used to
|
|
|
|
* of points to set. If the R parameter is specified the current nozzle position is used to
|
|
|
|
* find the closest points to alter unless the X and Y parameter are used to specify the fill
|
|
|
|
* find the closest points to alter unless the X and Y parameter are used to specify the fill
|
|
|
|
* location.
|
|
|
|
* location.
|
|
|
|
@ -270,9 +250,9 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* W What? Display valuable data the Unified Bed Leveling System knows.
|
|
|
|
* W What? Display valuable data the Unified Bed Leveling System knows.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* X # * * Specify X Location for this line of commands
|
|
|
|
* X # * * X Location for this line of commands
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Y # * * Specify Y Location for this line of commands
|
|
|
|
* Y # * * Y Location for this line of commands
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Z Zero * Probes to set the Z Height of the nozzle. The entire Mesh can be raised or lowered
|
|
|
|
* Z Zero * Probes to set the Z Height of the nozzle. The entire Mesh can be raised or lowered
|
|
|
|
* by just doing a G29 Z
|
|
|
|
* by just doing a G29 Z
|
|
|
|
@ -282,10 +262,10 @@
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Release Notes:
|
|
|
|
* Release Notes:
|
|
|
|
* You MUST do a M502 & M500 pair of commands to initialize the storage. Failure to do this
|
|
|
|
* You MUST do M502, M500 to initialize the storage. Failure to do this will cause all
|
|
|
|
* will cause all kinds of problems. Enabling EEPROM Storage is highly recommended. With
|
|
|
|
* kinds of problems. Enabling EEPROM Storage is highly recommended. With EEPROM Storage
|
|
|
|
* EEPROM Storage of the mesh, you are limited to 3-Point and Grid Leveling. (G29 P0 T and
|
|
|
|
* of the mesh, you are limited to 3-Point and Grid Leveling. (G29 P0 T and G29 P0 G
|
|
|
|
* G29 P0 G respectively.)
|
|
|
|
* respectively.)
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Z-Probe Sleds are not currently fully supported. There were too many complications caused
|
|
|
|
* Z-Probe Sleds are not currently fully supported. There were too many complications caused
|
|
|
|
* by them to support them in the Unified Bed Leveling code. Support for them will be handled
|
|
|
|
* by them to support them in the Unified Bed Leveling code. Support for them will be handled
|
|
|
|
@ -315,18 +295,16 @@
|
|
|
|
* we now have the functionality and features of all three systems combined.
|
|
|
|
* we now have the functionality and features of all three systems combined.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
int Unified_Bed_Leveling_EEPROM_start = -1;
|
|
|
|
int ubl_eeprom_start = -1;
|
|
|
|
int UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
bool ubl_has_control_of_lcd_panel = false;
|
|
|
|
volatile int G29_encoderDiff = 0; // This is volatile because it is getting changed at interrupt time.
|
|
|
|
volatile uint8_t ubl_encoderDiff = 0; // Volatile because it's changed by Temperature ISR button update
|
|
|
|
|
|
|
|
|
|
|
|
// We keep the simple parameter flags and values as 'static' because we break out the
|
|
|
|
|
|
|
|
// parameter parsing into a support routine.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int G29_Verbose_Level = 0, Test_Value = 0,
|
|
|
|
// The simple parameter flags and values are 'static' so parameter parsing can be in a support routine.
|
|
|
|
Phase_Value = -1, Repetition_Cnt = 1;
|
|
|
|
static int g29_verbose_level = 0, test_value = 0,
|
|
|
|
static bool Repeat_Flag = UBL_OK, C_Flag = false, X_Flag = UBL_OK, Y_Flag = UBL_OK, Statistics_Flag = UBL_OK, Business_Card_Mode = false;
|
|
|
|
phase_value = -1, repetition_cnt = 1;
|
|
|
|
static float X_Pos = 0.0, Y_Pos = 0.0, Height_Value = 5.0, measured_z, card_thickness = 0.0, Constant = 0.0;
|
|
|
|
static bool repeat_flag = UBL_OK, c_flag = false, x_flag = UBL_OK, y_flag = UBL_OK, statistics_flag = UBL_OK, business_card_mode = false;
|
|
|
|
static int Storage_Slot = 0, Test_Pattern = 0;
|
|
|
|
static float x_pos = 0.0, y_pos = 0.0, height_value = 5.0, measured_z, card_thickness = 0.0, constant = 0.0;
|
|
|
|
|
|
|
|
static int storage_slot = 0, test_pattern = 0;
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
void lcd_setstatus(const char* message, bool persist);
|
|
|
|
void lcd_setstatus(const char* message, bool persist);
|
|
|
|
@ -334,18 +312,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
void gcode_G29() {
|
|
|
|
void gcode_G29() {
|
|
|
|
mesh_index_pair location;
|
|
|
|
mesh_index_pair location;
|
|
|
|
int i, j, k;
|
|
|
|
int j, k;
|
|
|
|
float Z1, Z2, Z3;
|
|
|
|
float Z1, Z2, Z3;
|
|
|
|
|
|
|
|
|
|
|
|
G29_Verbose_Level = 0; // These may change, but let's get some reasonable values into them.
|
|
|
|
g29_verbose_level = 0; // These may change, but let's get some reasonable values into them.
|
|
|
|
Repeat_Flag = UBL_OK;
|
|
|
|
repeat_flag = UBL_OK;
|
|
|
|
Repetition_Cnt = 1;
|
|
|
|
repetition_cnt = 1;
|
|
|
|
C_Flag = false;
|
|
|
|
c_flag = false;
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM("Unified_Bed_Leveling_EEPROM_start=");
|
|
|
|
SERIAL_PROTOCOLLNPAIR("ubl_eeprom_start=", ubl_eeprom_start);
|
|
|
|
SERIAL_PROTOCOLLN(Unified_Bed_Leveling_EEPROM_start);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (Unified_Bed_Leveling_EEPROM_start < 0) {
|
|
|
|
if (ubl_eeprom_start < 0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?You need to enable your EEPROM and initialize it");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?You need to enable your EEPROM and initialize it");
|
|
|
|
SERIAL_PROTOCOLLNPGM("with M502, M500, M501 in that order.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("with M502, M500, M501 in that order.\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -354,14 +331,14 @@
|
|
|
|
if (!code_seen('N') && axis_unhomed_error(true, true, true)) // Don't allow auto-leveling without homing first
|
|
|
|
if (!code_seen('N') && axis_unhomed_error(true, true, true)) // Don't allow auto-leveling without homing first
|
|
|
|
gcode_G28();
|
|
|
|
gcode_G28();
|
|
|
|
|
|
|
|
|
|
|
|
if (G29_Parameter_Parsing()) return; // abort if parsing the simple parameters causes a problem,
|
|
|
|
if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
|
|
|
|
|
|
|
|
|
|
|
|
// Invalidate Mesh Points. This command is a little bit asymetrical because
|
|
|
|
// Invalidate Mesh Points. This command is a little bit asymetrical because
|
|
|
|
// it directly specifies the repetition count and does not use the 'R' parameter.
|
|
|
|
// it directly specifies the repetition count and does not use the 'R' parameter.
|
|
|
|
if (code_seen('I')) {
|
|
|
|
if (code_seen('I')) {
|
|
|
|
Repetition_Cnt = code_has_value() ? code_value_int() : 1;
|
|
|
|
repetition_cnt = code_has_value() ? code_value_int() : 1;
|
|
|
|
while (Repetition_Cnt--) {
|
|
|
|
while (repetition_cnt--) {
|
|
|
|
location = find_closest_mesh_point_of_type(REAL, X_Pos, Y_Pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
location = find_closest_mesh_point_of_type(REAL, x_pos, y_pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
if (location.x_index < 0) {
|
|
|
|
if (location.x_index < 0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Entire Mesh invalidated.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Entire Mesh invalidated.\n");
|
|
|
|
break; // No more invalid Mesh Points to populate
|
|
|
|
break; // No more invalid Mesh Points to populate
|
|
|
|
@ -373,38 +350,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('Q')) {
|
|
|
|
if (code_seen('Q')) {
|
|
|
|
|
|
|
|
|
|
|
|
if (code_has_value()) Test_Pattern = code_value_int();
|
|
|
|
if (code_has_value()) test_pattern = code_value_int();
|
|
|
|
|
|
|
|
|
|
|
|
if (Test_Pattern < 0 || Test_Pattern > 4) {
|
|
|
|
if (test_pattern < 0 || test_pattern > 4) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Test_Pattern value. (0-4)\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid test_pattern value. (0-4)\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SERIAL_PROTOCOLLNPGM("Loading Test_Pattern values.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Loading test_pattern values.\n");
|
|
|
|
switch (Test_Pattern) {
|
|
|
|
switch (test_pattern) {
|
|
|
|
case 0:
|
|
|
|
case 0:
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) { // Create a bowl shape. This is
|
|
|
|
for (uint8_t x = 0; x < UBL_MESH_NUM_X_POINTS; x++) { // Create a bowl shape. This is
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++) { // similar to what a user would see with
|
|
|
|
for (uint8_t y = 0; y < UBL_MESH_NUM_Y_POINTS; y++) { // similar to what a user would see with
|
|
|
|
Z1 = 0.5 * (UBL_MESH_NUM_X_POINTS) - i; // a poorly calibrated Delta.
|
|
|
|
Z1 = 0.5 * (UBL_MESH_NUM_X_POINTS) - x; // a poorly calibrated Delta.
|
|
|
|
Z2 = 0.5 * (UBL_MESH_NUM_Y_POINTS) - j;
|
|
|
|
Z2 = 0.5 * (UBL_MESH_NUM_Y_POINTS) - y;
|
|
|
|
z_values[i][j] += 2.0 * HYPOT(Z1, Z2);
|
|
|
|
z_values[x][y] += 2.0 * HYPOT(Z1, Z2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
case 1:
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) { // Create a diagonal line several Mesh
|
|
|
|
for (uint8_t x = 0; x < UBL_MESH_NUM_X_POINTS; x++) { // Create a diagonal line several Mesh
|
|
|
|
z_values[i][i] += 9.999; // cells thick that is raised
|
|
|
|
z_values[x][x] += 9.999; // cells thick that is raised
|
|
|
|
if (i < UBL_MESH_NUM_Y_POINTS - 1)
|
|
|
|
if (x < UBL_MESH_NUM_Y_POINTS - 1)
|
|
|
|
z_values[i][i + 1] += 9.999; // We want the altered line several mesh points thick
|
|
|
|
z_values[x][x + 1] += 9.999; // We want the altered line several mesh points thick
|
|
|
|
if (i > 0)
|
|
|
|
if (x > 0)
|
|
|
|
z_values[i][i - 1] += 9.999; // We want the altered line several mesh points thick
|
|
|
|
z_values[x][x - 1] += 9.999; // We want the altered line several mesh points thick
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
case 2:
|
|
|
|
// Allow the user to specify the height because 10mm is
|
|
|
|
// Allow the user to specify the height because 10mm is
|
|
|
|
// a little bit extreme in some cases.
|
|
|
|
// a little bit extreme in some cases.
|
|
|
|
for (i = (UBL_MESH_NUM_X_POINTS) / 3.0; i < 2 * ((UBL_MESH_NUM_X_POINTS) / 3.0); i++) // Create a rectangular raised area in
|
|
|
|
for (uint8_t x = (UBL_MESH_NUM_X_POINTS) / 3; x < 2 * (UBL_MESH_NUM_X_POINTS) / 3; x++) // Create a rectangular raised area in
|
|
|
|
for (j = (UBL_MESH_NUM_Y_POINTS) / 3.0; j < 2 * ((UBL_MESH_NUM_Y_POINTS) / 3.0); j++) // the center of the bed
|
|
|
|
for (uint8_t y = (UBL_MESH_NUM_Y_POINTS) / 3; y < 2 * (UBL_MESH_NUM_Y_POINTS) / 3; y++) // the center of the bed
|
|
|
|
z_values[i][j] += code_seen('C') ? Constant : 9.99;
|
|
|
|
z_values[x][y] += code_seen('C') ? constant : 9.99;
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
case 3:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -412,17 +389,17 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('P')) {
|
|
|
|
if (code_seen('P')) {
|
|
|
|
Phase_Value = code_value_int();
|
|
|
|
phase_value = code_value_int();
|
|
|
|
if (Phase_Value < 0 || Phase_Value > 7) {
|
|
|
|
if (phase_value < 0 || phase_value > 7) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Phase value. (0-4)\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Phase value. (0-4)\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
switch (Phase_Value) {
|
|
|
|
switch (phase_value) {
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Zero Mesh Data
|
|
|
|
// Zero Mesh Data
|
|
|
|
//
|
|
|
|
//
|
|
|
|
case 0:
|
|
|
|
case 0:
|
|
|
|
blm.reset();
|
|
|
|
ubl.reset();
|
|
|
|
SERIAL_PROTOCOLLNPGM("Mesh zeroed.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Mesh zeroed.\n");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
@ -430,16 +407,16 @@
|
|
|
|
//
|
|
|
|
//
|
|
|
|
case 1:
|
|
|
|
case 1:
|
|
|
|
if (!code_seen('C') ) {
|
|
|
|
if (!code_seen('C') ) {
|
|
|
|
blm.invalidate();
|
|
|
|
ubl.invalidate();
|
|
|
|
SERIAL_PROTOCOLLNPGM("Mesh invalidated. Probing mesh.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Mesh invalidated. Probing mesh.\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (G29_Verbose_Level > 1) {
|
|
|
|
if (g29_verbose_level > 1) {
|
|
|
|
SERIAL_ECHOPGM("Probing Mesh Points Closest to (");
|
|
|
|
SERIAL_ECHOPGM("Probing Mesh Points Closest to (");
|
|
|
|
SERIAL_ECHO(X_Pos);
|
|
|
|
SERIAL_ECHO(x_pos);
|
|
|
|
SERIAL_ECHOPAIR(",", Y_Pos);
|
|
|
|
SERIAL_ECHOPAIR(",", y_pos);
|
|
|
|
SERIAL_PROTOCOLLNPGM(")\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM(")\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
probe_entire_mesh( X_Pos+X_PROBE_OFFSET_FROM_EXTRUDER, Y_Pos+Y_PROBE_OFFSET_FROM_EXTRUDER,
|
|
|
|
probe_entire_mesh( x_pos+X_PROBE_OFFSET_FROM_EXTRUDER, y_pos+Y_PROBE_OFFSET_FROM_EXTRUDER,
|
|
|
|
code_seen('O') || code_seen('M'), code_seen('E'));
|
|
|
|
code_seen('O') || code_seen('M'), code_seen('E'));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
@ -448,90 +425,90 @@
|
|
|
|
case 2:
|
|
|
|
case 2:
|
|
|
|
SERIAL_PROTOCOLLNPGM("Manually probing unreachable mesh locations.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Manually probing unreachable mesh locations.\n");
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
|
|
|
if (!X_Flag && !Y_Flag) { // use a good default location for the path
|
|
|
|
if (!x_flag && !y_flag) { // use a good default location for the path
|
|
|
|
X_Pos = X_MIN_POS;
|
|
|
|
x_pos = X_MIN_POS;
|
|
|
|
Y_Pos = Y_MIN_POS;
|
|
|
|
y_pos = Y_MIN_POS;
|
|
|
|
if (X_PROBE_OFFSET_FROM_EXTRUDER > 0) // The flipped > and < operators on these two comparisons is
|
|
|
|
if (X_PROBE_OFFSET_FROM_EXTRUDER > 0) // The flipped > and < operators on these two comparisons is
|
|
|
|
X_Pos = X_MAX_POS; // intentional. It should cause the probed points to follow a
|
|
|
|
x_pos = X_MAX_POS; // intentional. It should cause the probed points to follow a
|
|
|
|
|
|
|
|
|
|
|
|
if (Y_PROBE_OFFSET_FROM_EXTRUDER < 0) // nice path on Cartesian printers. It may make sense to
|
|
|
|
if (Y_PROBE_OFFSET_FROM_EXTRUDER < 0) // nice path on Cartesian printers. It may make sense to
|
|
|
|
Y_Pos = Y_MAX_POS; // have Delta printers default to the center of the bed.
|
|
|
|
y_pos = Y_MAX_POS; // have Delta printers default to the center of the bed.
|
|
|
|
|
|
|
|
|
|
|
|
} // For now, until that is decided, it can be forced with the X
|
|
|
|
} // For now, until that is decided, it can be forced with the X
|
|
|
|
// and Y parameters.
|
|
|
|
// and Y parameters.
|
|
|
|
if (code_seen('C')) {
|
|
|
|
if (code_seen('C')) {
|
|
|
|
X_Pos = current_position[X_AXIS];
|
|
|
|
x_pos = current_position[X_AXIS];
|
|
|
|
Y_Pos = current_position[Y_AXIS];
|
|
|
|
y_pos = current_position[Y_AXIS];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Height_Value = code_seen('H') && code_has_value() ? code_value_float() : Z_CLEARANCE_BETWEEN_PROBES;
|
|
|
|
height_value = code_seen('H') && code_has_value() ? code_value_float() : Z_CLEARANCE_BETWEEN_PROBES;
|
|
|
|
|
|
|
|
|
|
|
|
if ((Business_Card_Mode = code_seen('B'))) {
|
|
|
|
if ((business_card_mode = code_seen('B'))) {
|
|
|
|
card_thickness = code_has_value() ? code_value_float() : measure_business_card_thickness(Height_Value);
|
|
|
|
card_thickness = code_has_value() ? code_value_float() : measure_business_card_thickness(height_value);
|
|
|
|
|
|
|
|
|
|
|
|
if (fabs(card_thickness) > 1.5) {
|
|
|
|
if (fabs(card_thickness) > 1.5) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error in Business Card measurment.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error in Business Card measurment.\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
manually_probe_remaining_mesh( X_Pos, Y_Pos, Height_Value, card_thickness, code_seen('O') || code_seen('M'));
|
|
|
|
manually_probe_remaining_mesh(x_pos, y_pos, height_value, card_thickness, code_seen('O') || code_seen('M'));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Populate invalid Mesh areas with a constant
|
|
|
|
// Populate invalid Mesh areas with a constant
|
|
|
|
//
|
|
|
|
//
|
|
|
|
case 3:
|
|
|
|
case 3:
|
|
|
|
Height_Value = 0.0; // Assume 0.0 until proven otherwise
|
|
|
|
height_value = 0.0; // Assume 0.0 until proven otherwise
|
|
|
|
if (code_seen('C')) Height_Value = Constant;
|
|
|
|
if (code_seen('C')) height_value = constant;
|
|
|
|
// If no repetition is specified, do the whole Mesh
|
|
|
|
// If no repetition is specified, do the whole Mesh
|
|
|
|
if (!Repeat_Flag) Repetition_Cnt = 9999;
|
|
|
|
if (!repeat_flag) repetition_cnt = 9999;
|
|
|
|
while (Repetition_Cnt--) {
|
|
|
|
while (repetition_cnt--) {
|
|
|
|
location = find_closest_mesh_point_of_type( INVALID, X_Pos, Y_Pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
location = find_closest_mesh_point_of_type(INVALID, x_pos, y_pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
if (location.x_index < 0) break; // No more invalid Mesh Points to populate
|
|
|
|
if (location.x_index < 0) break; // No more invalid Mesh Points to populate
|
|
|
|
z_values[location.x_index][location.y_index] = Height_Value;
|
|
|
|
z_values[location.x_index][location.y_index] = height_value;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Fine Tune (Or Edit) the Mesh
|
|
|
|
// Fine Tune (Or Edit) the Mesh
|
|
|
|
//
|
|
|
|
//
|
|
|
|
case 4:
|
|
|
|
case 4:
|
|
|
|
fine_tune_mesh(X_Pos, Y_Pos, Height_Value, code_seen('O') || code_seen('M'));
|
|
|
|
fine_tune_mesh(x_pos, y_pos, code_seen('O') || code_seen('M'));
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
case 5:
|
|
|
|
Find_Mean_Mesh_Height();
|
|
|
|
find_mean_mesh_height();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
case 6:
|
|
|
|
Shift_Mesh_Height();
|
|
|
|
shift_mesh_height();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 10:
|
|
|
|
case 10:
|
|
|
|
UBL_has_control_of_LCD_Panel++; // Debug code... Pay no attention to this stuff
|
|
|
|
// Debug code... Pay no attention to this stuff
|
|
|
|
SERIAL_ECHO_START; // it can be removed soon.
|
|
|
|
// it can be removed soon.
|
|
|
|
SERIAL_ECHOPGM("Checking G29 has control of LCD Panel:\n");
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
while(!G29_lcd_clicked()) {
|
|
|
|
SERIAL_ECHOLNPGM("Checking G29 has control of LCD Panel:");
|
|
|
|
|
|
|
|
wait_for_user = true;
|
|
|
|
|
|
|
|
while (wait_for_user) {
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
delay(250);
|
|
|
|
delay(250);
|
|
|
|
SERIAL_PROTOCOL(G29_encoderDiff);
|
|
|
|
SERIAL_ECHO((int)ubl_encoderDiff);
|
|
|
|
G29_encoderDiff = 0;
|
|
|
|
ubl_encoderDiff = 0;
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (G29_lcd_clicked()) idle();
|
|
|
|
SERIAL_ECHOLNPGM("G29 giving back control of LCD Panel.");
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;;
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("G29 giving back control of LCD Panel.\n");
|
|
|
|
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('T')) {
|
|
|
|
if (code_seen('T')) {
|
|
|
|
Z1 = probe_pt(ubl_3_point_1_X, ubl_3_point_1_Y, false /*Stow Flag*/, G29_Verbose_Level) + zprobe_zoffset;
|
|
|
|
Z1 = probe_pt(ubl_3_point_1_X, ubl_3_point_1_Y, false /*Stow Flag*/, g29_verbose_level) + zprobe_zoffset;
|
|
|
|
Z2 = probe_pt(ubl_3_point_2_X, ubl_3_point_2_Y, false /*Stow Flag*/, G29_Verbose_Level) + zprobe_zoffset;
|
|
|
|
Z2 = probe_pt(ubl_3_point_2_X, ubl_3_point_2_Y, false /*Stow Flag*/, g29_verbose_level) + zprobe_zoffset;
|
|
|
|
Z3 = probe_pt(ubl_3_point_3_X, ubl_3_point_3_Y, true /*Stow Flag*/, G29_Verbose_Level) + zprobe_zoffset;
|
|
|
|
Z3 = probe_pt(ubl_3_point_3_X, ubl_3_point_3_Y, true /*Stow Flag*/, g29_verbose_level) + zprobe_zoffset;
|
|
|
|
|
|
|
|
|
|
|
|
// We need to adjust Z1, Z2, Z3 by the Mesh Height at these points. Just because they are non-zero doesn't mean
|
|
|
|
// We need to adjust Z1, Z2, Z3 by the Mesh Height at these points. Just because they are non-zero doesn't mean
|
|
|
|
// the Mesh is tilted! (We need to compensate each probe point by what the Mesh says that location's height is)
|
|
|
|
// the Mesh is tilted! (We need to compensate each probe point by what the Mesh says that location's height is)
|
|
|
|
|
|
|
|
|
|
|
|
Z1 -= blm.get_z_correction(ubl_3_point_1_X, ubl_3_point_1_Y);
|
|
|
|
Z1 -= ubl.get_z_correction(ubl_3_point_1_X, ubl_3_point_1_Y);
|
|
|
|
Z2 -= blm.get_z_correction(ubl_3_point_2_X, ubl_3_point_2_Y);
|
|
|
|
Z2 -= ubl.get_z_correction(ubl_3_point_2_X, ubl_3_point_2_Y);
|
|
|
|
Z3 -= blm.get_z_correction(ubl_3_point_3_X, ubl_3_point_3_Y);
|
|
|
|
Z3 -= ubl.get_z_correction(ubl_3_point_3_X, ubl_3_point_3_Y);
|
|
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_xy((X_MAX_POS - (X_MIN_POS)) / 2.0, (Y_MAX_POS - (Y_MIN_POS)) / 2.0);
|
|
|
|
do_blocking_move_to_xy((X_MAX_POS - (X_MIN_POS)) / 2.0, (Y_MAX_POS - (Y_MIN_POS)) / 2.0);
|
|
|
|
tilt_mesh_based_on_3pts(Z1, Z2, Z3);
|
|
|
|
tilt_mesh_based_on_3pts(Z1, Z2, Z3);
|
|
|
|
@ -541,13 +518,13 @@
|
|
|
|
// Much of the 'What?' command can be eliminated. But until we are fully debugged, it is
|
|
|
|
// Much of the 'What?' command can be eliminated. But until we are fully debugged, it is
|
|
|
|
// good to have the extra information. Soon... we prune this to just a few items
|
|
|
|
// good to have the extra information. Soon... we prune this to just a few items
|
|
|
|
//
|
|
|
|
//
|
|
|
|
if (code_seen('W')) G29_What_Command();
|
|
|
|
if (code_seen('W')) g29_what_command();
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// When we are fully debugged, the EEPROM dump command will get deleted also. But
|
|
|
|
// When we are fully debugged, the EEPROM dump command will get deleted also. But
|
|
|
|
// right now, it is good to have the extra information. Soon... we prune this.
|
|
|
|
// right now, it is good to have the extra information. Soon... we prune this.
|
|
|
|
//
|
|
|
|
//
|
|
|
|
if (code_seen('J')) G29_EEPROM_Dump(); // EEPROM Dump
|
|
|
|
if (code_seen('J')) g29_eeprom_dump(); // EEPROM Dump
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// When we are fully debugged, this may go away. But there are some valid
|
|
|
|
// When we are fully debugged, this may go away. But there are some valid
|
|
|
|
@ -555,26 +532,26 @@
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('K')) // Kompare Current Mesh Data to Specified Stored Mesh
|
|
|
|
if (code_seen('K')) // Kompare Current Mesh Data to Specified Stored Mesh
|
|
|
|
G29_Kompare_Current_Mesh_to_Stored_Mesh();
|
|
|
|
g29_compare_current_mesh_to_stored_mesh();
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Load a Mesh from the EEPROM
|
|
|
|
// Load a Mesh from the EEPROM
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('L')) { // Load Current Mesh Data
|
|
|
|
if (code_seen('L')) { // Load Current Mesh Data
|
|
|
|
Storage_Slot = code_has_value() ? code_value_int() : blm.state.EEPROM_storage_slot;
|
|
|
|
storage_slot = code_has_value() ? code_value_int() : ubl.state.eeprom_storage_slot;
|
|
|
|
|
|
|
|
|
|
|
|
k = E2END - sizeof(blm.state);
|
|
|
|
k = E2END - sizeof(ubl.state);
|
|
|
|
j = (k - Unified_Bed_Leveling_EEPROM_start) / sizeof(z_values);
|
|
|
|
j = (k - ubl_eeprom_start) / sizeof(z_values);
|
|
|
|
|
|
|
|
|
|
|
|
if (Storage_Slot < 0 || Storage_Slot >= j || Unified_Bed_Leveling_EEPROM_start <= 0) {
|
|
|
|
if (storage_slot < 0 || storage_slot >= j || ubl_eeprom_start <= 0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
blm.load_mesh(Storage_Slot);
|
|
|
|
ubl.load_mesh(storage_slot);
|
|
|
|
blm.state.EEPROM_storage_slot = Storage_Slot;
|
|
|
|
ubl.state.eeprom_storage_slot = storage_slot;
|
|
|
|
if (Storage_Slot != blm.state.EEPROM_storage_slot)
|
|
|
|
if (storage_slot != ubl.state.eeprom_storage_slot)
|
|
|
|
blm.store_state();
|
|
|
|
ubl.store_state();
|
|
|
|
SERIAL_PROTOCOLLNPGM("Done.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Done.\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -583,53 +560,48 @@
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('S')) { // Store (or Save) Current Mesh Data
|
|
|
|
if (code_seen('S')) { // Store (or Save) Current Mesh Data
|
|
|
|
Storage_Slot = code_has_value() ? code_value_int() : blm.state.EEPROM_storage_slot;
|
|
|
|
storage_slot = code_has_value() ? code_value_int() : ubl.state.eeprom_storage_slot;
|
|
|
|
|
|
|
|
|
|
|
|
if (Storage_Slot == -1) { // Special case, we are going to 'Export' the mesh to the
|
|
|
|
if (storage_slot == -1) { // Special case, we are going to 'Export' the mesh to the
|
|
|
|
SERIAL_ECHOPGM("G29 I 999\n"); // host in a form it can be reconstructed on a different machine
|
|
|
|
SERIAL_ECHOLNPGM("G29 I 999"); // host in a form it can be reconstructed on a different machine
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
for (uint8_t x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++) {
|
|
|
|
for (uint8_t y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
if (!isnan(z_values[i][j])) {
|
|
|
|
if (!isnan(z_values[x][y])) {
|
|
|
|
SERIAL_ECHOPAIR("M421 I ", i);
|
|
|
|
SERIAL_ECHOPAIR("M421 I ", x);
|
|
|
|
SERIAL_ECHOPAIR(" J ", j);
|
|
|
|
SERIAL_ECHOPAIR(" J ", y);
|
|
|
|
SERIAL_ECHOPGM(" Z ");
|
|
|
|
SERIAL_ECHOPGM(" Z ");
|
|
|
|
SERIAL_PROTOCOL_F(z_values[i][j], 6);
|
|
|
|
SERIAL_ECHO_F(z_values[x][y], 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int k = E2END - sizeof(blm.state),
|
|
|
|
int k = E2END - sizeof(ubl.state),
|
|
|
|
j = (k - Unified_Bed_Leveling_EEPROM_start) / sizeof(z_values);
|
|
|
|
j = (k - ubl_eeprom_start) / sizeof(z_values);
|
|
|
|
|
|
|
|
|
|
|
|
if (Storage_Slot < 0 || Storage_Slot >= j || Unified_Bed_Leveling_EEPROM_start <= 0) {
|
|
|
|
if (storage_slot < 0 || storage_slot >= j || ubl_eeprom_start <= 0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
SERIAL_PROTOCOLLNPAIR("?Use 0 to ", j - 1);
|
|
|
|
SERIAL_PROTOCOLLNPAIR("?Use 0 to ", j - 1);
|
|
|
|
goto LEAVE;
|
|
|
|
goto LEAVE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
blm.store_mesh(Storage_Slot);
|
|
|
|
ubl.store_mesh(storage_slot);
|
|
|
|
blm.state.EEPROM_storage_slot = Storage_Slot;
|
|
|
|
ubl.state.eeprom_storage_slot = storage_slot;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if (Storage_Slot != blm.state.EEPROM_storage_slot)
|
|
|
|
// if (storage_slot != ubl.state.eeprom_storage_slot)
|
|
|
|
blm.store_state(); // Always save an updated copy of the UBL State info
|
|
|
|
ubl.store_state(); // Always save an updated copy of the UBL State info
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPGM("Done.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Done.\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('O') || code_seen('M')) {
|
|
|
|
if (code_seen('O') || code_seen('M'))
|
|
|
|
i = code_has_value() ? code_value_int() : 0;
|
|
|
|
ubl.display_map(code_has_value() ? code_value_int() : 0);
|
|
|
|
blm.display_map(i);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('Z')) {
|
|
|
|
if (code_seen('Z')) {
|
|
|
|
if (code_has_value()) {
|
|
|
|
if (code_has_value())
|
|
|
|
blm.state.z_offset = code_value_float(); // do the simple case. Just lock in the specified value
|
|
|
|
ubl.state.z_offset = code_value_float(); // do the simple case. Just lock in the specified value
|
|
|
|
}
|
|
|
|
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
save_UBL_active_state_and_disable();
|
|
|
|
save_ubl_active_state_and_disable();
|
|
|
|
//measured_z = probe_pt(X_Pos + X_PROBE_OFFSET_FROM_EXTRUDER, Y_Pos+Y_PROBE_OFFSET_FROM_EXTRUDER, ProbeDeployAndStow, G29_Verbose_Level);
|
|
|
|
//measured_z = probe_pt(x_pos + X_PROBE_OFFSET_FROM_EXTRUDER, y_pos + Y_PROBE_OFFSET_FROM_EXTRUDER, ProbeDeployAndStow, g29_verbose_level);
|
|
|
|
|
|
|
|
|
|
|
|
measured_z = 1.5;
|
|
|
|
measured_z = 1.5;
|
|
|
|
do_blocking_move_to_z(measured_z); // Get close to the bed, but leave some space so we don't damage anything
|
|
|
|
do_blocking_move_to_z(measured_z); // Get close to the bed, but leave some space so we don't damage anything
|
|
|
|
@ -637,149 +609,154 @@
|
|
|
|
// it won't be that painful to spin the Encoder Wheel for 1.5mm
|
|
|
|
// it won't be that painful to spin the Encoder Wheel for 1.5mm
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_z_offset_edit_setup(measured_z);
|
|
|
|
lcd_z_offset_edit_setup(measured_z);
|
|
|
|
|
|
|
|
wait_for_user = true;
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
measured_z = lcd_z_offset_edit();
|
|
|
|
measured_z = lcd_z_offset_edit();
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
do_blocking_move_to_z(measured_z);
|
|
|
|
do_blocking_move_to_z(measured_z);
|
|
|
|
} while (!G29_lcd_clicked());
|
|
|
|
} while (wait_for_user);
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel = 1; // There is a race condition for the Encoder Wheel getting clicked.
|
|
|
|
ubl_has_control_of_lcd_panel++; // There is a race condition for the Encoder Wheel getting clicked.
|
|
|
|
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune( )
|
|
|
|
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune)
|
|
|
|
// or here. So, until we are done looking for a long Encoder Wheel Press,
|
|
|
|
// or here. So, until we are done looking for a long Encoder Wheel Press,
|
|
|
|
// we need to take control of the panel
|
|
|
|
// we need to take control of the panel
|
|
|
|
millis_t nxt = millis() + 1500UL;
|
|
|
|
|
|
|
|
lcd_return_to_status();
|
|
|
|
lcd_return_to_status();
|
|
|
|
while (G29_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
|
|
|
|
|
|
|
|
const millis_t nxt = millis() + 1500UL;
|
|
|
|
|
|
|
|
while (ubl_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
if (ELAPSED(millis(), nxt)) {
|
|
|
|
if (ELAPSED(millis(), nxt)) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nZ-Offset Adjustment Stopped.");
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
lcd_setstatus("Z-Offset Stopped", true);
|
|
|
|
lcd_setstatus("Z-Offset Stopped", true);
|
|
|
|
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
while (G29_lcd_clicked()) idle();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
|
|
|
|
goto LEAVE;
|
|
|
|
goto LEAVE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
delay(20); // We don't want any switch noise.
|
|
|
|
delay(20); // We don't want any switch noise.
|
|
|
|
|
|
|
|
|
|
|
|
blm.state.z_offset = measured_z;
|
|
|
|
ubl.state.z_offset = measured_z;
|
|
|
|
|
|
|
|
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_implementation_clear();
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
LEAVE:
|
|
|
|
LEAVE:
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
lcd_setstatus(" ", true);
|
|
|
|
lcd_setstatus(" ", true);
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
|
|
|
|
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Find_Mean_Mesh_Height() {
|
|
|
|
void find_mean_mesh_height() {
|
|
|
|
int i, j, n;
|
|
|
|
uint8_t x, y;
|
|
|
|
|
|
|
|
int n;
|
|
|
|
float sum, sum_of_diff_squared, sigma, difference, mean;
|
|
|
|
float sum, sum_of_diff_squared, sigma, difference, mean;
|
|
|
|
|
|
|
|
|
|
|
|
sum = sum_of_diff_squared = 0.0;
|
|
|
|
sum = sum_of_diff_squared = 0.0;
|
|
|
|
n = 0;
|
|
|
|
n = 0;
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
for (x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++) {
|
|
|
|
for (y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
if (!isnan(z_values[i][j])) {
|
|
|
|
if (!isnan(z_values[x][y])) {
|
|
|
|
sum += z_values[i][j];
|
|
|
|
sum += z_values[x][y];
|
|
|
|
n++;
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
mean = sum / n;
|
|
|
|
mean = sum / n;
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Now do the sumation of the squares of difference from mean
|
|
|
|
// Now do the sumation of the squares of difference from mean
|
|
|
|
//
|
|
|
|
//
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
for (x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++) {
|
|
|
|
for (y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
if (!isnan(z_values[i][j])) {
|
|
|
|
if (!isnan(z_values[x][y])) {
|
|
|
|
difference = (z_values[i][j] - mean);
|
|
|
|
difference = (z_values[x][y] - mean);
|
|
|
|
sum_of_diff_squared += difference * difference;
|
|
|
|
sum_of_diff_squared += difference * difference;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SERIAL_ECHOLNPAIR("# of samples: ", n);
|
|
|
|
SERIAL_ECHOLNPAIR("# of samples: ", n);
|
|
|
|
SERIAL_ECHOPGM("Mean Mesh Height: ");
|
|
|
|
SERIAL_ECHOPGM("Mean Mesh Height: ");
|
|
|
|
SERIAL_PROTOCOL_F(mean, 6);
|
|
|
|
SERIAL_ECHO_F(mean, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
sigma = sqrt(sum_of_diff_squared / (n + 1));
|
|
|
|
sigma = sqrt(sum_of_diff_squared / (n + 1));
|
|
|
|
SERIAL_ECHOPGM("Standard Deviation: ");
|
|
|
|
SERIAL_ECHOPGM("Standard Deviation: ");
|
|
|
|
SERIAL_PROTOCOL_F(sigma, 6);
|
|
|
|
SERIAL_ECHO_F(sigma, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
if (C_Flag)
|
|
|
|
if (c_flag)
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++)
|
|
|
|
for (x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++)
|
|
|
|
for (y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
if (!isnan(z_values[i][j]))
|
|
|
|
if (!isnan(z_values[x][y]))
|
|
|
|
z_values[i][j] -= mean + Constant;
|
|
|
|
z_values[x][y] -= mean + constant;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Shift_Mesh_Height( ) {
|
|
|
|
void shift_mesh_height( ) {
|
|
|
|
for (uint8_t i = 0; i < UBL_MESH_NUM_X_POINTS; i++)
|
|
|
|
for (uint8_t x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (uint8_t j = 0; j < UBL_MESH_NUM_Y_POINTS; j++)
|
|
|
|
for (uint8_t y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
if (!isnan(z_values[i][j]))
|
|
|
|
if (!isnan(z_values[x][y]))
|
|
|
|
z_values[i][j] += Constant;
|
|
|
|
z_values[x][y] += constant;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// probe_entire_mesh(X_Pos, Y_Pos) probes all invalidated locations of the mesh that can be reached
|
|
|
|
/**
|
|
|
|
// by the probe. It attempts to fill in locations closest to the nozzle's start location first.
|
|
|
|
* Probe all invalidated locations of the mesh that can be reached by the probe.
|
|
|
|
|
|
|
|
* This attempts to fill in locations closest to the nozzle's start location first.
|
|
|
|
void probe_entire_mesh(float X_Pos, float Y_Pos, bool do_UBL_MESH_Map, bool stow_probe) {
|
|
|
|
*/
|
|
|
|
|
|
|
|
void probe_entire_mesh(float x_pos, float y_pos, bool do_ubl_mesh_map, bool stow_probe) {
|
|
|
|
mesh_index_pair location;
|
|
|
|
mesh_index_pair location;
|
|
|
|
float xProbe, yProbe, measured_z;
|
|
|
|
float xProbe, yProbe, measured_z;
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel++;
|
|
|
|
ubl_has_control_of_lcd_panel++;
|
|
|
|
save_UBL_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
DEPLOY_PROBE();
|
|
|
|
DEPLOY_PROBE();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wait_for_user = true;
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
if (G29_lcd_clicked()) {
|
|
|
|
if (!wait_for_user) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
while (G29_lcd_clicked()) idle();
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
|
|
|
|
STOW_PROBE();
|
|
|
|
STOW_PROBE();
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
location = find_closest_mesh_point_of_type( INVALID, X_Pos, Y_Pos, 1, NULL); // the '1' says we want the location to be relative to the probe
|
|
|
|
location = find_closest_mesh_point_of_type(INVALID, x_pos, y_pos, 1, NULL); // the '1' says we want the location to be relative to the probe
|
|
|
|
if (location.x_index >= 0 && location.y_index >= 0) {
|
|
|
|
if (location.x_index >= 0 && location.y_index >= 0) {
|
|
|
|
xProbe = blm.map_x_index_to_bed_location(location.x_index);
|
|
|
|
xProbe = ubl.map_x_index_to_bed_location(location.x_index);
|
|
|
|
yProbe = blm.map_y_index_to_bed_location(location.y_index);
|
|
|
|
yProbe = ubl.map_y_index_to_bed_location(location.y_index);
|
|
|
|
if (xProbe < MIN_PROBE_X || xProbe > MAX_PROBE_X || yProbe < MIN_PROBE_Y || yProbe > MAX_PROBE_Y) {
|
|
|
|
if (xProbe < MIN_PROBE_X || xProbe > MAX_PROBE_X || yProbe < MIN_PROBE_Y || yProbe > MAX_PROBE_Y) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to probe off the bed.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to probe off the bed.");
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
goto LEAVE;
|
|
|
|
goto LEAVE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
measured_z = probe_pt(xProbe, yProbe, stow_probe, G29_Verbose_Level);
|
|
|
|
measured_z = probe_pt(xProbe, yProbe, stow_probe, g29_verbose_level);
|
|
|
|
z_values[location.x_index][location.y_index] = measured_z + Z_PROBE_OFFSET_FROM_EXTRUDER;
|
|
|
|
z_values[location.x_index][location.y_index] = measured_z + Z_PROBE_OFFSET_FROM_EXTRUDER;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (do_UBL_MESH_Map) blm.display_map(1);
|
|
|
|
if (do_ubl_mesh_map) ubl.display_map(1);
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0);
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0);
|
|
|
|
|
|
|
|
|
|
|
|
LEAVE:
|
|
|
|
LEAVE:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wait_for_user = false;
|
|
|
|
STOW_PROBE();
|
|
|
|
STOW_PROBE();
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
|
|
|
|
|
|
|
|
X_Pos = constrain( X_Pos-X_PROBE_OFFSET_FROM_EXTRUDER, X_MIN_POS, X_MAX_POS);
|
|
|
|
x_pos = constrain(x_pos - (X_PROBE_OFFSET_FROM_EXTRUDER), X_MIN_POS, X_MAX_POS);
|
|
|
|
Y_Pos = constrain( Y_Pos-Y_PROBE_OFFSET_FROM_EXTRUDER, Y_MIN_POS, Y_MAX_POS);
|
|
|
|
y_pos = constrain(y_pos - (Y_PROBE_OFFSET_FROM_EXTRUDER), Y_MIN_POS, Y_MAX_POS);
|
|
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_xy(X_Pos, Y_Pos);
|
|
|
|
do_blocking_move_to_xy(x_pos, y_pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct vector tilt_mesh_based_on_3pts(float pt1, float pt2, float pt3) {
|
|
|
|
vector tilt_mesh_based_on_3pts(float pt1, float pt2, float pt3) {
|
|
|
|
struct vector v1, v2, normal;
|
|
|
|
vector v1, v2, normal;
|
|
|
|
float c, d, t;
|
|
|
|
float c, d, t;
|
|
|
|
int i, j;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
|
|
|
|
@ -799,11 +776,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
// printf("[%f,%f,%f] ", normal.dx, normal.dy, normal.dz);
|
|
|
|
// printf("[%f,%f,%f] ", normal.dx, normal.dy, normal.dz);
|
|
|
|
|
|
|
|
|
|
|
|
normal.dx /= normal.dz; // This code does two things. This vector is normal to the tilted plane.
|
|
|
|
/**
|
|
|
|
normal.dy /= normal.dz; // However, we don't know its direction. We need it to point up. So if
|
|
|
|
* This code does two things. This vector is normal to the tilted plane.
|
|
|
|
normal.dz /= normal.dz; // Z is negative, we need to invert the sign of all components of the vector
|
|
|
|
* However, we don't know its direction. We need it to point up. So if
|
|
|
|
// We also need Z to be unity because we are going to be treating this triangle
|
|
|
|
* Z is negative, we need to invert the sign of all components of the vector
|
|
|
|
// as the sin() and cos() of the bed's tilt
|
|
|
|
* We also need Z to be unity because we are going to be treating this triangle
|
|
|
|
|
|
|
|
* as the sin() and cos() of the bed's tilt
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
normal.dx /= normal.dz;
|
|
|
|
|
|
|
|
normal.dy /= normal.dz;
|
|
|
|
|
|
|
|
normal.dz /= normal.dz;
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// All of 3 of these points should give us the same d constant
|
|
|
|
// All of 3 of these points should give us the same d constant
|
|
|
|
@ -812,25 +794,25 @@
|
|
|
|
d = t + normal.dz * pt1;
|
|
|
|
d = t + normal.dz * pt1;
|
|
|
|
c = d - t;
|
|
|
|
c = d - t;
|
|
|
|
SERIAL_ECHOPGM("d from 1st point: ");
|
|
|
|
SERIAL_ECHOPGM("d from 1st point: ");
|
|
|
|
SERIAL_PROTOCOL_F(d, 6);
|
|
|
|
SERIAL_ECHO_F(d, 6);
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_PROTOCOL_F(c, 6);
|
|
|
|
SERIAL_ECHO_F(c, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
t = normal.dx * ubl_3_point_2_X + normal.dy * ubl_3_point_2_Y;
|
|
|
|
t = normal.dx * ubl_3_point_2_X + normal.dy * ubl_3_point_2_Y;
|
|
|
|
d = t + normal.dz * pt2;
|
|
|
|
d = t + normal.dz * pt2;
|
|
|
|
c = d - t;
|
|
|
|
c = d - t;
|
|
|
|
SERIAL_ECHOPGM("d from 2nd point: ");
|
|
|
|
SERIAL_ECHOPGM("d from 2nd point: ");
|
|
|
|
SERIAL_PROTOCOL_F(d, 6);
|
|
|
|
SERIAL_ECHO_F(d, 6);
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_PROTOCOL_F(c, 6);
|
|
|
|
SERIAL_ECHO_F(c, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
t = normal.dx * ubl_3_point_3_X + normal.dy * ubl_3_point_3_Y;
|
|
|
|
t = normal.dx * ubl_3_point_3_X + normal.dy * ubl_3_point_3_Y;
|
|
|
|
d = t + normal.dz * pt3;
|
|
|
|
d = t + normal.dz * pt3;
|
|
|
|
c = d - t;
|
|
|
|
c = d - t;
|
|
|
|
SERIAL_ECHOPGM("d from 3rd point: ");
|
|
|
|
SERIAL_ECHOPGM("d from 3rd point: ");
|
|
|
|
SERIAL_PROTOCOL_F(d, 6);
|
|
|
|
SERIAL_ECHO_F(d, 6);
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_ECHOPGM(" c: ");
|
|
|
|
SERIAL_PROTOCOL_F(c, 6);
|
|
|
|
SERIAL_ECHO_F(c, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
@ -843,77 +825,68 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
float use_encoder_wheel_to_measure_point() {
|
|
|
|
float use_encoder_wheel_to_measure_point() {
|
|
|
|
UBL_has_control_of_LCD_Panel++;
|
|
|
|
wait_for_user = true;
|
|
|
|
while (!G29_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
|
|
|
while (wait_for_user) { // we need the loop to move the nozzle based on the encoder wheel here!
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
if (G29_encoderDiff != 0) {
|
|
|
|
if (ubl_encoderDiff) {
|
|
|
|
float new_z;
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + 0.01 * float(ubl_encoderDiff));
|
|
|
|
// We define a new variable so we can know ahead of time where we are trying to go.
|
|
|
|
ubl_encoderDiff = 0;
|
|
|
|
// The reason is we want G29_encoderDiff cleared so an interrupt can update it even before the move
|
|
|
|
}
|
|
|
|
// is complete. (So the dial feels responsive to user)
|
|
|
|
}
|
|
|
|
new_z = current_position[Z_AXIS] + 0.01 * float(G29_encoderDiff);
|
|
|
|
|
|
|
|
G29_encoderDiff = 0;
|
|
|
|
|
|
|
|
do_blocking_move_to_z(new_z);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
while (G29_lcd_clicked()) idle(); // debounce and wait
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel--;
|
|
|
|
|
|
|
|
return current_position[Z_AXIS];
|
|
|
|
return current_position[Z_AXIS];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
float measure_business_card_thickness(float Height_Value) {
|
|
|
|
float measure_business_card_thickness(float height_value) {
|
|
|
|
float Z1, Z2;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel++;
|
|
|
|
ubl_has_control_of_lcd_panel++;
|
|
|
|
save_UBL_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPGM("Place Shim Under Nozzle and Perform Measurement.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Place Shim Under Nozzle and Perform Measurement.");
|
|
|
|
do_blocking_move_to_z(Height_Value);
|
|
|
|
do_blocking_move_to_z(height_value);
|
|
|
|
do_blocking_move_to_xy((float(X_MAX_POS) - float(X_MIN_POS)) / 2.0, (float(Y_MAX_POS) - float(Y_MIN_POS)) / 2.0);
|
|
|
|
do_blocking_move_to_xy((float(X_MAX_POS) - float(X_MIN_POS)) / 2.0, (float(Y_MAX_POS) - float(Y_MIN_POS)) / 2.0);
|
|
|
|
//, min( planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS])/2.0);
|
|
|
|
//, min( planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS])/2.0);
|
|
|
|
|
|
|
|
|
|
|
|
Z1 = use_encoder_wheel_to_measure_point();
|
|
|
|
const float Z1 = use_encoder_wheel_to_measure_point();
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + SIZE_OF_LITTLE_RAISE);
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + SIZE_OF_LITTLE_RAISE);
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPGM("Remove Shim and Measure Bed Height.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Remove Shim and Measure Bed Height.");
|
|
|
|
Z2 = use_encoder_wheel_to_measure_point();
|
|
|
|
const float Z2 = use_encoder_wheel_to_measure_point();
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + SIZE_OF_LITTLE_RAISE);
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + SIZE_OF_LITTLE_RAISE);
|
|
|
|
|
|
|
|
|
|
|
|
if (G29_Verbose_Level > 1) {
|
|
|
|
if (g29_verbose_level > 1) {
|
|
|
|
SERIAL_ECHOPGM("Business Card is: ");
|
|
|
|
SERIAL_PROTOCOLPGM("Business Card is: ");
|
|
|
|
SERIAL_PROTOCOL_F(abs(Z1 - Z2), 6);
|
|
|
|
SERIAL_PROTOCOL_F(abs(Z1 - Z2), 6);
|
|
|
|
SERIAL_PROTOCOLLNPGM("mm thick.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("mm thick.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
return abs(Z1 - Z2);
|
|
|
|
return abs(Z1 - Z2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void manually_probe_remaining_mesh(float X_Pos, float Y_Pos, float z_clearance, float card_thickness, bool do_UBL_MESH_Map) {
|
|
|
|
void manually_probe_remaining_mesh(float x_pos, float y_pos, float z_clearance, float card_thickness, bool do_ubl_mesh_map) {
|
|
|
|
mesh_index_pair location;
|
|
|
|
mesh_index_pair location;
|
|
|
|
float last_x, last_y, dx, dy,
|
|
|
|
float last_x, last_y, dx, dy,
|
|
|
|
xProbe, yProbe;
|
|
|
|
xProbe, yProbe;
|
|
|
|
unsigned long cnt;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel++;
|
|
|
|
ubl_has_control_of_lcd_panel++;
|
|
|
|
last_x = last_y = -9999.99;
|
|
|
|
last_x = last_y = -9999.99;
|
|
|
|
save_UBL_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
|
|
|
do_blocking_move_to_z(z_clearance);
|
|
|
|
do_blocking_move_to_z(z_clearance);
|
|
|
|
do_blocking_move_to_xy(X_Pos, Y_Pos);
|
|
|
|
do_blocking_move_to_xy(x_pos, y_pos);
|
|
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
if (do_UBL_MESH_Map) blm.display_map(1);
|
|
|
|
if (do_ubl_mesh_map) ubl.display_map(1);
|
|
|
|
|
|
|
|
|
|
|
|
location = find_closest_mesh_point_of_type(INVALID, X_Pos, Y_Pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
location = find_closest_mesh_point_of_type(INVALID, x_pos, y_pos, 0, NULL); // The '0' says we want to use the nozzle's position
|
|
|
|
// It doesn't matter if the probe can not reach the
|
|
|
|
// It doesn't matter if the probe can not reach the
|
|
|
|
// NAN location. This is a manual probe.
|
|
|
|
// NAN location. This is a manual probe.
|
|
|
|
if (location.x_index < 0 && location.y_index < 0) continue;
|
|
|
|
if (location.x_index < 0 && location.y_index < 0) continue;
|
|
|
|
|
|
|
|
|
|
|
|
xProbe = blm.map_x_index_to_bed_location(location.x_index);
|
|
|
|
xProbe = ubl.map_x_index_to_bed_location(location.x_index);
|
|
|
|
yProbe = blm.map_y_index_to_bed_location(location.y_index);
|
|
|
|
yProbe = ubl.map_y_index_to_bed_location(location.y_index);
|
|
|
|
if (xProbe < (X_MIN_POS) || xProbe > (X_MAX_POS) || yProbe < (Y_MIN_POS) || yProbe > (Y_MAX_POS)) {
|
|
|
|
if (xProbe < (X_MIN_POS) || xProbe > (X_MAX_POS) || yProbe < (Y_MIN_POS) || yProbe > (Y_MAX_POS)) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to probe off the bed.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to probe off the bed.");
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
goto LEAVE;
|
|
|
|
goto LEAVE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -929,124 +902,120 @@
|
|
|
|
last_y = yProbe;
|
|
|
|
last_y = yProbe;
|
|
|
|
do_blocking_move_to_xy(xProbe, yProbe);
|
|
|
|
do_blocking_move_to_xy(xProbe, yProbe);
|
|
|
|
|
|
|
|
|
|
|
|
while (!G29_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here!
|
|
|
|
wait_for_user = true;
|
|
|
|
|
|
|
|
while (wait_for_user) { // we need the loop to move the nozzle based on the encoder wheel here!
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
if (G29_encoderDiff) {
|
|
|
|
if (ubl_encoderDiff) {
|
|
|
|
float new_z;
|
|
|
|
do_blocking_move_to_z(current_position[Z_AXIS] + float(ubl_encoderDiff) / 100.0);
|
|
|
|
// We define a new variable so we can know ahead of time where we are trying to go.
|
|
|
|
ubl_encoderDiff = 0;
|
|
|
|
// The reason is we want G29_encoderDiff cleared so an interrupt can update it even before the move
|
|
|
|
|
|
|
|
// is complete. (So the dial feels responsive to user)
|
|
|
|
|
|
|
|
new_z = current_position[Z_AXIS] + float(G29_encoderDiff) / 100.0;
|
|
|
|
|
|
|
|
G29_encoderDiff = 0;
|
|
|
|
|
|
|
|
do_blocking_move_to_z(new_z);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
cnt = millis();
|
|
|
|
const millis_t nxt = millis() + 1500L;
|
|
|
|
while (G29_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
while (ubl_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
if (millis() - cnt > 1500L) {
|
|
|
|
if (ELAPSED(millis(), nxt)) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("\nMesh only partially populated.");
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
while (G29_lcd_clicked()) idle();
|
|
|
|
while (ubl_lcd_clicked()) idle();
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
z_values[location.x_index][location.y_index] = current_position[Z_AXIS] - card_thickness;
|
|
|
|
z_values[location.x_index][location.y_index] = current_position[Z_AXIS] - card_thickness;
|
|
|
|
if (G29_Verbose_Level > 2) {
|
|
|
|
if (g29_verbose_level > 2) {
|
|
|
|
SERIAL_PROTOCOL("Mesh Point Measured at: ");
|
|
|
|
SERIAL_PROTOCOL("Mesh Point Measured at: ");
|
|
|
|
SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6);
|
|
|
|
SERIAL_PROTOCOL_F(z_values[location.x_index][location.y_index], 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0);
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0);
|
|
|
|
|
|
|
|
|
|
|
|
if (do_UBL_MESH_Map) blm.display_map(1);
|
|
|
|
if (do_ubl_mesh_map) ubl.display_map(1);
|
|
|
|
|
|
|
|
|
|
|
|
LEAVE:
|
|
|
|
LEAVE:
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_xy(X_Pos, Y_Pos);
|
|
|
|
do_blocking_move_to_xy(x_pos, y_pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool G29_Parameter_Parsing() {
|
|
|
|
bool g29_parameter_parsing() {
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
lcd_setstatus("Doing G29 UBL !", true);
|
|
|
|
lcd_setstatus("Doing G29 UBL !", true);
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
X_Pos = current_position[X_AXIS];
|
|
|
|
x_pos = current_position[X_AXIS];
|
|
|
|
Y_Pos = current_position[Y_AXIS];
|
|
|
|
y_pos = current_position[Y_AXIS];
|
|
|
|
X_Flag = Y_Flag = Repeat_Flag = UBL_OK;
|
|
|
|
x_flag = y_flag = repeat_flag = false;
|
|
|
|
Constant = 0.0;
|
|
|
|
constant = 0.0;
|
|
|
|
Repetition_Cnt = 1;
|
|
|
|
repetition_cnt = 1;
|
|
|
|
|
|
|
|
|
|
|
|
if ((X_Flag = code_seen('X'))) {
|
|
|
|
if ((x_flag = code_seen('X'))) {
|
|
|
|
X_Pos = code_value_float();
|
|
|
|
x_pos = code_value_float();
|
|
|
|
if (X_Pos < X_MIN_POS || X_Pos > X_MAX_POS) {
|
|
|
|
if (x_pos < X_MIN_POS || x_pos > X_MAX_POS) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid X location specified.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid X location specified.\n");
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((Y_Flag = code_seen('Y'))) {
|
|
|
|
if ((y_flag = code_seen('Y'))) {
|
|
|
|
Y_Pos = code_value_float();
|
|
|
|
y_pos = code_value_float();
|
|
|
|
if (Y_Pos < Y_MIN_POS || Y_Pos > Y_MAX_POS) {
|
|
|
|
if (y_pos < Y_MIN_POS || y_pos > Y_MAX_POS) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Y location specified.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Y location specified.\n");
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (X_Flag != Y_Flag) {
|
|
|
|
if (x_flag != y_flag) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Both X & Y locations must be specified.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Both X & Y locations must be specified.\n");
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
G29_Verbose_Level = 0;
|
|
|
|
g29_verbose_level = 0;
|
|
|
|
if (code_seen('V')) {
|
|
|
|
if (code_seen('V')) {
|
|
|
|
G29_Verbose_Level = code_value_int();
|
|
|
|
g29_verbose_level = code_value_int();
|
|
|
|
if (G29_Verbose_Level < 0 || G29_Verbose_Level > 4) {
|
|
|
|
if (g29_verbose_level < 0 || g29_verbose_level > 4) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Verbose Level specified. (0-4)\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Verbose Level specified. (0-4)\n");
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('A')) { // Activate the Unified Bed Leveling System
|
|
|
|
if (code_seen('A')) { // Activate the Unified Bed Leveling System
|
|
|
|
blm.state.active = 1;
|
|
|
|
ubl.state.active = 1;
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System activated.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System activated.\n");
|
|
|
|
blm.store_state();
|
|
|
|
ubl.store_state();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((C_Flag = code_seen('C')) && code_has_value())
|
|
|
|
if ((c_flag = code_seen('C')) && code_has_value())
|
|
|
|
Constant = code_value_float();
|
|
|
|
constant = code_value_float();
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('D')) { // Disable the Unified Bed Leveling System
|
|
|
|
if (code_seen('D')) { // Disable the Unified Bed Leveling System
|
|
|
|
blm.state.active = 0;
|
|
|
|
ubl.state.active = 0;
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System de-activated.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling System de-activated.\n");
|
|
|
|
blm.store_state();
|
|
|
|
ubl.store_state();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (code_seen('F')) {
|
|
|
|
if (code_seen('F')) {
|
|
|
|
blm.state.G29_Correction_Fade_Height = 10.00;
|
|
|
|
ubl.state.g29_correction_fade_height = 10.00;
|
|
|
|
if (code_has_value()) {
|
|
|
|
if (code_has_value()) {
|
|
|
|
blm.state.G29_Correction_Fade_Height = code_value_float();
|
|
|
|
ubl.state.g29_correction_fade_height = code_value_float();
|
|
|
|
blm.state.G29_Fade_Height_Multiplier = 1.0 / blm.state.G29_Correction_Fade_Height;
|
|
|
|
ubl.state.g29_fade_height_multiplier = 1.0 / ubl.state.g29_correction_fade_height;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (blm.state.G29_Correction_Fade_Height<0.0 || blm.state.G29_Correction_Fade_Height>100.0) {
|
|
|
|
if (ubl.state.g29_correction_fade_height < 0.0 || ubl.state.g29_correction_fade_height > 100.0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Bed Level Correction Fade Height Not Plausable.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Bed Level Correction Fade Height Not Plausible.\n");
|
|
|
|
blm.state.G29_Correction_Fade_Height = 10.00;
|
|
|
|
ubl.state.g29_correction_fade_height = 10.00;
|
|
|
|
blm.state.G29_Fade_Height_Multiplier = 1.0 / blm.state.G29_Correction_Fade_Height;
|
|
|
|
ubl.state.g29_fade_height_multiplier = 1.0 / ubl.state.g29_correction_fade_height;
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((Repeat_Flag = code_seen('R'))) {
|
|
|
|
if ((repeat_flag = code_seen('R'))) {
|
|
|
|
Repetition_Cnt = code_has_value() ? code_value_int() : 9999;
|
|
|
|
repetition_cnt = code_has_value() ? code_value_int() : 9999;
|
|
|
|
if (Repetition_Cnt < 1) {
|
|
|
|
if (repetition_cnt < 1) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Repetition count.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Invalid Repetition count.\n");
|
|
|
|
return UBL_ERR;
|
|
|
|
return UBL_ERR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1081,95 +1050,98 @@
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int UBL_state_at_invokation = 0,
|
|
|
|
static int ubl_state_at_invocation = 0,
|
|
|
|
UBL_state_recursion_chk = 0;
|
|
|
|
ubl_state_recursion_chk = 0;
|
|
|
|
|
|
|
|
|
|
|
|
void save_UBL_active_state_and_disable() {
|
|
|
|
void save_ubl_active_state_and_disable() {
|
|
|
|
UBL_state_recursion_chk++;
|
|
|
|
ubl_state_recursion_chk++;
|
|
|
|
if (UBL_state_recursion_chk != 1) {
|
|
|
|
if (ubl_state_recursion_chk != 1) {
|
|
|
|
SERIAL_ECHOLNPGM("save_UBL_active_state_and_disabled() called multiple times in a row.");
|
|
|
|
SERIAL_ECHOLNPGM("save_ubl_active_state_and_disabled() called multiple times in a row.");
|
|
|
|
lcd_setstatus("save_UBL_active() error", true);
|
|
|
|
lcd_setstatus("save_UBL_active() error", true);
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
UBL_state_at_invokation = blm.state.active;
|
|
|
|
ubl_state_at_invocation = ubl.state.active;
|
|
|
|
blm.state.active = 0;
|
|
|
|
ubl.state.active = 0;
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void restore_UBL_active_state_and_leave() {
|
|
|
|
void restore_ubl_active_state_and_leave() {
|
|
|
|
if (--UBL_state_recursion_chk) {
|
|
|
|
if (--ubl_state_recursion_chk) {
|
|
|
|
SERIAL_ECHOLNPGM("restore_UBL_active_state_and_leave() called too many times.");
|
|
|
|
SERIAL_ECHOLNPGM("restore_ubl_active_state_and_leave() called too many times.");
|
|
|
|
lcd_setstatus("restore_UBL_active() error", true);
|
|
|
|
lcd_setstatus("restore_UBL_active() error", true);
|
|
|
|
lcd_quick_feedback();
|
|
|
|
lcd_quick_feedback();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
blm.state.active = UBL_state_at_invokation;
|
|
|
|
ubl.state.active = ubl_state_at_invocation;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void g29_print_line(bool longer=false) {
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM(" -------------------------------------");
|
|
|
|
|
|
|
|
if (longer) SERIAL_PROTOCOLPGM("-------------------");
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPGM(" <----<<<");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Much of the 'What?' command can be eliminated. But until we are fully debugged, it is
|
|
|
|
* Much of the 'What?' command can be eliminated. But until we are fully debugged, it is
|
|
|
|
* good to have the extra information. Soon... we prune this to just a few items
|
|
|
|
* good to have the extra information. Soon... we prune this to just a few items
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
void G29_What_Command() {
|
|
|
|
void g29_what_command() {
|
|
|
|
int k, i;
|
|
|
|
int k = E2END - ubl_eeprom_start;
|
|
|
|
k = E2END - Unified_Bed_Leveling_EEPROM_start;
|
|
|
|
statistics_flag++;
|
|
|
|
Statistics_Flag++;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM("Version #4: 10/30/2016 branch \n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Version #4: 10/30/2016 branch");
|
|
|
|
SERIAL_PROTOCOLPGM("Unified Bed Leveling System ");
|
|
|
|
SERIAL_PROTOCOLPGM("Unified Bed Leveling System ");
|
|
|
|
if (blm.state.active)
|
|
|
|
if (ubl.state.active)
|
|
|
|
SERIAL_PROTOCOLPGM("Active.");
|
|
|
|
SERIAL_PROTOCOLPGM("Active.");
|
|
|
|
else
|
|
|
|
else
|
|
|
|
SERIAL_PROTOCOLPGM("Inactive.");
|
|
|
|
SERIAL_PROTOCOLPGM("Inactive.");
|
|
|
|
SERIAL_PROTOCOLLNPGM(" ------------------------------------- <----<<<"); // These arrows are just to help me
|
|
|
|
g29_print_line(); // These are just to help me find this info buried in the clutter
|
|
|
|
|
|
|
|
|
|
|
|
if (blm.state.EEPROM_storage_slot == 0xFFFF) {
|
|
|
|
if (ubl.state.eeprom_storage_slot == 0xFFFF) {
|
|
|
|
SERIAL_PROTOCOLPGM("No Mesh Loaded.");
|
|
|
|
SERIAL_PROTOCOLPGM("No Mesh Loaded.");
|
|
|
|
SERIAL_PROTOCOLLNPGM(" ------------------------------------- <----<<<"); // These arrows are just to help me
|
|
|
|
g29_print_line(); // These are just to help me find this info buried in the clutter
|
|
|
|
// find this info buried in the clutter
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
SERIAL_PROTOCOLPGM("Mesh: ");
|
|
|
|
SERIAL_PROTOCOLPGM("Mesh: ");
|
|
|
|
prt_hex_word(blm.state.EEPROM_storage_slot);
|
|
|
|
prt_hex_word(ubl.state.eeprom_storage_slot);
|
|
|
|
SERIAL_PROTOCOLPGM(" Loaded. ");
|
|
|
|
SERIAL_PROTOCOLPGM(" Loaded. ");
|
|
|
|
SERIAL_PROTOCOLLNPGM(" -------------------------------------------------------- <----<<<"); // These arrows are just to help me
|
|
|
|
g29_print_line(true); // These are just to help me find this info buried in the clutter
|
|
|
|
// find this info buried in the clutter
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOPAIR("\nG29_Correction_Fade_Height : ", blm.state.G29_Correction_Fade_Height );
|
|
|
|
SERIAL_PROTOCOLPAIR("\ng29_correction_fade_height : ", ubl.state.g29_correction_fade_height );
|
|
|
|
SERIAL_PROTOCOLPGM(" ------------------------------------- <----<<< \n"); // These arrows are just to help me
|
|
|
|
g29_print_line(); // These are just to help me find this info buried in the clutter
|
|
|
|
// find this info buried in the clutter
|
|
|
|
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("z_offset: ");
|
|
|
|
SERIAL_PROTOCOLPGM("z_offset: ");
|
|
|
|
SERIAL_PROTOCOL_F(blm.state.z_offset, 6);
|
|
|
|
SERIAL_PROTOCOL_F(ubl.state.z_offset, 6);
|
|
|
|
SERIAL_PROTOCOLLNPGM(" ------------------------------------------------------------ <----<<<");
|
|
|
|
g29_print_line(true); // These are just to help me find this info buried in the clutter
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM("X-Axis Mesh Points at: ");
|
|
|
|
SERIAL_PROTOCOLPGM("X-Axis Mesh Points at: ");
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
for (uint8_t i = 0; i < UBL_MESH_NUM_X_POINTS; i++) {
|
|
|
|
SERIAL_PROTOCOL_F( blm.map_x_index_to_bed_location(i), 1);
|
|
|
|
SERIAL_PROTOCOL_F( ubl.map_x_index_to_bed_location(i), 1);
|
|
|
|
SERIAL_PROTOCOLPGM(" ");
|
|
|
|
SERIAL_PROTOCOLPGM(" ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_PROTOCOLPGM("Y-Axis Mesh Points at: ");
|
|
|
|
SERIAL_PROTOCOLPGM("Y-Axis Mesh Points at: ");
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_Y_POINTS; i++) {
|
|
|
|
for (uint8_t i = 0; i < UBL_MESH_NUM_Y_POINTS; i++) {
|
|
|
|
SERIAL_PROTOCOL_F( blm.map_y_index_to_bed_location(i), 1);
|
|
|
|
SERIAL_PROTOCOL_F( ubl.map_y_index_to_bed_location(i), 1);
|
|
|
|
SERIAL_PROTOCOLPGM(" ");
|
|
|
|
SERIAL_PROTOCOLPGM(" ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
#if HAS_KILL
|
|
|
|
#if HAS_KILL
|
|
|
|
SERIAL_ECHOPAIR("Kill pin on :", KILL_PIN);
|
|
|
|
SERIAL_PROTOCOLPAIR("Kill pin on :", KILL_PIN);
|
|
|
|
SERIAL_ECHOLNPAIR(" state:", READ(KILL_PIN));
|
|
|
|
SERIAL_PROTOCOLLNPAIR(" state:", READ(KILL_PIN));
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOLNPAIR("UBL_state_at_invokation :", UBL_state_at_invokation);
|
|
|
|
SERIAL_PROTOCOLLNPAIR("ubl_state_at_invocation :", ubl_state_at_invocation);
|
|
|
|
SERIAL_ECHOLNPAIR("UBL_state_recursion_chk :", UBL_state_recursion_chk);
|
|
|
|
SERIAL_PROTOCOLLNPAIR("ubl_state_recursion_chk :", ubl_state_recursion_chk);
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_PROTOCOLPGM("Free EEPROM space starts at: 0x");
|
|
|
|
SERIAL_PROTOCOLPGM("Free EEPROM space starts at: 0x");
|
|
|
|
prt_hex_word(Unified_Bed_Leveling_EEPROM_start);
|
|
|
|
prt_hex_word(ubl_eeprom_start);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
@ -1178,7 +1150,7 @@
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLLNPAIR("sizeof(blm) : ", (int)sizeof(blm));
|
|
|
|
SERIAL_PROTOCOLLNPAIR("sizeof(ubl) : ", (int)sizeof(ubl));
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(z_values));
|
|
|
|
SERIAL_PROTOCOLLNPAIR("z_value[][] size: ", (int)sizeof(z_values));
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
@ -1190,45 +1162,45 @@
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM("EEPROM can hold 0x");
|
|
|
|
SERIAL_PROTOCOLPGM("EEPROM can hold 0x");
|
|
|
|
prt_hex_word(k / sizeof(z_values));
|
|
|
|
prt_hex_word(k / sizeof(z_values));
|
|
|
|
SERIAL_PROTOCOLPGM(" meshes. \n");
|
|
|
|
SERIAL_PROTOCOLLNPGM(" meshes.");
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_PROTOCOLPGM("sizeof(stat) :");
|
|
|
|
SERIAL_PROTOCOLPGM("sizeof(stat) :");
|
|
|
|
prt_hex_word(sizeof(blm.state));
|
|
|
|
prt_hex_word(sizeof(ubl.state));
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_NUM_X_POINTS ", UBL_MESH_NUM_X_POINTS);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_X_POINTS ", UBL_MESH_NUM_X_POINTS);
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_NUM_Y_POINTS ", UBL_MESH_NUM_Y_POINTS);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_NUM_Y_POINTS ", UBL_MESH_NUM_Y_POINTS);
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_MIN_X ", UBL_MESH_MIN_X);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_X ", UBL_MESH_MIN_X);
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_MIN_Y ", UBL_MESH_MIN_Y);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MIN_Y ", UBL_MESH_MIN_Y);
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_MAX_X ", UBL_MESH_MAX_X);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_X ", UBL_MESH_MAX_X);
|
|
|
|
SERIAL_ECHOPAIR("\nUBL_MESH_MAX_Y ", UBL_MESH_MAX_Y);
|
|
|
|
SERIAL_PROTOCOLPAIR("\nUBL_MESH_MAX_Y ", UBL_MESH_MAX_Y);
|
|
|
|
SERIAL_ECHOPGM("\nMESH_X_DIST ");
|
|
|
|
SERIAL_PROTOCOLPGM("\nMESH_X_DIST ");
|
|
|
|
SERIAL_PROTOCOL_F(MESH_X_DIST, 6);
|
|
|
|
SERIAL_PROTOCOL_F(MESH_X_DIST, 6);
|
|
|
|
SERIAL_ECHOPGM("\nMESH_Y_DIST ");
|
|
|
|
SERIAL_PROTOCOLPGM("\nMESH_Y_DIST ");
|
|
|
|
SERIAL_PROTOCOL_F(MESH_Y_DIST, 6);
|
|
|
|
SERIAL_PROTOCOL_F(MESH_Y_DIST, 6);
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(block_t): ", (int)sizeof(block_t));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(block_t): ", (int)sizeof(block_t));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(planner.block_buffer): ", (int)sizeof(planner.block_buffer));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(planner.block_buffer): ", (int)sizeof(planner.block_buffer));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(char): ", (int)sizeof(char));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(char): ", (int)sizeof(char));
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(unsigned char): ", (int)sizeof(unsigned char));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(unsigned char): ", (int)sizeof(unsigned char));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(int): ", (int)sizeof(int));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(int): ", (int)sizeof(int));
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(unsigned int): ", (int)sizeof(unsigned int));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(unsigned int): ", (int)sizeof(unsigned int));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(long): ", (int)sizeof(long));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(long): ", (int)sizeof(long));
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(unsigned long int): ", (int)sizeof(unsigned long int));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(unsigned long int): ", (int)sizeof(unsigned long int));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(float): ", (int)sizeof(float));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(float): ", (int)sizeof(float));
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(double): ", (int)sizeof(double));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(double): ", (int)sizeof(double));
|
|
|
|
SERIAL_ECHOPAIR("\nsizeof(void *): ", (int)sizeof(void *));
|
|
|
|
SERIAL_PROTOCOLPAIR("\nsizeof(void *): ", (int)sizeof(void *));
|
|
|
|
struct pf { void *p_f(); } ptr_func;
|
|
|
|
struct pf { void *p_f(); } ptr_func;
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(struct pf): ", (int)sizeof(pf));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(struct pf): ", (int)sizeof(pf));
|
|
|
|
SERIAL_ECHOPAIR(" sizeof(void *()): ", (int)sizeof(ptr_func));
|
|
|
|
SERIAL_PROTOCOLPAIR(" sizeof(void *()): ", (int)sizeof(ptr_func));
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
|
|
|
|
|
|
|
|
if (!blm.sanity_check())
|
|
|
|
if (!ubl.sanity_check())
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling sanity checks passed.");
|
|
|
|
SERIAL_PROTOCOLLNPGM("Unified Bed Leveling sanity checks passed.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -1236,17 +1208,17 @@
|
|
|
|
* When we are fully debugged, the EEPROM dump command will get deleted also. But
|
|
|
|
* When we are fully debugged, the EEPROM dump command will get deleted also. But
|
|
|
|
* right now, it is good to have the extra information. Soon... we prune this.
|
|
|
|
* right now, it is good to have the extra information. Soon... we prune this.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
void G29_EEPROM_Dump() {
|
|
|
|
void g29_eeprom_dump() {
|
|
|
|
unsigned char cccc;
|
|
|
|
unsigned char cccc;
|
|
|
|
int i, j, kkkk;
|
|
|
|
uint16_t kkkk;
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
SERIAL_ECHO_START;
|
|
|
|
SERIAL_ECHOPGM("EEPROM Dump:\n");
|
|
|
|
SERIAL_ECHOLNPGM("EEPROM Dump:");
|
|
|
|
for (i = 0; i < E2END + 1; i += 16) {
|
|
|
|
for (uint16_t i = 0; i < E2END + 1; i += 16) {
|
|
|
|
if (i & 0x3 == 0) idle();
|
|
|
|
if (i & 0x3 == 0) idle();
|
|
|
|
prt_hex_word(i);
|
|
|
|
prt_hex_word(i);
|
|
|
|
SERIAL_ECHOPGM(": ");
|
|
|
|
SERIAL_ECHOPGM(": ");
|
|
|
|
for (j = 0; j < 16; j++) {
|
|
|
|
for (uint16_t j = 0; j < 16; j++) {
|
|
|
|
kkkk = i + j;
|
|
|
|
kkkk = i + j;
|
|
|
|
eeprom_read_block(&cccc, (void *)kkkk, 1);
|
|
|
|
eeprom_read_block(&cccc, (void *)kkkk, 1);
|
|
|
|
prt_hex_byte(cccc);
|
|
|
|
prt_hex_byte(cccc);
|
|
|
|
@ -1262,41 +1234,40 @@
|
|
|
|
* When we are fully debugged, this may go away. But there are some valid
|
|
|
|
* When we are fully debugged, this may go away. But there are some valid
|
|
|
|
* use cases for the users. So we can wait and see what to do with it.
|
|
|
|
* use cases for the users. So we can wait and see what to do with it.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
void G29_Kompare_Current_Mesh_to_Stored_Mesh() {
|
|
|
|
void g29_compare_current_mesh_to_stored_mesh() {
|
|
|
|
float tmp_z_values[UBL_MESH_NUM_X_POINTS][UBL_MESH_NUM_Y_POINTS];
|
|
|
|
float tmp_z_values[UBL_MESH_NUM_X_POINTS][UBL_MESH_NUM_Y_POINTS];
|
|
|
|
int i, j, k;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!code_has_value()) {
|
|
|
|
if (!code_has_value()) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Mesh # required.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Mesh # required.\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Storage_Slot = code_value_int();
|
|
|
|
storage_slot = code_value_int();
|
|
|
|
|
|
|
|
|
|
|
|
k = E2END - sizeof(blm.state);
|
|
|
|
uint16_t k = E2END - sizeof(ubl.state),
|
|
|
|
j = (k - Unified_Bed_Leveling_EEPROM_start) / sizeof(tmp_z_values);
|
|
|
|
j = (k - ubl_eeprom_start) / sizeof(tmp_z_values);
|
|
|
|
|
|
|
|
|
|
|
|
if (Storage_Slot < 0 || Storage_Slot > j || Unified_Bed_Leveling_EEPROM_start <= 0) {
|
|
|
|
if (storage_slot < 0 || storage_slot > j || ubl_eeprom_start <= 0) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available for use.\n");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
j = k - (Storage_Slot + 1) * sizeof(tmp_z_values);
|
|
|
|
j = k - (storage_slot + 1) * sizeof(tmp_z_values);
|
|
|
|
eeprom_read_block((void *)&tmp_z_values, (void *)j, sizeof(tmp_z_values));
|
|
|
|
eeprom_read_block((void *)&tmp_z_values, (void *)j, sizeof(tmp_z_values));
|
|
|
|
|
|
|
|
|
|
|
|
SERIAL_ECHOPAIR("Subtracting Mesh ", Storage_Slot);
|
|
|
|
SERIAL_ECHOPAIR("Subtracting Mesh ", storage_slot);
|
|
|
|
SERIAL_PROTOCOLPGM(" loaded from EEPROM address "); // Soon, we can remove the extra clutter of printing
|
|
|
|
SERIAL_PROTOCOLPGM(" loaded from EEPROM address "); // Soon, we can remove the extra clutter of printing
|
|
|
|
prt_hex_word(j); // the address in the EEPROM where the Mesh is stored.
|
|
|
|
prt_hex_word(j); // the address in the EEPROM where the Mesh is stored.
|
|
|
|
SERIAL_EOL;
|
|
|
|
SERIAL_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < UBL_MESH_NUM_X_POINTS; i++)
|
|
|
|
for (uint8_t x = 0; x < UBL_MESH_NUM_X_POINTS; x++)
|
|
|
|
for (j = 0; j < UBL_MESH_NUM_Y_POINTS; j++)
|
|
|
|
for (uint8_t y = 0; y < UBL_MESH_NUM_Y_POINTS; y++)
|
|
|
|
z_values[i][j] = z_values[i][j] - tmp_z_values[i][j];
|
|
|
|
z_values[x][y] = z_values[x][y] - tmp_z_values[x][y];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
mesh_index_pair find_closest_mesh_point_of_type(Mesh_Point_Type type, float X, float Y, bool probe_as_reference, unsigned int bits[16]) {
|
|
|
|
mesh_index_pair find_closest_mesh_point_of_type(MeshPointType type, float X, float Y, bool probe_as_reference, unsigned int bits[16]) {
|
|
|
|
int i, j;
|
|
|
|
int i, j;
|
|
|
|
float f, px, py, mx, my, dx, dy, closest = 99999.99;
|
|
|
|
float f, px, py, mx, my, dx, dy, closest = 99999.99,
|
|
|
|
float current_x, current_y, distance;
|
|
|
|
current_x, current_y, distance;
|
|
|
|
mesh_index_pair return_val;
|
|
|
|
mesh_index_pair return_val;
|
|
|
|
|
|
|
|
|
|
|
|
return_val.x_index = return_val.y_index = -1;
|
|
|
|
return_val.x_index = return_val.y_index = -1;
|
|
|
|
@ -1321,8 +1292,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
// We only get here if we found a Mesh Point of the specified type
|
|
|
|
// We only get here if we found a Mesh Point of the specified type
|
|
|
|
|
|
|
|
|
|
|
|
mx = blm.map_x_index_to_bed_location(i); // Check if we can probe this mesh location
|
|
|
|
mx = ubl.map_x_index_to_bed_location(i); // Check if we can probe this mesh location
|
|
|
|
my = blm.map_y_index_to_bed_location(j);
|
|
|
|
my = ubl.map_y_index_to_bed_location(j);
|
|
|
|
|
|
|
|
|
|
|
|
// If we are using the probe as the reference there are some locations we can't get to.
|
|
|
|
// If we are using the probe as the reference there are some locations we can't get to.
|
|
|
|
// We prune these out of the list and ignore them until the next Phase where we do the
|
|
|
|
// We prune these out of the list and ignore them until the next Phase where we do the
|
|
|
|
@ -1352,13 +1323,13 @@
|
|
|
|
return return_val;
|
|
|
|
return return_val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void fine_tune_mesh(float X_Pos, float Y_Pos, float Height_Value, bool do_UBL_MESH_Map) {
|
|
|
|
void fine_tune_mesh(float x_pos, float y_pos, bool do_ubl_mesh_map) {
|
|
|
|
mesh_index_pair location;
|
|
|
|
mesh_index_pair location;
|
|
|
|
float xProbe, yProbe, new_z;
|
|
|
|
float xProbe, yProbe;
|
|
|
|
uint16_t i, not_done[16];
|
|
|
|
uint16_t i, not_done[16];
|
|
|
|
long round_off;
|
|
|
|
int32_t round_off;
|
|
|
|
|
|
|
|
|
|
|
|
save_UBL_active_state_and_disable();
|
|
|
|
save_ubl_active_state_and_disable();
|
|
|
|
memset(not_done, 0xFF, sizeof(not_done));
|
|
|
|
memset(not_done, 0xFF, sizeof(not_done));
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
@ -1366,11 +1337,11 @@
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_xy(X_Pos, Y_Pos);
|
|
|
|
do_blocking_move_to_xy(x_pos, y_pos);
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
if (do_UBL_MESH_Map) blm.display_map(1);
|
|
|
|
if (do_ubl_mesh_map) ubl.display_map(1);
|
|
|
|
|
|
|
|
|
|
|
|
location = find_closest_mesh_point_of_type( SET_IN_BITMAP, X_Pos, Y_Pos, 0, not_done); // The '0' says we want to use the nozzle's position
|
|
|
|
location = find_closest_mesh_point_of_type( SET_IN_BITMAP, x_pos, y_pos, 0, not_done); // The '0' says we want to use the nozzle's position
|
|
|
|
// It doesn't matter if the probe can not reach this
|
|
|
|
// It doesn't matter if the probe can not reach this
|
|
|
|
// location. This is a manual edit of the Mesh Point.
|
|
|
|
// location. This is a manual edit of the Mesh Point.
|
|
|
|
if (location.x_index < 0 && location.y_index < 0) continue; // abort if we can't find any more points.
|
|
|
|
if (location.x_index < 0 && location.y_index < 0) continue; // abort if we can't find any more points.
|
|
|
|
@ -1378,21 +1349,21 @@
|
|
|
|
bit_clear(not_done, location.x_index, location.y_index); // Mark this location as 'adjusted' so we will find a
|
|
|
|
bit_clear(not_done, location.x_index, location.y_index); // Mark this location as 'adjusted' so we will find a
|
|
|
|
// different location the next time through the loop
|
|
|
|
// different location the next time through the loop
|
|
|
|
|
|
|
|
|
|
|
|
xProbe = blm.map_x_index_to_bed_location(location.x_index);
|
|
|
|
xProbe = ubl.map_x_index_to_bed_location(location.x_index);
|
|
|
|
yProbe = blm.map_y_index_to_bed_location(location.y_index);
|
|
|
|
yProbe = ubl.map_y_index_to_bed_location(location.y_index);
|
|
|
|
if (xProbe < X_MIN_POS || xProbe > X_MAX_POS || yProbe < Y_MIN_POS || yProbe > Y_MAX_POS) { // In theory, we don't need this check.
|
|
|
|
if (xProbe < X_MIN_POS || xProbe > X_MAX_POS || yProbe < Y_MIN_POS || yProbe > Y_MAX_POS) { // In theory, we don't need this check.
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to edit off the bed."); // This really can't happen, but for now,
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Error: Attempt to edit off the bed."); // This really can't happen, but for now,
|
|
|
|
UBL_has_control_of_LCD_Panel = 0; // Let's do the check.
|
|
|
|
ubl_has_control_of_lcd_panel = false; // Let's do the check.
|
|
|
|
goto FINE_TUNE_EXIT;
|
|
|
|
goto FINE_TUNE_EXIT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); // Move the nozzle to where we are going to edit
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); // Move the nozzle to where we are going to edit
|
|
|
|
do_blocking_move_to_xy(xProbe, yProbe);
|
|
|
|
do_blocking_move_to_xy(xProbe, yProbe);
|
|
|
|
new_z = z_values[location.x_index][location.y_index] + 0.001;
|
|
|
|
float new_z = z_values[location.x_index][location.y_index] + 0.001;
|
|
|
|
|
|
|
|
|
|
|
|
round_off = (int32_t)(new_z * 1000.0 + 2.5); // we chop off the last digits just to be clean. We are rounding to the
|
|
|
|
round_off = (int32_t)(new_z * 1000.0 + 2.5); // we chop off the last digits just to be clean. We are rounding to the
|
|
|
|
round_off -= (round_off % 5L); // closest 0 or 5 at the 3rd decimal place.
|
|
|
|
round_off -= (round_off % 5L); // closest 0 or 5 at the 3rd decimal place.
|
|
|
|
new_z = ((float)(round_off)) / 1000.0;
|
|
|
|
new_z = float(round_off) / 1000.0;
|
|
|
|
|
|
|
|
|
|
|
|
//SERIAL_ECHOPGM("Mesh Point Currently At: ");
|
|
|
|
//SERIAL_ECHOPGM("Mesh Point Currently At: ");
|
|
|
|
//SERIAL_PROTOCOL_F(new_z, 6);
|
|
|
|
//SERIAL_PROTOCOL_F(new_z, 6);
|
|
|
|
@ -1400,18 +1371,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_mesh_edit_setup(new_z);
|
|
|
|
lcd_mesh_edit_setup(new_z);
|
|
|
|
UBL_has_control_of_LCD_Panel++;
|
|
|
|
|
|
|
|
|
|
|
|
wait_for_user = true;
|
|
|
|
do {
|
|
|
|
do {
|
|
|
|
new_z = lcd_mesh_edit();
|
|
|
|
new_z = lcd_mesh_edit();
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
} while (!G29_lcd_clicked());
|
|
|
|
} while (wait_for_user);
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel = 1; // There is a race condition for the Encoder Wheel getting clicked.
|
|
|
|
|
|
|
|
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune( )
|
|
|
|
|
|
|
|
// or here.
|
|
|
|
|
|
|
|
millis_t nxt = millis() + 1500UL;
|
|
|
|
|
|
|
|
lcd_return_to_status();
|
|
|
|
lcd_return_to_status();
|
|
|
|
while (G29_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
|
|
|
|
|
|
|
|
ubl_has_control_of_lcd_panel++; // There is a race condition for the Encoder Wheel getting clicked.
|
|
|
|
|
|
|
|
// It could get detected in lcd_mesh_edit (actually _lcd_mesh_fine_tune)
|
|
|
|
|
|
|
|
// or here.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const millis_t nxt = millis() + 1500UL;
|
|
|
|
|
|
|
|
while (ubl_lcd_clicked()) { // debounce and watch for abort
|
|
|
|
idle();
|
|
|
|
idle();
|
|
|
|
if (ELAPSED(millis(), nxt)) {
|
|
|
|
if (ELAPSED(millis(), nxt)) {
|
|
|
|
lcd_return_to_status();
|
|
|
|
lcd_return_to_status();
|
|
|
|
@ -1419,30 +1393,30 @@
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
lcd_setstatus("Mesh Editing Stopped", true);
|
|
|
|
lcd_setstatus("Mesh Editing Stopped", true);
|
|
|
|
|
|
|
|
|
|
|
|
while (G29_lcd_clicked()) idle();
|
|
|
|
while (ubl_lcd_clicked()) idle();
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
goto FINE_TUNE_EXIT;
|
|
|
|
goto FINE_TUNE_EXIT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
|
|
|
|
delay(20); // We don't want any switch noise.
|
|
|
|
delay(20); // We don't want any switch noise.
|
|
|
|
|
|
|
|
|
|
|
|
z_values[location.x_index][location.y_index] = new_z;
|
|
|
|
z_values[location.x_index][location.y_index] = new_z;
|
|
|
|
|
|
|
|
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_implementation_clear();
|
|
|
|
|
|
|
|
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0 && --Repetition_Cnt);
|
|
|
|
} while (location.x_index >= 0 && location.y_index >= 0 && --repetition_cnt);
|
|
|
|
|
|
|
|
|
|
|
|
FINE_TUNE_EXIT:
|
|
|
|
FINE_TUNE_EXIT:
|
|
|
|
|
|
|
|
|
|
|
|
if (do_UBL_MESH_Map) blm.display_map(1);
|
|
|
|
ubl_has_control_of_lcd_panel = false;
|
|
|
|
restore_UBL_active_state_and_leave();
|
|
|
|
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
do_blocking_move_to_xy(X_Pos, Y_Pos);
|
|
|
|
if (do_ubl_mesh_map) ubl.display_map(1);
|
|
|
|
|
|
|
|
restore_ubl_active_state_and_leave();
|
|
|
|
|
|
|
|
do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE);
|
|
|
|
|
|
|
|
|
|
|
|
UBL_has_control_of_LCD_Panel = 0;
|
|
|
|
do_blocking_move_to_xy(x_pos, y_pos);
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
#if ENABLED(ULTRA_LCD)
|
|
|
|
lcd_setstatus("Done Editing Mesh", true);
|
|
|
|
lcd_setstatus("Done Editing Mesh", true);
|
|
|
|
|
Scott Lahteine
8 years ago