Merge pull request #10479 from thinkyhead/bf2_creality_power_loss_resume
[2.0.x] Creality3D Power-Loss Recovery2.0.x
Scott Lahteine
7 years ago
committed by
GitHub
commit
023385ca59
@ -0,0 +1,235 @@
|
|||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* power_loss_recovery.cpp - Resume an SD print after power-loss
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../inc/MarlinConfigPre.h"
|
||||||
|
|
||||||
|
#if ENABLED(POWER_LOSS_RECOVERY)
|
||||||
|
|
||||||
|
#include "power_loss_recovery.h"
|
||||||
|
|
||||||
|
#include "../lcd/ultralcd.h"
|
||||||
|
#include "../gcode/queue.h"
|
||||||
|
#include "../module/planner.h"
|
||||||
|
#include "../module/printcounter.h"
|
||||||
|
#include "../module/temperature.h"
|
||||||
|
#include "../sd/cardreader.h"
|
||||||
|
#include "../core/serial.h"
|
||||||
|
|
||||||
|
// Recovery data
|
||||||
|
job_recovery_info_t job_recovery_info;
|
||||||
|
JobRecoveryPhase job_recovery_phase = JOB_RECOVERY_IDLE;
|
||||||
|
uint8_t job_recovery_commands_count; //=0
|
||||||
|
char job_recovery_commands[BUFSIZE + APPEND_CMD_COUNT][MAX_CMD_SIZE];
|
||||||
|
|
||||||
|
// Private
|
||||||
|
static char sd_filename[MAXPATHNAMELENGTH];
|
||||||
|
|
||||||
|
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
|
||||||
|
void debug_print_job_recovery(const bool recovery) {
|
||||||
|
SERIAL_PROTOCOLPAIR("valid_head:", (int)job_recovery_info.valid_head);
|
||||||
|
SERIAL_PROTOCOLLNPAIR(" valid_foot:", (int)job_recovery_info.valid_foot);
|
||||||
|
if (job_recovery_info.valid_head) {
|
||||||
|
if (job_recovery_info.valid_head == job_recovery_info.valid_foot) {
|
||||||
|
SERIAL_PROTOCOLPGM("current_position");
|
||||||
|
LOOP_XYZE(i) SERIAL_PROTOCOLPAIR(": ", job_recovery_info.current_position[i]);
|
||||||
|
SERIAL_EOL();
|
||||||
|
SERIAL_PROTOCOLLNPAIR("feedrate: ", job_recovery_info.feedrate);
|
||||||
|
SERIAL_PROTOCOLPGM("target_temperature");
|
||||||
|
HOTEND_LOOP() SERIAL_PROTOCOLPAIR(": ", job_recovery_info.target_temperature[e]);
|
||||||
|
SERIAL_EOL();
|
||||||
|
SERIAL_PROTOCOLPGM("fanSpeeds");
|
||||||
|
for(uint8_t i = 0; i < FAN_COUNT; i++) SERIAL_PROTOCOLPAIR(": ", job_recovery_info.fanSpeeds[i]);
|
||||||
|
SERIAL_EOL();
|
||||||
|
#if HAS_LEVELING
|
||||||
|
SERIAL_PROTOCOLPAIR("leveling: ", int(job_recovery_info.leveling));
|
||||||
|
SERIAL_PROTOCOLLNPAIR(" fade: ", int(job_recovery_info.fade));
|
||||||
|
#endif
|
||||||
|
SERIAL_PROTOCOLLNPAIR("target_temperature_bed: ", job_recovery_info.target_temperature_bed);
|
||||||
|
SERIAL_PROTOCOLLNPAIR("cmd_queue_index_r: ", job_recovery_info.cmd_queue_index_r);
|
||||||
|
SERIAL_PROTOCOLLNPAIR("commands_in_queue: ", job_recovery_info.commands_in_queue);
|
||||||
|
if (recovery)
|
||||||
|
for (uint8_t i = 0; i < job_recovery_commands_count; i++) SERIAL_PROTOCOLLNPAIR("> ", job_recovery_commands[i]);
|
||||||
|
else
|
||||||
|
for (uint8_t i = 0; i < job_recovery_info.commands_in_queue; i++) SERIAL_PROTOCOLLNPAIR("> ", job_recovery_info.command_queue[i]);
|
||||||
|
SERIAL_PROTOCOLLNPAIR("sd_filename: ", sd_filename);
|
||||||
|
SERIAL_PROTOCOLLNPAIR("sdpos: ", job_recovery_info.sdpos);
|
||||||
|
SERIAL_PROTOCOLLNPAIR("print_job_elapsed: ", job_recovery_info.print_job_elapsed);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
SERIAL_PROTOCOLLNPGM("INVALID DATA");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif // DEBUG_POWER_LOSS_RECOVERY
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check for Print Job Recovery
|
||||||
|
* If the file has a saved state, populate the job_recovery_commands queue
|
||||||
|
*/
|
||||||
|
void do_print_job_recovery() {
|
||||||
|
//if (job_recovery_commands_count > 0) return;
|
||||||
|
memset(&job_recovery_info, 0, sizeof(job_recovery_info));
|
||||||
|
ZERO(job_recovery_commands);
|
||||||
|
|
||||||
|
if (!card.cardOK) card.initsd();
|
||||||
|
|
||||||
|
if (card.cardOK) {
|
||||||
|
|
||||||
|
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
|
||||||
|
SERIAL_PROTOCOLLNPAIR("Init job recovery info. Size: ", (int)sizeof(job_recovery_info));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (card.jobRecoverFileExists()) {
|
||||||
|
card.openJobRecoveryFile(true);
|
||||||
|
card.loadJobRecoveryInfo();
|
||||||
|
card.closeJobRecoveryFile();
|
||||||
|
//card.removeJobRecoveryFile();
|
||||||
|
|
||||||
|
if (job_recovery_info.valid_head && job_recovery_info.valid_head == job_recovery_info.valid_foot) {
|
||||||
|
|
||||||
|
uint8_t ind = 0;
|
||||||
|
|
||||||
|
#if HAS_LEVELING
|
||||||
|
strcpy_P(job_recovery_commands[ind++], PSTR("M420 S0 Z0")); // Leveling off before G92 or G28
|
||||||
|
#endif
|
||||||
|
|
||||||
|
strcpy_P(job_recovery_commands[ind++], PSTR("G92.0 Z0")); // Ensure Z is equal to 0
|
||||||
|
strcpy_P(job_recovery_commands[ind++], PSTR("G1 Z2")); // Raise Z by 2mm (we hope!)
|
||||||
|
strcpy_P(job_recovery_commands[ind++], PSTR("G28 R0"
|
||||||
|
#if !IS_KINEMATIC
|
||||||
|
" X Y" // Home X and Y for Cartesian
|
||||||
|
#endif
|
||||||
|
));
|
||||||
|
|
||||||
|
#if HAS_LEVELING
|
||||||
|
// Restore leveling state before G92 sets Z
|
||||||
|
// This ensures the steppers correspond to the native Z
|
||||||
|
sprintf_P(job_recovery_commands[ind++], PSTR("M420 S%i Z%s"), int(job_recovery_info.leveling), job_recovery_info.fade);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
char str_1[16], str_2[16];
|
||||||
|
dtostrf(job_recovery_info.current_position[Z_AXIS] + 2, 1, 3, str_1);
|
||||||
|
dtostrf(job_recovery_info.current_position[E_AXIS]
|
||||||
|
#if ENABLED(SAVE_EACH_CMD_MODE)
|
||||||
|
- 5
|
||||||
|
#endif
|
||||||
|
, 1, 3, str_2
|
||||||
|
);
|
||||||
|
sprintf_P(job_recovery_commands[ind++], PSTR("G92.0 Z%s E%s"), str_1, str_2); // Current Z + 2 and E
|
||||||
|
|
||||||
|
strcpy_P(job_recovery_commands[ind++], PSTR("M117 Continuing..."));
|
||||||
|
|
||||||
|
uint8_t r = job_recovery_info.cmd_queue_index_r;
|
||||||
|
while (job_recovery_info.commands_in_queue) {
|
||||||
|
strcpy(job_recovery_commands[ind++], job_recovery_info.command_queue[r]);
|
||||||
|
job_recovery_info.commands_in_queue--;
|
||||||
|
r = (r + 1) % BUFSIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
job_recovery_commands_count = ind;
|
||||||
|
|
||||||
|
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
|
||||||
|
debug_print_job_recovery(true);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
card.openFile(sd_filename, true);
|
||||||
|
card.setIndex(job_recovery_info.sdpos);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (job_recovery_info.valid_head != job_recovery_info.valid_foot)
|
||||||
|
LCD_ALERTMESSAGEPGM("INVALID DATA");
|
||||||
|
memset(&job_recovery_info, 0, sizeof(job_recovery_info));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save the current machine state to the "bin" file
|
||||||
|
*/
|
||||||
|
void save_job_recovery_info() {
|
||||||
|
#if SAVE_INFO_INTERVAL_MS > 0
|
||||||
|
static millis_t next_save_ms; // = 0; // Init on reset
|
||||||
|
millis_t ms = millis();
|
||||||
|
#endif
|
||||||
|
if (
|
||||||
|
#if SAVE_INFO_INTERVAL_MS > 0
|
||||||
|
ELAPSED(ms, next_save_ms) ||
|
||||||
|
#endif
|
||||||
|
#if ENABLED(SAVE_EACH_CMD_MODE)
|
||||||
|
true
|
||||||
|
#else
|
||||||
|
(current_position[Z_AXIS] > 0 && current_position[Z_AXIS] > job_recovery_info.current_position[Z_AXIS])
|
||||||
|
#endif
|
||||||
|
) {
|
||||||
|
#if SAVE_INFO_INTERVAL_MS > 0
|
||||||
|
next_save_ms = ms + SAVE_INFO_INTERVAL_MS;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Head and foot will match if valid data was saved
|
||||||
|
if (!++job_recovery_info.valid_head) ++job_recovery_info.valid_head; // non-zero in sequence
|
||||||
|
job_recovery_info.valid_foot = job_recovery_info.valid_head;
|
||||||
|
|
||||||
|
// Machine state
|
||||||
|
COPY(job_recovery_info.current_position, current_position);
|
||||||
|
job_recovery_info.feedrate = feedrate_mm_s;
|
||||||
|
COPY(job_recovery_info.target_temperature, thermalManager.target_temperature);
|
||||||
|
job_recovery_info.target_temperature_bed = thermalManager.target_temperature_bed;
|
||||||
|
COPY(job_recovery_info.fanSpeeds, fanSpeeds);
|
||||||
|
|
||||||
|
#if HAS_LEVELING
|
||||||
|
job_recovery_info.leveling = planner.leveling_active;
|
||||||
|
job_recovery_info.fade = (
|
||||||
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
||||||
|
planner.z_fade_height
|
||||||
|
#else
|
||||||
|
0
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Commands in the queue
|
||||||
|
job_recovery_info.cmd_queue_index_r = cmd_queue_index_r;
|
||||||
|
job_recovery_info.commands_in_queue = commands_in_queue;
|
||||||
|
COPY(job_recovery_info.command_queue, command_queue);
|
||||||
|
|
||||||
|
// Elapsed print job time
|
||||||
|
job_recovery_info.print_job_elapsed = print_job_timer.duration() * 1000UL;
|
||||||
|
|
||||||
|
// SD file position
|
||||||
|
card.getAbsFilename(sd_filename);
|
||||||
|
job_recovery_info.sdpos = card.getIndex();
|
||||||
|
|
||||||
|
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
|
||||||
|
SERIAL_PROTOCOLLNPGM("Saving job_recovery_info");
|
||||||
|
debug_print_job_recovery(false);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
card.openJobRecoveryFile(false);
|
||||||
|
(void)card.saveJobRecoveryInfo();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // POWER_LOSS_RECOVERY
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* power_loss_recovery.h - Resume an SD print after power-loss
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _POWER_LOSS_RECOVERY_H_
|
||||||
|
#define _POWER_LOSS_RECOVERY_H_
|
||||||
|
|
||||||
|
#include "../sd/cardreader.h"
|
||||||
|
#include "../core/types.h"
|
||||||
|
#include "../inc/MarlinConfigPre.h"
|
||||||
|
|
||||||
|
#define SAVE_INFO_INTERVAL_MS 0
|
||||||
|
//#define SAVE_EACH_CMD_MODE
|
||||||
|
//#define DEBUG_POWER_LOSS_RECOVERY
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t valid_head;
|
||||||
|
|
||||||
|
// Machine state
|
||||||
|
float current_position[NUM_AXIS], feedrate;
|
||||||
|
int16_t target_temperature[HOTENDS],
|
||||||
|
target_temperature_bed,
|
||||||
|
fanSpeeds[FAN_COUNT];
|
||||||
|
|
||||||
|
#if HAS_LEVELING
|
||||||
|
bool leveling;
|
||||||
|
float fade;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Command queue
|
||||||
|
uint8_t cmd_queue_index_r, commands_in_queue;
|
||||||
|
char command_queue[BUFSIZE][MAX_CMD_SIZE];
|
||||||
|
|
||||||
|
// SD File position
|
||||||
|
uint32_t sdpos;
|
||||||
|
|
||||||
|
// Job elapsed time
|
||||||
|
millis_t print_job_elapsed;
|
||||||
|
|
||||||
|
uint8_t valid_foot;
|
||||||
|
} job_recovery_info_t;
|
||||||
|
|
||||||
|
extern job_recovery_info_t job_recovery_info;
|
||||||
|
|
||||||
|
enum JobRecoveryPhase : unsigned char {
|
||||||
|
JOB_RECOVERY_IDLE,
|
||||||
|
JOB_RECOVERY_MAYBE,
|
||||||
|
JOB_RECOVERY_YES
|
||||||
|
};
|
||||||
|
extern JobRecoveryPhase job_recovery_phase;
|
||||||
|
|
||||||
|
#if HAS_LEVELING
|
||||||
|
#define APPEND_CMD_COUNT 7
|
||||||
|
#else
|
||||||
|
#define APPEND_CMD_COUNT 5
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern char job_recovery_commands[BUFSIZE + APPEND_CMD_COUNT][MAX_CMD_SIZE];
|
||||||
|
extern uint8_t job_recovery_commands_count;
|
||||||
|
|
||||||
|
void do_print_job_recovery();
|
||||||
|
void save_job_recovery_info();
|
||||||
|
|
||||||
|
#endif // _POWER_LOSS_RECOVERY_H_
|
||||||
Loading…
Reference in New Issue