josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve USb power panic

This commit is contained in:
3d-gussner 2023-11-29 17:44:00 +01:00
parent 4dfc484265
commit 4bc6bc3f90
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Firmware/Marlin_main.cpp
View File

@ -4105,6 +4105,9 @@ void process_commands()
{ {
// M24 - Start SD print // M24 - Start SD print
enquecommand_P(MSG_M24); enquecommand_P(MSG_M24);
// Print is recovered, clear the recovery flag
eeprom_update_byte((uint8_t*)EEPROM_UVLO, PowerPanic::NO_PENDING_RECOVERY);
} }
else if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_PRINT_TYPE) == PowerPanic::PRINT_TYPE_USB) else if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_PRINT_TYPE) == PowerPanic::PRINT_TYPE_USB)
{ {
@ -4116,13 +4119,7 @@ void process_commands()
// Park the extruder to the side and don't resume the print // Park the extruder to the side and don't resume the print
// we must assume that the host as not fully booted up at this point // we must assume that the host as not fully booted up at this point
lcd_pause_print(); lcd_pause_print();
// Used by M79 to differentiate from a normal pause
SetPrinterState(PrinterState::PowerPanicWaitingForHost);
} }
// Print is recovered, clear the recovery flag
eeprom_update_byte((uint8_t*)EEPROM_UVLO, PowerPanic::NO_PENDING_RECOVERY);
} }
else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES
{ {
@ -5981,15 +5978,12 @@ Sigma_Exit:
} }
} }
if (GetPrinterState() == PrinterState::PowerPanicWaitingForHost && print_job_timer.isPaused()) { if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_PRINT_TYPE) == PowerPanic::PRINT_TYPE_USB && print_job_timer.isPaused()) {
// The print is in a paused state. The print was recovered following a power panic // The print is in a paused state. The print was recovered following a power panic
// but up to this point the printer has been waiting for the M79 from the host // but up to this point the printer has been waiting for the M79 from the host
// Send action to the host, so the host can resume the print. It is up to the host // Send action to the host, so the host can resume the print. It is up to the host
// to resume the print correctly. // to resume the print correctly.
SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_UVLO_RECOVERY_READY); SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_UVLO_RECOVERY_READY);
// Update the state so the action is not repeated again
SetPrinterState(PrinterState::IsHostPrinting);
} }
break; break;

2
Firmware/cmdqueue.cpp
View File

@ -8,6 +8,7 @@
#include "messages.h" #include "messages.h"
#include "language.h" #include "language.h"
#include "stopwatch.h" #include "stopwatch.h"
#include "power_panic.h"
// Reserve BUFSIZE lines of length MAX_CMD_SIZE plus CMDBUFFER_RESERVE_FRONT. // Reserve BUFSIZE lines of length MAX_CMD_SIZE plus CMDBUFFER_RESERVE_FRONT.
char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT]; char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT];
@ -483,6 +484,7 @@ void get_command()
if ((*cmd_start == 'G') && (GetPrinterState() != PrinterState::IsSDPrinting)) { if ((*cmd_start == 'G') && (GetPrinterState() != PrinterState::IsSDPrinting)) {
usb_timer.start(); usb_timer.start();
SetPrinterState(PrinterState::IsHostPrinting); //set printer state busy printing to hide LCD menu while USB printing SetPrinterState(PrinterState::IsHostPrinting); //set printer state busy printing to hide LCD menu while USB printing
eeprom_update_byte((uint8_t*)EEPROM_UVLO, PowerPanic::NO_PENDING_RECOVERY);
} }
if (allow_when_stopped == false && Stopped == true) { if (allow_when_stopped == false && Stopped == true) {
// Stopped can be set either during error states (thermal error: cannot continue), or // Stopped can be set either during error states (thermal error: cannot continue), or

1
Firmware/printer_state.h
View File

@ -23,7 +23,6 @@ enum class PrinterState : uint8_t
HostPrintingFinished = 4, HostPrintingFinished = 4,
IsSDPrinting = 5, IsSDPrinting = 5,
IsHostPrinting = 6, IsHostPrinting = 6,
PowerPanicWaitingForHost = 7,
}; };
PrinterState GetPrinterState(); PrinterState GetPrinterState();