From 19c1ba62745763950e2e6850a1916d4aff1dbf8c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 25 Sep 2018 14:25:03 +0200 Subject: [PATCH 1/2] Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch. --- Firmware/Marlin_main.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a16bf3f8..f0f137f7 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3235,19 +3235,16 @@ void gcode_M701() custom_message_type = CUSTOM_MSG_TYPE_STATUS; #ifdef FILAMENT_SENSOR - if (mmu_enabled == false) - { - fsensor_oq_meassure_stop(); + 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(); - } - } + 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 } } From d80fcab66cec45bf4eacdfc4f2e722cba08f4bc3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 25 Sep 2018 15:50:50 +0200 Subject: [PATCH 2/2] Disable filament sensor response quality check. --- Firmware/Marlin_main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f0f137f7..80f21058 100644 --- a/Firmware/Marlin_main.cpp +++ b/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,7 +3234,7 @@ void gcode_M701() loading_flag = false; custom_message_type = CUSTOM_MSG_TYPE_STATUS; -#ifdef FILAMENT_SENSOR +#ifdef FSENSOR_QUALITY fsensor_oq_meassure_stop(); if (!fsensor_oq_result()) @@ -3245,7 +3245,7 @@ void gcode_M701() if (disable) fsensor_disable(); } -#endif //FILAMENT_SENSOR +#endif //FSENSOR_QUALITY } } /** @@ -9068,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(); @@ -9079,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()) @@ -9090,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); }