Merge pull request #1197 from mkbel/disable_fil_q_det

 Disable filament sensor response quality check.

Firmware/Marlin_main.cpp

@@ -3192,9 +3192,9 @@ void gcode_M701()
 		enable_z();
 		custom_message_type = CUSTOM_MSG_TYPE_F_LOAD;
 
-#ifdef FILAMENT_SENSOR
+#ifdef FSENSOR_QUALITY
 		fsensor_oq_meassure_start(40);
-#endif //FILAMENT_SENSOR
+#endif //FSENSOR_QUALITY
 
 		lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
 		current_position[E_AXIS] += 40;
@@ -3234,21 +3234,18 @@ void gcode_M701()
 		loading_flag = false;
 		custom_message_type = CUSTOM_MSG_TYPE_STATUS;
 
-#ifdef FILAMENT_SENSOR
-		if (mmu_enabled == false) 
-		{
-			fsensor_oq_meassure_stop();
+#ifdef FSENSOR_QUALITY
+        fsensor_oq_meassure_stop();
 
-			if (!fsensor_oq_result())
-			{
-				bool disable = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Fil. sensor response is poor, disable it?"), false, true);
-				lcd_update_enable(true);
-				lcd_update(2);
-				if (disable)
-					fsensor_disable();
-			}
-		}
-#endif //FILAMENT_SENSOR
+        if (!fsensor_oq_result())
+        {
+            bool disable = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Fil. sensor response is poor, disable it?"), false, true);
+            lcd_update_enable(true);
+            lcd_update(2);
+            if (disable)
+                fsensor_disable();
+        }
+#endif //FSENSOR_QUALITY
 	}
 }
 /**
@@ -9071,9 +9068,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 #endif //FILAMENT_SENSOR
 	KEEPALIVE_STATE(IN_HANDLER);
 
-#ifdef FILAMENT_SENSOR
+#ifdef FSENSOR_QUALITY
 	fsensor_oq_meassure_start(70);
-#endif //FILAMENT_SENSOR
+#endif //FSENSOR_QUALITY
 
 	M600_load_filament_movements();
 
@@ -9082,7 +9079,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 	delay_keep_alive(50);
 	noTone(BEEPER);
 
-#ifdef FILAMENT_SENSOR
+#ifdef FSENSOR_QUALITY
 	fsensor_oq_meassure_stop();
 
 	if (!fsensor_oq_result())
@@ -9093,7 +9090,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 		if (disable)
 			fsensor_disable();
 	}
-#endif //FILAMENT_SENSOR
+#endif //FSENSOR_QUALITY
 	lcd_update_enable(false);
 }