Scott Lahteine пре 4 година
родитељ
комит
e5d0b27aaf

+ 1
- 1
Marlin/src/inc/Conditionals_post.h Прегледај датотеку

@@ -2373,7 +2373,7 @@
2373 2373
 #endif
2374 2374
 
2375 2375
 #if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
2376
-  #define QUIET_PROBING 1
2376
+  #define HAS_QUIET_PROBING 1
2377 2377
 #endif
2378 2378
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
2379 2379
   #define HEATER_IDLE_HANDLER 1

+ 2
- 2
Marlin/src/lcd/menu/menu_bed_corners.cpp Прегледај датотеку

@@ -104,7 +104,7 @@ static int8_t bed_corner;
104 104
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
105 105
       bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action
106 106
     #endif
107
-    TERN_(QUIET_PROBING, probe.set_probing_paused(true));
107
+    TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(true));
108 108
 
109 109
     // Move down until the probe is triggered
110 110
     do_blocking_move_to_z(last_z - (LEVEL_CORNERS_PROBE_TOLERANCE), manual_feedrate_mm_s.z);
@@ -141,7 +141,7 @@ static int8_t bed_corner;
141 141
       TERN_(LEVEL_CORNERS_VERIFY_RAISED, verify_corner = true);
142 142
     }
143 143
 
144
-    TERN_(QUIET_PROBING, probe.set_probing_paused(false));
144
+    TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(false));
145 145
 
146 146
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
147 147
       bltouch.stow();

+ 2
- 2
Marlin/src/module/motion.cpp Прегледај датотеку

@@ -1321,7 +1321,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
1321 1321
 
1322 1322
   if (is_home_dir) {
1323 1323
 
1324
-    #if HOMING_Z_WITH_PROBE && QUIET_PROBING
1324
+    #if HOMING_Z_WITH_PROBE && HAS_QUIET_PROBING
1325 1325
       if (axis == Z_AXIS) probe.set_probing_paused(true);
1326 1326
     #endif
1327 1327
 
@@ -1360,7 +1360,7 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
1360 1360
 
1361 1361
   if (is_home_dir) {
1362 1362
 
1363
-    #if HOMING_Z_WITH_PROBE && QUIET_PROBING
1363
+    #if HOMING_Z_WITH_PROBE && HAS_QUIET_PROBING
1364 1364
       if (axis == Z_AXIS) probe.set_probing_paused(false);
1365 1365
     #endif
1366 1366
 

+ 5
- 5
Marlin/src/module/probe.cpp Прегледај датотеку

@@ -73,7 +73,7 @@
73 73
   #include "../feature/tmc_util.h"
74 74
 #endif
75 75
 
76
-#if QUIET_PROBING
76
+#if HAS_QUIET_PROBING
77 77
   #include "stepper/indirection.h"
78 78
 #endif
79 79
 
@@ -236,7 +236,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
236 236
 
237 237
 #endif // Z_PROBE_ALLEN_KEY
238 238
 
239
-#if QUIET_PROBING
239
+#if HAS_QUIET_PROBING
240 240
 
241 241
   void Probe::set_probing_paused(const bool p) {
242 242
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause(p));
@@ -254,7 +254,7 @@ xyz_pos_t Probe::offset; // Initialized by settings.load()
254 254
     );
255 255
   }
256 256
 
257
-#endif // QUIET_PROBING
257
+#endif // HAS_QUIET_PROBING
258 258
 
259 259
 /**
260 260
  * Raise Z to a minimum height to make room for a probe to move
@@ -437,7 +437,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
437 437
     endstops.enable(true);
438 438
   #endif
439 439
 
440
-  TERN_(QUIET_PROBING, set_probing_paused(true));
440
+  TERN_(HAS_QUIET_PROBING, set_probing_paused(true));
441 441
 
442 442
   // Move down until the probe is triggered
443 443
   do_blocking_move_to_z(z, fr_mm_s);
@@ -451,7 +451,7 @@ bool Probe::probe_down_to_z(const float z, const feedRate_t fr_mm_s) {
451 451
     #endif
452 452
   ;
453 453
 
454
-  TERN_(QUIET_PROBING, set_probing_paused(false));
454
+  TERN_(HAS_QUIET_PROBING, set_probing_paused(false));
455 455
 
456 456
   // Re-enable stealthChop if used. Disable diag1 pin on driver.
457 457
   #if ENABLED(SENSORLESS_PROBING)

+ 1
- 1
Marlin/src/module/probe.h Прегледај датотеку

@@ -202,7 +202,7 @@ public:
202 202
     static void servo_probe_init();
203 203
   #endif
204 204
 
205
-  #if QUIET_PROBING
205
+  #if HAS_QUIET_PROBING
206 206
     static void set_probing_paused(const bool p);
207 207
   #endif
208 208
 

Loading…
Откажи
Сачувај