|
|
@ -324,11 +324,9 @@
|
|
|
|
if (axis_unhomed_error()) {
|
|
|
|
if (axis_unhomed_error()) {
|
|
|
|
if (code_seen('J'))
|
|
|
|
if (code_seen('J'))
|
|
|
|
home_all_axes();
|
|
|
|
home_all_axes();
|
|
|
|
else
|
|
|
|
else if (code_seen('P')) {
|
|
|
|
if (code_seen('P')) {
|
|
|
|
|
|
|
|
int p_val;
|
|
|
|
|
|
|
|
if (code_has_value()) {
|
|
|
|
if (code_has_value()) {
|
|
|
|
p_val = code_value_int();
|
|
|
|
const int p_val = code_value_int();
|
|
|
|
if (p_val == 1 || p_val == 2 || p_val == 4)
|
|
|
|
if (p_val == 1 || p_val == 2 || p_val == 4)
|
|
|
|
home_all_axes();
|
|
|
|
home_all_axes();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1341,15 +1339,7 @@
|
|
|
|
// Also for round beds, there are grid points outside the bed that nozzle can't reach.
|
|
|
|
// Also for round beds, there are grid points outside the bed that nozzle can't reach.
|
|
|
|
// Prune them from the list and ignore them till the next Phase (manual nozzle probing).
|
|
|
|
// Prune them from the list and ignore them till the next Phase (manual nozzle probing).
|
|
|
|
|
|
|
|
|
|
|
|
// if ((probe_as_reference && position_is_reachable_by_probe_raw_xy(mx, my)) || position_is_reachable_raw_xy(mx, my))
|
|
|
|
if ( ! (probe_as_reference ? position_is_reachable_by_probe_raw_xy(mx, my) : position_is_reachable_raw_xy(mx, my)) )
|
|
|
|
// continue;
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
// THE ABOVE CODE IS NOT A REPLACEMENT FOR THE CODE BELOW!!!!!!!
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
bool reachable = probe_as_reference ?
|
|
|
|
|
|
|
|
position_is_reachable_by_probe_raw_xy( mx, my ) :
|
|
|
|
|
|
|
|
position_is_reachable_raw_xy( mx, my );
|
|
|
|
|
|
|
|
if ( ! reachable )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
// Reachable. Check if it's the closest location to the nozzle.
|
|
|
|
// Reachable. Check if it's the closest location to the nozzle.
|
|
|
|