File tree 5 files changed +18
-3
lines changed
5 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -532,6 +532,7 @@ void disable_all_steppers() {
532
532
enqueue_and_echo_commands_P (PSTR (FILAMENT_RUNOUT_SCRIPT));
533
533
#else
534
534
systemservice.PauseTrigger (TRIGGER_SOURCE_RUNOUT);
535
+ RunoutResponseDelayed::modify_runout_distance_mm (FILAMENT_RUNOUT_DISTANCE_MM);
535
536
#endif
536
537
}
537
538
Original file line number Diff line number Diff line change @@ -384,6 +384,14 @@ class FilamentSensorBase {
384
384
#endif
385
385
}
386
386
387
+ static inline void modify_runout_distance_mm (float distance) {
388
+ #if EXTRUDERS > 1
389
+ runout_mm_countdown[actual_extruder] = runout_distance_mm = distance;
390
+ #else
391
+ runout_mm_countdown[active_extruder] = runout_distance_mm = distance;
392
+ #endif
393
+ }
394
+
387
395
static inline bool has_run_out () {
388
396
return runout_mm_countdown[active_extruder] < 0 ;
389
397
}
Original file line number Diff line number Diff line change @@ -159,13 +159,18 @@ void GcodeSuite::M600() {
159
159
#else
160
160
#include " ../../../gcode/gcode.h"
161
161
#include " ../snapmaker/src/module/toolhead_3dp.h"
162
+ #include " ../../../feature/runout.h"
162
163
void GcodeSuite::M600 () {
164
+ planner.synchronize ();
165
+ if (systemservice.GetCurrentStatus () == SYSTAT_WORK) {
166
+ RunoutResponseDelayed::modify_runout_distance_mm (0.001 );
167
+ }
168
+
163
169
#if EXTRUDERS > 1
164
170
printer1->ResetFilamentState (0 , actual_extruder);
165
171
#else
166
172
printer1->ResetFilamentState (0 , active_extruder);
167
173
#endif
168
- event_filament_runout ();
169
174
}
170
175
171
176
#endif // ADVANCED_PAUSE_FEATURE
Original file line number Diff line number Diff line change 38
38
/**
39
39
* Marlin release version identifier
40
40
*/
41
- #define SHORT_BUILD_VERSION "SM2-5.2.0 "
41
+ #define SHORT_BUILD_VERSION "SM2-5.2.1 "
42
42
43
43
/**
44
44
* Verbose version identifier which should contain a reference to the location
51
51
* here we define this default string as the date where the latest release
52
52
* version was tagged.
53
53
*/
54
- #define STRING_DISTRIBUTION_DATE "2024-1113 "
54
+ #define STRING_DISTRIBUTION_DATE "2024-1216 "
55
55
56
56
/**
57
57
* Required minimum Configuration.h and Configuration_adv.h file versions.
Original file line number Diff line number Diff line change @@ -507,6 +507,7 @@ ErrCode SystemService::ResumeOver() {
507
507
switch (ModuleBase::toolhead ()) {
508
508
case MODULE_TOOLHEAD_3DP:
509
509
case MODULE_TOOLHEAD_DUALEXTRUDER:
510
+ RunoutResponseDelayed::modify_runout_distance_mm (FILAMENT_RUNOUT_DISTANCE_MM);
510
511
if (runout.is_filament_runout ()) {
511
512
LOG_E (" No filemant! Please insert filemant!\n " );
512
513
PauseTrigger (TRIGGER_SOURCE_RUNOUT);
You can’t perform that action at this time.
0 commit comments