|
@@ -306,9 +306,43 @@ void MMU2::DecrementRetryAttempts() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+bool MMU2::FSensorCalibrationCheck()
|
|
|
+{
|
|
|
+ st_synchronize();
|
|
|
+
|
|
|
+ if (!fsensor.getFilamentPresent()) return false;
|
|
|
+
|
|
|
+ uint8_t fsensorState = 0;
|
|
|
+
|
|
|
+
|
|
|
+ current_position[E_AXIS] -= logic.ExtraLoadDistance();
|
|
|
+ plan_buffer_line_curposXYZE(MMU2_LOAD_TO_NOZZLE_FEED_RATE);
|
|
|
+
|
|
|
+ while(blocks_queued())
|
|
|
+ {
|
|
|
+
|
|
|
+
|
|
|
+ fsensorState |= !fsensor.getFilamentPresent();
|
|
|
+ }
|
|
|
+
|
|
|
+ if (fsensorState)
|
|
|
+ {
|
|
|
+ return false;
|
|
|
+ } else {
|
|
|
+
|
|
|
+
|
|
|
+ current_position[E_AXIS] += logic.ExtraLoadDistance();
|
|
|
+ plan_buffer_line_curposXYZE(MMU2_LOAD_TO_NOZZLE_FEED_RATE);
|
|
|
+ st_synchronize();
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
void MMU2::ToolChangeCommon(uint8_t slot){
|
|
|
+ bool calibrationCheckResult = true;
|
|
|
tool_change_extruder = slot;
|
|
|
do {
|
|
|
+ if (!calibrationCheckResult) unload();
|
|
|
for(;;) {
|
|
|
logic.ToolChange(slot);
|
|
|
if( manage_response(true, true) )
|
|
@@ -324,7 +358,8 @@ void MMU2::ToolChangeCommon(uint8_t slot){
|
|
|
}
|
|
|
|
|
|
plan_set_e_position(current_position[E_AXIS]);
|
|
|
- } while (0);
|
|
|
+ calibrationCheckResult = FSensorCalibrationCheck();
|
|
|
+ } while (!calibrationCheckResult);
|
|
|
|
|
|
|
|
|
|