bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🚸 Retain power during Pause (#22227)

Browse Source
This commit is contained in:
Cytown
2021-06-30 01:58:11 +08:00
committed by Scott Lahteine
parent fef76a76a3
commit 399a240f84
5 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/src/feature/power.cpp
View File

@ -46,6 +46,9 @@ Power powerManager;
millis_t Power::lastPowerOn;
bool Power::is_power_needed() {
if (printJobOngoing() || printingIsPaused()) return true;
#if ENABLED(AUTO_POWER_FANS)
FANS_LOOP(i) if (thermalManager.fan_speed[i]) return true;
#endif
@ -106,9 +109,17 @@ bool Power::is_power_needed() {
#define POWER_TIMEOUT 0
#endif
void Power::check() {
void Power::check(const bool pause) {
static bool _pause = false;
static millis_t nextPowerCheck = 0;
millis_t now = millis();
const millis_t now = millis();
#if POWER_TIMEOUT > 0
if (pause != _pause) {
lastPowerOn = now + !now;
_pause = pause;
}
if (pause) return;
#endif
if (ELAPSED(now, nextPowerCheck)) {
nextPowerCheck = now + 2500UL;
if (is_power_needed())
@ -119,7 +130,8 @@ void Power::check() {
}
void Power::power_on() {
lastPowerOn = millis();
const millis_t now = millis();
lastPowerOn = now + !now;
if (!powersupply_on) {
PSU_PIN_ON();
safe_delay(PSU_POWERUP_DELAY);
@ -143,6 +155,7 @@ void Power::power_off() {
void Power::power_off_soon() {
#if POWER_OFF_DELAY
lastPowerOn = millis() - SEC_TO_MS(POWER_TIMEOUT) + SEC_TO_MS(POWER_OFF_DELAY);
//if (!lastPowerOn) ++lastPowerOn;
#else
power_off();
#endif

2
Marlin/src/feature/power.h
View File

@ -29,7 +29,7 @@
class Power {
public:
static void check();
static void check(const bool pause);
static void power_on();
static void power_off();
static void power_off_soon();