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

Merge pull request #2332 from leptun/MK3_Octoprint_fIxes

Browse Source 
Do not check for fanError if it is not enabled on resume
This commit is contained in:
DRracer 2019-12-13 13:47:56 +01:00 committed by GitHub
commit a1bc4cc5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View File

@ -2282,6 +2282,9 @@ static void lcd_support_menu()
void lcd_set_fan_check() { void lcd_set_fan_check() {
fans_check_enabled = !fans_check_enabled; fans_check_enabled = !fans_check_enabled;
eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled);
#ifdef FANCHECK
if (fans_check_enabled == false) fan_check_error = EFCE_OK; //reset error if fanCheck is disabled during error. Allows resuming print.
#endif //FANCHECK
} }
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
@ -6702,6 +6705,7 @@ static void lcd_test_menu()
static bool fan_error_selftest() static bool fan_error_selftest()
{ {
#ifdef FANCHECK #ifdef FANCHECK
if (!fans_check_enabled) return 0;
fanSpeed = 255; fanSpeed = 255;
#ifdef FAN_SOFT_PWM #ifdef FAN_SOFT_PWM
@ -6732,9 +6736,8 @@ static bool fan_error_selftest()
return 1; return 1;
} }
#endif #endif
return 0;
#endif //FANCHECK #endif //FANCHECK
return 0;
} }
//! @brief Resume paused print //! @brief Resume paused print