diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5b04d749b..902b46c50 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3478,11 +3478,6 @@ void process_commands() } #endif //BACKLASH_Y #endif //TMC2130 -#ifdef FILAMENT_SENSOR - else if (code_seen("FSENSOR_RECOVER")) { //! FSENSOR_RECOVER - fsensor_restore_print_and_continue(); - } -#endif //FILAMENT_SENSOR else if(code_seen("PRUSA")){ if (code_seen("Ping")) { //! PRUSA Ping if (farm_mode) { @@ -3513,6 +3508,12 @@ void process_commands() eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); enquecommand_P(PSTR("M24")); } +#ifdef FILAMENT_SENSOR + else if (code_seen("fsensor_recover")) //! PRUSA fsensor_recover + { + fsensor_restore_print_and_continue(); + } +#endif //FILAMENT_SENSOR else if (code_seen("MMURES")) //! PRUSA MMURES { mmu_reset(); diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index ead770766..d520ba533 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -567,7 +567,7 @@ void fsensor_update(void) printf_P(PSTR("fsensor_update - M600\n")); eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("FSENSOR_RECOVER")); + enquecommand_front_P(PSTR("PRUSA fsensor_recover")); enquecommand_front_P((PSTR("M600"))); fsensor_watch_runout = false; } @@ -581,7 +581,7 @@ void fsensor_update(void) printf_P(PSTR("fsensor_update - M600\n")); eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("FSENSOR_RECOVER")); + enquecommand_front_P(PSTR("PRUSA fsensor_recover")); enquecommand_front_P((PSTR("M600"))); } #endif //PAT9125 diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 45a3c421d..65c73ca3d 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -369,7 +369,7 @@ void mmu_loop(void) //printf_P(PSTR("Eact: %d\n"), int(e_active())); if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) { fsensor_stop_and_save_print(); - enquecommand_front_P(PSTR("FSENSOR_RECOVER")); //then recover + enquecommand_front_P(PSTR("PRUSA fsensor_recover")); //then recover ad_markDepleted(mmu_extruder); if (lcd_autoDepleteEnabled() && !ad_allDepleted()) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 067f4880a..646ed50c9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4529,6 +4529,7 @@ static void lcd_silent_mode_set() { } eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu); #ifdef TMC2130 + lcd_display_message_fullscreen_P(_i("Mode change in progress ...")); // Wait until the planner queue is drained and the stepper routine achieves // an idle state. st_synchronize(); @@ -4549,6 +4550,7 @@ static void lcd_silent_mode_set() { #ifdef TMC2130 if (CrashDetectMenu && (SilentModeMenu != SILENT_MODE_NORMAL)) menu_submenu(lcd_crash_mode_info2); + lcd_encoder_diff=0; // reset 'encoder buffer' #endif //TMC2130 }