0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up trailing whitespace and tabs

Browse source
This commit is contained in:
Scott Lahteine 2017-05-16 15:25:30 -05:00
parent d30e478f97
commit 6b6630e11b
7 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Marlin/ubl_G29.cpp
View file

@ -324,15 +324,13 @@
if (axis_unhomed_error()) {
if (code_seen('J'))
home_all_axes();
else
if (code_seen('P')) {
int p_val;
if (code_has_value()) {
p_val = code_value_int();
if ( p_val==1 || p_val==2 || p_val==4 )
home_all_axes();
}
else if (code_seen('P')) {
if (code_has_value()) {
const int p_val = code_value_int();
if (p_val == 1 || p_val == 2 || p_val == 4)
home_all_axes();
}
}
}
if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
@ -1341,15 +1339,7 @@
// 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).
// 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 )
if ( ! (probe_as_reference ? position_is_reachable_by_probe_raw_xy(mx, my) : position_is_reachable_raw_xy(mx, my)) )
continue;
// Reachable. Check if it's the closest location to the nozzle.