Browse Source

✨ Update/extend Quiet Probing (#22205)

cr20-123 3 years ago
parent
commit
33185b090e
No account linked to committer's email address

+ 2
- 1
Marlin/Configuration.h View File

1250
   //#define WAIT_FOR_HOTEND         // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude)
1250
   //#define WAIT_FOR_HOTEND         // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude)
1251
 #endif
1251
 #endif
1252
 //#define PROBING_FANS_OFF          // Turn fans off when probing
1252
 //#define PROBING_FANS_OFF          // Turn fans off when probing
1253
-//#define PROBING_STEPPERS_OFF      // Turn steppers off (unless needed to hold position) when probing
1253
+//#define PROBING_ESTEPPERS_OFF     // Turn all extruder steppers off when probing
1254
+//#define PROBING_STEPPERS_OFF      // Turn all steppers off (unless needed to hold position) when probing (including extruders)
1254
 //#define DELAY_BEFORE_PROBING 200  // (ms) To prevent vibrations from triggering piezo sensors
1255
 //#define DELAY_BEFORE_PROBING 200  // (ms) To prevent vibrations from triggering piezo sensors
1255
 
1256
 
1256
 // Require minimum nozzle and/or bed temperature for probing
1257
 // Require minimum nozzle and/or bed temperature for probing

+ 14
- 5
Marlin/src/inc/Conditionals_post.h View File

3099
   #endif
3099
   #endif
3100
 #else
3100
 #else
3101
   #undef NOZZLE_TO_PROBE_OFFSET
3101
   #undef NOZZLE_TO_PROBE_OFFSET
3102
+  #undef PROBING_STEPPERS_OFF
3102
 #endif
3103
 #endif
3103
 
3104
 
3104
 /**
3105
 /**
3141
 /**
3142
 /**
3142
  * Heater, Fan, and Probe interactions
3143
  * Heater, Fan, and Probe interactions
3143
  */
3144
  */
3144
-#if FAN_COUNT == 0
3145
-  #undef PROBING_FANS_OFF
3145
+#if !HAS_FAN
3146
   #undef ADAPTIVE_FAN_SLOWING
3146
   #undef ADAPTIVE_FAN_SLOWING
3147
   #undef NO_FAN_SLOWING_IN_PID_TUNING
3147
   #undef NO_FAN_SLOWING_IN_PID_TUNING
3148
 #endif
3148
 #endif
3149
-
3150
-#if HAS_BED_PROBE && (EITHER(PROBING_HEATERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
3151
-  #define HAS_QUIET_PROBING 1
3149
+#if !BOTH(HAS_BED_PROBE, HAS_FAN)
3150
+  #undef PROBING_FANS_OFF
3151
+#endif
3152
+#if !BOTH(HAS_BED_PROBE, HAS_EXTRUDERS)
3153
+  #undef PROBING_ESTEPPERS_OFF
3154
+#endif
3155
+#if BOTH(PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF)
3156
+  #undef PROBING_ESTEPPERS_OFF
3157
+  #warning "PROBING_STEPPERS_OFF includes PROBING_ESTEPPERS_OFF. Disabling PROBING_ESTEPPERS_OFF."
3152
 #endif
3158
 #endif
3153
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
3159
 #if EITHER(ADVANCED_PAUSE_FEATURE, PROBING_HEATERS_OFF)
3154
   #define HEATER_IDLE_HANDLER 1
3160
   #define HEATER_IDLE_HANDLER 1
3155
 #endif
3161
 #endif
3162
+#if HAS_BED_PROBE && (ANY(PROBING_HEATERS_OFF, PROBING_STEPPERS_OFF, PROBING_ESTEPPERS_OFF, PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)
3163
+  #define HAS_QUIET_PROBING 1
3164
+#endif
3156
 
3165
 
3157
 /**
3166
 /**
3158
  * Advanced Pause - Filament Change
3167
  * Advanced Pause - Filament Change

+ 2
- 1
Marlin/src/module/probe.cpp View File

245
   void Probe::set_probing_paused(const bool dopause) {
245
   void Probe::set_probing_paused(const bool dopause) {
246
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
246
     TERN_(PROBING_HEATERS_OFF, thermalManager.pause_heaters(dopause));
247
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
247
     TERN_(PROBING_FANS_OFF, thermalManager.set_fans_paused(dopause));
248
+    TERN_(PROBING_ESTEPPERS_OFF, if (dopause) disable_e_steppers());
248
     #if ENABLED(PROBING_STEPPERS_OFF)
249
     #if ENABLED(PROBING_STEPPERS_OFF)
249
       IF_DISABLED(DELTA, static uint8_t old_trusted);
250
       IF_DISABLED(DELTA, static uint8_t old_trusted);
250
       if (dopause) {
251
       if (dopause) {
253
           DISABLE_AXIS_X();
254
           DISABLE_AXIS_X();
254
           DISABLE_AXIS_Y();
255
           DISABLE_AXIS_Y();
255
         #endif
256
         #endif
256
-        disable_e_steppers();
257
+        IF_DISABLED(PROBING_ESTEPPERS_OFF, disable_e_steppers());
257
       }
258
       }
258
       else {
259
       else {
259
         #if DISABLED(DELTA)
260
         #if DISABLED(DELTA)

+ 2
- 2
buildroot/tests/rambo View File

115
         FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
115
         FAN_MIN_PWM 50 FAN_KICKSTART_TIME 100 \
116
         XY_FREQUENCY_LIMIT 15
116
         XY_FREQUENCY_LIMIT 15
117
 opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
117
 opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
118
-           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY \
118
+           BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
119
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
119
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
120
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
120
            ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
121
-           FIX_MOUNTED_PROBE AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE FILAMENT_WIDTH_SENSOR PROBE_OFFSET_WIZARD \
121
+           FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
122
            Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
122
            Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
123
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
123
            SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT ADVANCED_OK M114_DETAIL \
124
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
124
            VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \

Loading…
Cancel
Save