diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 68292d90c..8c021ab73 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3463,11 +3463,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) { @@ -3498,6 +3493,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 2e3fca914..e299b3aa6 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -358,7 +358,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()) {