Use GRID_MAX_POINTS. Some formatting
This commit is contained in:
parent
e51b5774db
commit
a7fb55ea6d
@ -69,7 +69,7 @@
|
|||||||
* B # Bed Set the Bed Temperature. If not specified, a default of 60 C. will be assumed.
|
* B # Bed Set the Bed Temperature. If not specified, a default of 60 C. will be assumed.
|
||||||
*
|
*
|
||||||
* C Current When searching for Mesh Intersection points to draw, use the current nozzle location
|
* C Current When searching for Mesh Intersection points to draw, use the current nozzle location
|
||||||
as the base for any distance comparison.
|
* as the base for any distance comparison.
|
||||||
*
|
*
|
||||||
* D Disable Disable the Unified Bed Leveling System. In the normal case the user is invoking this
|
* D Disable Disable the Unified Bed Leveling System. In the normal case the user is invoking this
|
||||||
* command to see how well a Mesh as been adjusted to match a print surface. In order to do
|
* command to see how well a Mesh as been adjusted to match a print surface. In order to do
|
||||||
@ -748,10 +748,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We save the question of what to do with the Unified Bed Leveling System's Activation until the very
|
* Wait until all parameters are verified before altering the state!
|
||||||
* end. The reason is, if one of the parameters specified up above is incorrect, we don't want to
|
|
||||||
* alter the system's status. We wait until we know everything is correct before altering the state
|
|
||||||
* of the system.
|
|
||||||
*/
|
*/
|
||||||
ubl.state.active = !code_seen('D');
|
ubl.state.active = !code_seen('D');
|
||||||
|
|
||||||
|
@ -617,7 +617,7 @@ void Planner::check_axes_activity() {
|
|||||||
// so U==(L-O-M)/(1-M/H) for U<H
|
// so U==(L-O-M)/(1-M/H) for U<H
|
||||||
|
|
||||||
if (planner.z_fade_height) {
|
if (planner.z_fade_height) {
|
||||||
float z_unfaded = z_unlevel / (1.0 - z_ublmesh * planner.inverse_z_fade_height);
|
const float z_unfaded = z_unlevel / (1.0 - z_ublmesh * planner.inverse_z_fade_height);
|
||||||
if (z_unfaded < planner.z_fade_height) // don't know until after compute
|
if (z_unfaded < planner.z_fade_height) // don't know until after compute
|
||||||
z_unlevel = z_unfaded;
|
z_unlevel = z_unfaded;
|
||||||
}
|
}
|
||||||
|
@ -61,8 +61,7 @@
|
|||||||
|
|
||||||
void dump(char * const str, const float &f);
|
void dump(char * const str, const float &f);
|
||||||
void probe_entire_mesh(const float&, const float&, const bool, const bool, const bool);
|
void probe_entire_mesh(const float&, const float&, const bool, const bool, const bool);
|
||||||
void manually_probe_remaining_mesh(const float&, const float&, const float&, const float&, const bool);
|
float measure_business_card_thickness(float&);
|
||||||
float measure_business_card_thickness(const float&);
|
|
||||||
mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const float&, const float&, const bool, unsigned int[16], bool);
|
mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const float&, const float&, const bool, unsigned int[16], bool);
|
||||||
void shift_mesh_height();
|
void shift_mesh_height();
|
||||||
void fine_tune_mesh(const float&, const float&, const bool);
|
void fine_tune_mesh(const float&, const float&, const bool);
|
||||||
@ -108,7 +107,6 @@
|
|||||||
void probe_entire_mesh(const float &lx, const float &ly, const bool do_ubl_mesh_map, const bool stow_probe, bool do_furthest);
|
void probe_entire_mesh(const float &lx, const float &ly, const bool do_ubl_mesh_map, const bool stow_probe, bool do_furthest);
|
||||||
void tilt_mesh_based_on_3pts(const float &z1, const float &z2, const float &z3);
|
void tilt_mesh_based_on_3pts(const float &z1, const float &z2, const float &z3);
|
||||||
void tilt_mesh_based_on_probed_grid(const bool do_ubl_mesh_map);
|
void tilt_mesh_based_on_probed_grid(const bool do_ubl_mesh_map);
|
||||||
void manually_probe_remaining_mesh(const float &lx, const float &ly, const float &z_clearance, const float &card_thickness, const bool do_ubl_mesh_map);
|
|
||||||
void save_ubl_active_state_and_disable();
|
void save_ubl_active_state_and_disable();
|
||||||
void restore_ubl_active_state_and_leave();
|
void restore_ubl_active_state_and_leave();
|
||||||
void g29_what_command();
|
void g29_what_command();
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
extern bool set_probe_deployed(bool);
|
extern bool set_probe_deployed(bool);
|
||||||
void smart_fill_mesh();
|
void smart_fill_mesh();
|
||||||
float measure_business_card_thickness(float &in_height);
|
float measure_business_card_thickness(float &in_height);
|
||||||
void manually_probe_remaining_mesh(const float &lx, const float &ly, float &z_clearance, const float &card_thickness, const bool do_ubl_mesh_map);
|
void manually_probe_remaining_mesh(const float&, const float&, const float&, const float&, const bool);
|
||||||
|
|
||||||
bool ProbeStay = true;
|
bool ProbeStay = true;
|
||||||
|
|
||||||
@ -482,7 +482,7 @@
|
|||||||
*/
|
*/
|
||||||
if (c_flag) {
|
if (c_flag) {
|
||||||
|
|
||||||
if ( repetition_cnt >= ( GRID_MAX_POINTS_X * GRID_MAX_POINTS_Y )) {
|
if (repetition_cnt >= GRID_MAX_POINTS) {
|
||||||
for ( uint8_t x = 0; x < GRID_MAX_POINTS_X; x++ ) {
|
for ( uint8_t x = 0; x < GRID_MAX_POINTS_X; x++ ) {
|
||||||
for ( uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++ ) {
|
for ( uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++ ) {
|
||||||
ubl.z_values[x][y] = ubl_constant;
|
ubl.z_values[x][y] = ubl_constant;
|
||||||
@ -735,7 +735,7 @@
|
|||||||
ubl.save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
ubl.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();
|
||||||
|
|
||||||
uint16_t max_iterations = ( GRID_MAX_POINTS_X * GRID_MAX_POINTS_Y );
|
uint16_t max_iterations = GRID_MAX_POINTS;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (ubl_lcd_clicked()) {
|
if (ubl_lcd_clicked()) {
|
||||||
@ -941,7 +941,7 @@
|
|||||||
return thickness;
|
return thickness;
|
||||||
}
|
}
|
||||||
|
|
||||||
void manually_probe_remaining_mesh(const float &lx, const float &ly, float &z_clearance, const float &card_thickness, const bool do_ubl_mesh_map) {
|
void manually_probe_remaining_mesh(const float &lx, const float &ly, const float &z_clearance, const float &card_thickness, const bool do_ubl_mesh_map) {
|
||||||
|
|
||||||
ubl.has_control_of_lcd_panel = true;
|
ubl.has_control_of_lcd_panel = true;
|
||||||
ubl.save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
ubl.save_ubl_active_state_and_disable(); // we don't do bed level correction because we want the raw data when we probe
|
||||||
@ -956,14 +956,11 @@
|
|||||||
if (location.x_index < 0 && location.y_index < 0) continue;
|
if (location.x_index < 0 && location.y_index < 0) continue;
|
||||||
|
|
||||||
const float rawx = pgm_read_float(&ubl.mesh_index_to_xpos[location.x_index]),
|
const float rawx = pgm_read_float(&ubl.mesh_index_to_xpos[location.x_index]),
|
||||||
rawy = pgm_read_float(&ubl.mesh_index_to_ypos[location.y_index]);
|
rawy = pgm_read_float(&ubl.mesh_index_to_ypos[location.y_index]),
|
||||||
|
xProbe = LOGICAL_X_POSITION(rawx),
|
||||||
const float xProbe = LOGICAL_X_POSITION(rawx),
|
|
||||||
yProbe = LOGICAL_Y_POSITION(rawy);
|
yProbe = LOGICAL_Y_POSITION(rawy);
|
||||||
|
|
||||||
if ( ! position_is_reachable_raw_xy( rawx, rawy )) { // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
|
if (!position_is_reachable_raw_xy(rawx, rawy)) break; // SHOULD NOT OCCUR (find_closest_mesh_point only returns reachable points)
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
do_blocking_move_to_z(Z_CLEARANCE_BETWEEN_PROBES);
|
||||||
|
|
||||||
@ -1129,6 +1126,7 @@
|
|||||||
SERIAL_PROTOCOLLNPGM("Invalid map type.\n");
|
SERIAL_PROTOCOLLNPGM("Invalid map type.\n");
|
||||||
return UBL_ERR;
|
return UBL_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if a map type was specified
|
// Check if a map type was specified
|
||||||
if (code_seen('M')) { // Warning! Use of 'M' flouts established standards.
|
if (code_seen('M')) { // Warning! Use of 'M' flouts established standards.
|
||||||
map_type = code_has_value() ? code_value_int() : 0;
|
map_type = code_has_value() ? code_value_int() : 0;
|
||||||
|
@ -1674,13 +1674,13 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
|
|
||||||
void _lcd_ubl_level_bed();
|
void _lcd_ubl_level_bed();
|
||||||
|
|
||||||
int UBL_STORAGE_SLOT = 0;
|
int UBL_STORAGE_SLOT = 0,
|
||||||
int CUSTOM_BED_TEMP = 50;
|
CUSTOM_BED_TEMP = 50,
|
||||||
int CUSTOM_HOTEND_TEMP = 190;
|
CUSTOM_HOTEND_TEMP = 190,
|
||||||
int SIDE_POINTS = 3;
|
SIDE_POINTS = 3,
|
||||||
int UBL_FILLIN_AMOUNT = 5;
|
UBL_FILLIN_AMOUNT = 5,
|
||||||
int UBL_HEIGHT_AMOUNT;
|
UBL_HEIGHT_AMOUNT,
|
||||||
int map_type;
|
map_type;
|
||||||
|
|
||||||
char UBL_LCD_GCODE [30];
|
char UBL_LCD_GCODE [30];
|
||||||
|
|
||||||
@ -1858,7 +1858,7 @@ void kill_screen(const char* lcd_msg) {
|
|||||||
* UBL Build Mesh submenu
|
* UBL Build Mesh submenu
|
||||||
*/
|
*/
|
||||||
void _lcd_ubl_build_mesh() {
|
void _lcd_ubl_build_mesh() {
|
||||||
int GRID_NUM_POINTS = GRID_MAX_POINTS_X * GRID_MAX_POINTS_Y ;
|
int GRID_NUM_POINTS = GRID_MAX_POINTS;
|
||||||
START_MENU();
|
START_MENU();
|
||||||
MENU_BACK(MSG_UBL_TOOLS);
|
MENU_BACK(MSG_UBL_TOOLS);
|
||||||
#if (WATCH_THE_BED)
|
#if (WATCH_THE_BED)
|
||||||
|
Loading…
Reference in New Issue
Block a user