Browse Source

Use block cleaning instead of split flag

Scott Lahteine 7 years ago
parent
commit
840289e7cc

+ 0
- 2
Marlin/src/module/motion.cpp View File

426
     saved_feedrate_percentage = feedrate_percentage;
426
     saved_feedrate_percentage = feedrate_percentage;
427
     feedrate_percentage = 100;
427
     feedrate_percentage = 100;
428
     gcode.refresh_cmd_timeout();
428
     gcode.refresh_cmd_timeout();
429
-    planner.split_first_move = false;
430
   }
429
   }
431
   else {
430
   else {
432
     feedrate_mm_s = saved_feedrate_mm_s;
431
     feedrate_mm_s = saved_feedrate_mm_s;
433
     feedrate_percentage = saved_feedrate_percentage;
432
     feedrate_percentage = saved_feedrate_percentage;
434
     gcode.refresh_cmd_timeout();
433
     gcode.refresh_cmd_timeout();
435
-    planner.split_first_move = true;
436
   }
434
   }
437
 }
435
 }
438
 
436
 

+ 1
- 3
Marlin/src/module/planner.cpp View File

103
   uint8_t Planner::last_extruder = 0;     // Respond to extruder change
103
   uint8_t Planner::last_extruder = 0;     // Respond to extruder change
104
 #endif
104
 #endif
105
 
105
 
106
-bool Planner::split_first_move = true;
107
-
108
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
106
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
109
 
107
 
110
 float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
108
 float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
1452
     position[E_AXIS] = target[E_AXIS];
1450
     position[E_AXIS] = target[E_AXIS];
1453
 
1451
 
1454
   // Always split the first move into two (if not homing or probing)
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
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1454
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1457
     const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1455
     const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1458
     DISABLE_STEPPER_DRIVER_INTERRUPT();
1456
     DISABLE_STEPPER_DRIVER_INTERRUPT();

+ 0
- 1
Marlin/src/module/planner.h View File

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

+ 1
- 0
Marlin/src/module/stepper.cpp View File

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

Loading…
Cancel
Save