Bläddra i källkod

🎨 Misc. probe / endstop cleanup

Scott Lahteine 2 år sedan
förälder
incheckning
4d45fdf0eb
2 ändrade filer med 7 tillägg och 7 borttagningar
  1. 1
    1
      Marlin/src/module/endstops.cpp
  2. 6
    6
      Marlin/src/module/probe.cpp

+ 1
- 1
Marlin/src/module/endstops.cpp Visa fil

@@ -564,7 +564,7 @@ void _O2 Endstops::report_states() {
564 564
   #if HAS_K_MAX
565 565
     ES_REPORT(K_MAX);
566 566
   #endif
567
-  #if BOTH(MARLIN_DEV_MODE, PROBE_ACTIVATION_SWITCH)
567
+  #if BOTH(PROBE_ACTIVATION_SWITCH)
568 568
     print_es_state(probe_switch_activated(), F(STR_PROBE_EN));
569 569
   #endif
570 570
   #if USES_Z_MIN_PROBE_PIN

+ 6
- 6
Marlin/src/module/probe.cpp Visa fil

@@ -496,10 +496,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
496 496
   #if ENABLED(SENSORLESS_PROBING)
497 497
     sensorless_t stealth_states { false };
498 498
     #if HAS_DELTA_SENSORLESS_PROBING
499
-      if (probe.test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
500
-      if (probe.test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
499
+      if (test_sensitivity.x) stealth_states.x = tmc_enable_stallguard(stepperX);  // Delta watches all DIAG pins for a stall
500
+      if (test_sensitivity.y) stealth_states.y = tmc_enable_stallguard(stepperY);
501 501
     #endif
502
-    if (probe.test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
502
+    if (test_sensitivity.z) stealth_states.z = tmc_enable_stallguard(stepperZ);    // All machines will check Z-DIAG for stall
503 503
     endstops.enable(true);
504 504
     set_homing_current(true);                                 // The "homing" current also applies to probing
505 505
   #endif
@@ -524,10 +524,10 @@ bool Probe::probe_down_to_z(const_float_t z, const_feedRate_t fr_mm_s) {
524 524
   #if ENABLED(SENSORLESS_PROBING)
525 525
     endstops.not_homing();
526 526
     #if HAS_DELTA_SENSORLESS_PROBING
527
-      if (probe.test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
528
-      if (probe.test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
527
+      if (test_sensitivity.x) tmc_disable_stallguard(stepperX, stealth_states.x);
528
+      if (test_sensitivity.y) tmc_disable_stallguard(stepperY, stealth_states.y);
529 529
     #endif
530
-    if (probe.test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
530
+    if (test_sensitivity.z) tmc_disable_stallguard(stepperZ, stealth_states.z);
531 531
     set_homing_current(false);
532 532
   #endif
533 533
 

Laddar…
Avbryt
Spara