소스 검색

Use block cleaning instead of split flag

Scott Lahteine 6 년 전
부모
커밋
840289e7cc
4개의 변경된 파일2개의 추가작업 그리고 6개의 파일을 삭제
  1. 0
    2
      Marlin/src/module/motion.cpp
  2. 1
    3
      Marlin/src/module/planner.cpp
  3. 0
    1
      Marlin/src/module/planner.h
  4. 1
    0
      Marlin/src/module/stepper.cpp

+ 0
- 2
Marlin/src/module/motion.cpp 파일 보기

@@ -426,13 +426,11 @@ void bracket_probe_move(const bool before) {
426 426
     saved_feedrate_percentage = feedrate_percentage;
427 427
     feedrate_percentage = 100;
428 428
     gcode.refresh_cmd_timeout();
429
-    planner.split_first_move = false;
430 429
   }
431 430
   else {
432 431
     feedrate_mm_s = saved_feedrate_mm_s;
433 432
     feedrate_percentage = saved_feedrate_percentage;
434 433
     gcode.refresh_cmd_timeout();
435
-    planner.split_first_move = true;
436 434
   }
437 435
 }
438 436
 

+ 1
- 3
Marlin/src/module/planner.cpp 파일 보기

@@ -103,8 +103,6 @@ float Planner::max_feedrate_mm_s[XYZE_N], // Max speeds in mm per second
103 103
   uint8_t Planner::last_extruder = 0;     // Respond to extruder change
104 104
 #endif
105 105
 
106
-bool Planner::split_first_move = true;
107
-
108 106
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
109 107
 
110 108
 float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
@@ -1452,7 +1450,7 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const
1452 1450
     position[E_AXIS] = target[E_AXIS];
1453 1451
 
1454 1452
   // Always split the first move into two (if not homing or probing)
1455
-  if (!blocks_queued() && split_first_move) {
1453
+  if (!blocks_queued()) {
1456 1454
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1457 1455
     const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1458 1456
     DISABLE_STEPPER_DRIVER_INTERRUPT();

+ 0
- 1
Marlin/src/module/planner.h 파일 보기

@@ -165,7 +165,6 @@ class Planner {
165 165
                  travel_acceleration,  // Travel acceleration mm/s^2  DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
166 166
                  max_jerk[XYZE],       // The largest speed change requiring no acceleration
167 167
                  min_travel_feedrate_mm_s;
168
-    static bool split_first_move;
169 168
 
170 169
     #if HAS_LEVELING
171 170
       static bool leveling_active;          // Flag that bed leveling is enabled

+ 1
- 0
Marlin/src/module/stepper.cpp 파일 보기

@@ -1250,6 +1250,7 @@ void Stepper::endstop_triggered(AxisEnum axis) {
1250 1250
   #endif // !COREXY && !COREXZ && !COREYZ
1251 1251
 
1252 1252
   kill_current_block();
1253
+  cleaning_buffer_counter = -(BLOCK_BUFFER_SIZE - 1); // Ignore remaining blocks
1253 1254
 }
1254 1255
 
1255 1256
 void Stepper::report_positions() {

Loading…
취소
저장