3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1197 from mkbel/disable_fil_q_det

Browse source 
Disable filament sensor response quality check.
This commit is contained in:
PavelSindler 2018-09-25 20:00:29 +02:00 • committed by GitHub
commit c50db2ed7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Firmware/Marlin_main.cpp
View file

@ -3192,9 +3192,9 @@ void gcode_M701()
enable_z(); enable_z();
custom_message_type = CUSTOM_MSG_TYPE_F_LOAD; custom_message_type = CUSTOM_MSG_TYPE_F_LOAD;
#ifdef FILAMENT_SENSOR #ifdef FSENSOR_QUALITY
fsensor_oq_meassure_start(40); fsensor_oq_meassure_start(40);
#endif //FILAMENT_SENSOR #endif //FSENSOR_QUALITY
lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
current_position[E_AXIS] += 40; current_position[E_AXIS] += 40;
@ -3234,21 +3234,18 @@ void gcode_M701()
loading_flag = false; loading_flag = false;
custom_message_type = CUSTOM_MSG_TYPE_STATUS; custom_message_type = CUSTOM_MSG_TYPE_STATUS;
#ifdef FILAMENT_SENSOR #ifdef FSENSOR_QUALITY
if (mmu_enabled == false) fsensor_oq_meassure_stop();
{
fsensor_oq_meassure_stop();
if (!fsensor_oq_result()) 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); 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_enable(true);
lcd_update(2); lcd_update(2);
if (disable) if (disable)
fsensor_disable(); fsensor_disable();
} }
} #endif //FSENSOR_QUALITY
#endif //FILAMENT_SENSOR
} }
} }
/** /**
@ -9071,9 +9068,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
#ifdef FILAMENT_SENSOR #ifdef FSENSOR_QUALITY
fsensor_oq_meassure_start(70); fsensor_oq_meassure_start(70);
#endif //FILAMENT_SENSOR #endif //FSENSOR_QUALITY
M600_load_filament_movements(); M600_load_filament_movements();
@ -9082,7 +9079,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
delay_keep_alive(50); delay_keep_alive(50);
noTone(BEEPER); noTone(BEEPER);
#ifdef FILAMENT_SENSOR #ifdef FSENSOR_QUALITY
fsensor_oq_meassure_stop(); fsensor_oq_meassure_stop();
if (!fsensor_oq_result()) if (!fsensor_oq_result())
@ -9093,7 +9090,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
if (disable) if (disable)
fsensor_disable(); fsensor_disable();
} }
#endif //FILAMENT_SENSOR #endif //FSENSOR_QUALITY
lcd_update_enable(false); lcd_update_enable(false);
} }