Bladeren bron

Fix motion compile w/out probe-oriented settings (#19684)

Jason Smith 3 jaren geleden
bovenliggende
commit
600870f22b
1 gewijzigde bestanden met toevoegingen van 5 en 4 verwijderingen
  1. 5
    4
      Marlin/src/module/motion.cpp

+ 5
- 4
Marlin/src/module/motion.cpp Bestand weergeven

510
   const bool rel = raise_on_unknown && !z_known;
510
   const bool rel = raise_on_unknown && !z_known;
511
   float zdest = zclear + (rel ? current_position.z : 0.0f);
511
   float zdest = zclear + (rel ? current_position.z : 0.0f);
512
   if (!lower_allowed) NOLESS(zdest, current_position.z);
512
   if (!lower_allowed) NOLESS(zdest, current_position.z);
513
-  do_blocking_move_to_z(_MIN(zdest, Z_MAX_POS), MMM_TO_MMS(Z_PROBE_SPEED_FAST));
513
+  do_blocking_move_to_z(_MIN(zdest, Z_MAX_POS), MMM_TO_MMS(TERN(HAS_BED_PROBE, Z_PROBE_SPEED_FAST, HOMING_FEEDRATE_Z)));
514
 }
514
 }
515
 
515
 
516
 //
516
 //
1126
  * Homing bump feedrate (mm/s)
1126
  * Homing bump feedrate (mm/s)
1127
  */
1127
  */
1128
 feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
1128
 feedRate_t get_homing_bump_feedrate(const AxisEnum axis) {
1129
-  if (TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS))
1130
-    return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
1129
+  #if HOMING_Z_WITH_PROBE
1130
+    if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
1131
+  #endif
1131
   static const uint8_t homing_bump_divisor[] PROGMEM = HOMING_BUMP_DIVISOR;
1132
   static const uint8_t homing_bump_divisor[] PROGMEM = HOMING_BUMP_DIVISOR;
1132
   uint8_t hbd = pgm_read_byte(&homing_bump_divisor[axis]);
1133
   uint8_t hbd = pgm_read_byte(&homing_bump_divisor[axis]);
1133
   if (hbd < 1) {
1134
   if (hbd < 1) {
1588
   // When homing Z with probe respect probe clearance
1589
   // When homing Z with probe respect probe clearance
1589
   const bool use_probe_bump = TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && home_bump_mm(Z_AXIS));
1590
   const bool use_probe_bump = TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS && home_bump_mm(Z_AXIS));
1590
   const float bump = axis_home_dir * (
1591
   const float bump = axis_home_dir * (
1591
-    use_probe_bump ? _MAX(Z_CLEARANCE_BETWEEN_PROBES, home_bump_mm(Z_AXIS)) : home_bump_mm(axis)
1592
+    use_probe_bump ? _MAX(TERN0(HOMING_Z_WITH_PROBE, Z_CLEARANCE_BETWEEN_PROBES), home_bump_mm(Z_AXIS)) : home_bump_mm(axis)
1592
   );
1593
   );
1593
 
1594
 
1594
   // If a second homing move is configured...
1595
   // If a second homing move is configured...

Laden…
Annuleren
Opslaan