Ver código fonte

Formatting, const in G33

Scott Lahteine 8 anos atrás
pai
commit
d7fda2fe49
1 arquivos alterados com 5 adições e 8 exclusões
  1. 5
    8
      Marlin/Marlin_main.cpp

+ 5
- 8
Marlin/Marlin_main.cpp Ver arquivo

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

Carregando…
Cancelar
Salvar