Browse Source

Исправление постановки на паузу из меню

Исправление POWER_LOSS_RECOVERY
pull/24/head
Sergey 4 years ago
parent
commit
e85ed10beb
  1. 4
      Marlin/Configuration_adv.h
  2. 3
      Marlin/src/gcode/feature/pause/M125.cpp
  3. 2
      Marlin/src/sd/cardreader.cpp

4
Marlin/Configuration_adv.h

@ -1197,9 +1197,9 @@
* an option on the LCD screen to continue the print from the last-known
* point in the file.
*/
//#define POWER_LOSS_RECOVERY
#define POWER_LOSS_RECOVERY
#if ENABLED(POWER_LOSS_RECOVERY)
#define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
#define PLR_ENABLED_DEFAULT true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
//#define POWER_LOSS_RECOVER_ZHOME // Z homing is needed for proper recovery. 99.9% of the time this should be disabled!
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)

3
Marlin/src/gcode/feature/pause/M125.cpp

@ -75,7 +75,8 @@ void GcodeSuite::M125() {
TERN_(HAS_LCD_MENU, lcd_pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT));
const bool show_lcd = TERN0(HAS_LCD_MENU, parser.seenval('P'));
//Temporary fix, until merge bugfix branch
const bool show_lcd = 1; //TERN0(HAS_LCD_MENU, parser.seenval('P'));
if (pause_print(retract, park_point, 0, show_lcd)) {
TERN_(POWER_LOSS_RECOVERY, if (recovery.enabled) recovery.save(true));

2
Marlin/src/sd/cardreader.cpp

@ -662,7 +662,7 @@ bool CardReader::fileExists(const char * const path) {
if (fname) {
diveDir->rewind();
selectByName(*diveDir, fname);
diveDir->close();
//diveDir->close();
}
return fname != nullptr;
}

Loading…
Cancel
Save