Просмотр исходного кода

Revert "Adding custom move feedrate for G26 (#20729)" (#20870)

This reverts commit 14567f3459.
Roxy-3D 4 лет назад
Родитель
Сommit
8f7bac4999
Аккаунт пользователя с таким Email не найден
2 измененных файлов: 3 добавлений и 14 удалений
  1. 0
    1
      Marlin/Configuration.h
  2. 3
    13
      Marlin/src/gcode/bedlevel/G26.cpp

+ 0
- 1
Marlin/Configuration.h Просмотреть файл

@@ -1361,7 +1361,6 @@
1361 1361
     #define MESH_TEST_HOTEND_TEMP  205    // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
1362 1362
     #define MESH_TEST_BED_TEMP      60    // (°C) Default bed temperature for the G26 Mesh Validation Tool.
1363 1363
     #define G26_XY_FEEDRATE         20    // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool.
1364
-    #define G26_XY_FEEDRATE_TRAVEL  100   // (mm/s) Feedrate for XY Moves without extrusion for the G26 Mesh Validation Tool
1365 1364
     #define G26_RETRACT_MULTIPLIER   1.0  // G26 Q (retraction) used by default between mesh test elements.
1366 1365
   #endif
1367 1366
 

+ 3
- 13
Marlin/src/gcode/bedlevel/G26.cpp Просмотреть файл

@@ -128,10 +128,6 @@
128 128
   #define G26_XY_FEEDRATE (PLANNER_XY_FEEDRATE() / 3.0)
129 129
 #endif
130 130
 
131
-#ifndef G26_XY_FEEDRATE_TRAVEL
132
-  #define G26_XY_FEEDRATE_TRAVEL (PLANNER_XY_FEEDRATE() / 1.5)
133
-#endif
134
-
135 131
 #if CROSSHAIRS_SIZE >= INTERSECTION_CIRCLE_RADIUS
136 132
   #error "CROSSHAIRS_SIZE must be less than INTERSECTION_CIRCLE_RADIUS."
137 133
 #endif
@@ -217,8 +213,7 @@ void move_to(const float &rx, const float &ry, const float &z, const float &e_de
217 213
 
218 214
   const xy_pos_t dest = { rx, ry };
219 215
 
220
-  const bool has_xy_component = dest != current_position; // Check if X or Y is involved in the movement.  
221
-  const bool has_e_component = e_delta != 0.0;
216
+  const bool has_xy_component = dest != current_position; // Check if X or Y is involved in the movement.
222 217
 
223 218
   destination = current_position;
224 219
 
@@ -229,15 +224,10 @@ void move_to(const float &rx, const float &ry, const float &z, const float &e_de
229 224
     destination = current_position;
230 225
   }
231 226
 
232
-  // If X or Y in combination with E is involved do a 'normal' move. 
233
-  // If X or Y with no E is involved do a 'fast' move
234
-  // Otherwise retract/recover/hop.
227
+  // If X or Y is involved do a 'normal' move. Otherwise retract/recover/hop.
235 228
   destination = dest;
236 229
   destination.e += e_delta;
237
-  const feedRate_t feed_value = 
238
-    has_xy_component 
239
-    ? (has_e_component ? feedRate_t(G26_XY_FEEDRATE) : feedRate_t(G26_XY_FEEDRATE_TRAVEL)) 
240
-    : planner.settings.max_feedrate_mm_s[E_AXIS] * 0.666f;
230
+  const feedRate_t feed_value = has_xy_component ? feedRate_t(G26_XY_FEEDRATE) : planner.settings.max_feedrate_mm_s[E_AXIS] * 0.666f;
241 231
   prepare_internal_move_to_destination(feed_value);
242 232
   destination = current_position;
243 233
 }

Загрузка…
Отмена
Сохранить