Browse Source

Merge pull request #8688 from AnHardt/2_first_move_probing_homing

[2.0.x] Don't split first_move while homing or probing
Scott Lahteine 7 years ago
parent
commit
466f2761cb
No account linked to committer's email address
3 changed files with 7 additions and 2 deletions
  1. 2
    0
      Marlin/src/module/motion.cpp
  2. 4
    2
      Marlin/src/module/planner.cpp
  3. 1
    0
      Marlin/src/module/planner.h

+ 2
- 0
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;
429
   }
430
   }
430
   else {
431
   else {
431
     feedrate_mm_s = saved_feedrate_mm_s;
432
     feedrate_mm_s = saved_feedrate_mm_s;
432
     feedrate_percentage = saved_feedrate_percentage;
433
     feedrate_percentage = saved_feedrate_percentage;
433
     gcode.refresh_cmd_timeout();
434
     gcode.refresh_cmd_timeout();
435
+    planner.split_first_move = true;
434
   }
436
   }
435
 }
437
 }
436
 
438
 

+ 4
- 2
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
+
106
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
108
 int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
107
 
109
 
108
 float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
110
 float Planner::e_factor[EXTRUDERS],               // The flow percentage and volumetric multiplier combine to scale E movement
1444
   if (DEBUGGING(DRYRUN))
1446
   if (DEBUGGING(DRYRUN))
1445
     position[E_AXIS] = target[E_AXIS];
1447
     position[E_AXIS] = target[E_AXIS];
1446
 
1448
 
1447
-  // Always split the first move into one longer and one shorter move
1448
-  if (!blocks_queued()) {
1449
+  // Always split the first move into two (if not homing or probing)
1450
+  if (!blocks_queued() && split_first_move) {
1449
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1451
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1450
     const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1452
     const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1451
     DISABLE_STEPPER_DRIVER_INTERRUPT();
1453
     DISABLE_STEPPER_DRIVER_INTERRUPT();

+ 1
- 0
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;
168
 
169
 
169
     #if HAS_LEVELING
170
     #if HAS_LEVELING
170
       static bool leveling_active;          // Flag that bed leveling is enabled
171
       static bool leveling_active;          // Flag that bed leveling is enabled

Loading…
Cancel
Save