Browse Source

Move Power Loss Recovery check

vanilla_fb_2.0.x
Scott Lahteine 5 years ago
parent
commit
d96c769fd6
  1. 4
      Marlin/src/MarlinCore.cpp
  2. 4
      Marlin/src/feature/powerloss.cpp
  3. 9
      Marlin/src/sd/cardreader.cpp

4
Marlin/src/MarlinCore.cpp

@ -1161,10 +1161,6 @@ void setup() {
SETUP_RUN(est_init());
#endif
#if ENABLED(POWER_LOSS_RECOVERY)
SETUP_RUN(recovery.check());
#endif
#if ENABLED(USE_WATCHDOG)
SETUP_RUN(watchdog_init()); // Reinit watchdog after HAL_get_reset_source call
#endif

4
Marlin/src/feature/powerloss.cpp

@ -100,10 +100,10 @@ void PrintJobRecovery::changed() {
* If a saved state exists send 'M1000 S' to initiate job recovery.
*/
void PrintJobRecovery::check() {
if (!card.isMounted()) card.mount();
//if (!card.isMounted()) card.mount();
if (card.isMounted()) {
load();
if (!valid()) return purge();
if (!valid()) return cancel();
queue.inject_P(PSTR("M1000 S"));
}
}

9
Marlin/src/sd/cardreader.cpp

@ -408,8 +408,13 @@ void CardReader::manage_media() {
ui.media_changed(old_stat, stat); // Update the UI
if (stat && old_stat == 2) // First mount?
beginautostart(); // Look for autostart files soon
if (stat && old_stat == 2) { // First mount?
#if ENABLED(POWER_LOSS_RECOVERY)
recovery.check();
#else
beginautostart(); // Look for autostart files soon
#endif
}
}
}

Loading…
Cancel
Save