浏览代码

Rename QUIET_PROBING

Scott Lahteine 4 年前
父节点
当前提交
e5d0b27aaf

+ 1
- 1
Marlin/src/inc/Conditionals_post.h 查看文件

2373
 #endif
2373
 #endif
2374
 
2374
 
2375
 #if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
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
 #endif
2377
 #endif
2378
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
2378
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
2379
   #define HEATER_IDLE_HANDLER 1
2379
   #define HEATER_IDLE_HANDLER 1

+ 2
- 2
Marlin/src/lcd/menu/menu_bed_corners.cpp 查看文件

104
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
104
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
105
       bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action
105
       bltouch.deploy(); // DEPLOY in LOW SPEED MODE on every probe action
106
     #endif
106
     #endif
107
-    TERN_(QUIET_PROBING, probe.set_probing_paused(true));
107
+    TERN_(HAS_QUIET_PROBING, probe.set_probing_paused(true));
108
 
108
 
109
     // Move down until the probe is triggered
109
     // Move down until the probe is triggered
110
     do_blocking_move_to_z(last_z - (LEVEL_CORNERS_PROBE_TOLERANCE), manual_feedrate_mm_s.z);
110
     do_blocking_move_to_z(last_z - (LEVEL_CORNERS_PROBE_TOLERANCE), manual_feedrate_mm_s.z);
141
       TERN_(LEVEL_CORNERS_VERIFY_RAISED, verify_corner = true);
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
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
146
     #if ENABLED(BLTOUCH) && DISABLED(BLTOUCH_HS_MODE)
147
       bltouch.stow();
147
       bltouch.stow();

+ 2
- 2
Marlin/src/module/motion.cpp 查看文件

1321
 
1321
 
1322
   if (is_home_dir) {
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
       if (axis == Z_AXIS) probe.set_probing_paused(true);
1325
       if (axis == Z_AXIS) probe.set_probing_paused(true);
1326
     #endif
1326
     #endif
1327
 
1327
 
1360
 
1360
 
1361
   if (is_home_dir) {
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
       if (axis == Z_AXIS) probe.set_probing_paused(false);
1364
       if (axis == Z_AXIS) probe.set_probing_paused(false);
1365
     #endif
1365
     #endif
1366
 
1366
 

+ 5
- 5
Marlin/src/module/probe.cpp 查看文件

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

+ 1
- 1
Marlin/src/module/probe.h 查看文件

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

正在加载...
取消
保存