SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Formatting, const in G33

Browse source
This commit is contained in:
Scott Lahteine 2017-05-21 10:40:05 -05:00
parent 1519b0e7c1
commit d7fda2fe49
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/Marlin_main.cpp
View file

@ -5137,7 +5137,6 @@ void home_all_axes() { gcode_G28(true); }
} }
const bool towers_set = !code_seen('T'), const bool towers_set = !code_seen('T'),
_1p_calibration = probe_points == 1, _1p_calibration = probe_points == 1,
_4p_calibration = probe_points == 2, _4p_calibration = probe_points == 2,
_4p_towers_points = _4p_calibration && towers_set, _4p_towers_points = _4p_calibration && towers_set,
@ -5151,14 +5150,12 @@ void home_all_axes() { gcode_G28(true); }
_7p_intermed_points = _7p_calibration && !_7p_half_circle; _7p_intermed_points = _7p_calibration && !_7p_half_circle;
if (!_1p_calibration) { // test if the outer radius is reachable if (!_1p_calibration) { // test if the outer radius is reachable
const float circles = (_7p_quadruple_circle ? 1.5 :
_7p_triple_circle ? 1.0 :
_7p_double_circle ? 0.5 : 0),
radius = (1 + circles * 0.1) * delta_calibration_radius;
for (uint8_t axis = 1; axis < 13; ++axis) { for (uint8_t axis = 1; axis < 13; ++axis) {
float circles = (_7p_quadruple_circle ? 1.5 : if (!position_is_reachable_by_probe_xy(cos(RADIANS(180 + 30 * axis)) * radius, sin(RADIANS(180 + 30 * axis)) * radius)) {
_7p_triple_circle ? 1.0 :
_7p_double_circle ? 0.5 : 0);
if (!position_is_reachable_by_probe_xy(cos(RADIANS(180 + 30 * axis)) *
delta_calibration_radius * (1 + circles * 0.1),
sin(RADIANS(180 + 30 * axis)) *
delta_calibration_radius * (1 + circles * 0.1))) {
SERIAL_PROTOCOLLNPGM("?(M665 B)ed radius is implausible."); SERIAL_PROTOCOLLNPGM("?(M665 B)ed radius is implausible.");
return; return;
} }